You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by up...@apache.org on 2016/01/28 19:13:03 UTC

[01/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Repository: incubator-geode
Updated Branches:
  refs/heads/develop 6df4b8ffd -> c194f7665


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
new file mode 100644
index 0000000..196d631
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
@@ -0,0 +1,691 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.wan.wancommand;
+
+import hydra.Log;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+
+import com.gemstone.gemfire.cache.wan.GatewayReceiver;
+import com.gemstone.gemfire.distributed.DistributedMember;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.management.cli.Result;
+import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
+import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
+import com.gemstone.gemfire.management.internal.cli.result.TabularResultData;
+
+import dunit.Host;
+import dunit.VM;
+
+/**
+ * DUnit tests for 'create gateway-receiver' command.
+ */
+public class WanCommandCreateGatewayReceiverDUnitTest extends
+    WANCommandTestBase {
+
+  private static final long serialVersionUID = 1L;
+  
+  public WanCommandCreateGatewayReceiverDUnitTest(String name) {
+    super(name);
+  }
+  
+  public void setUp() throws Exception {
+    super.setUp();
+  }
+  
+  /**
+   * GatewayReceiver with all default attributes
+   */
+  public void testCreateGatewayReceiverWithDefault() {
+
+    VM puneLocator = Host.getLocator();
+    int punePort = (Integer)puneLocator.invoke(WANCommandTestBase.class,
+        "getLocatorPort");
+
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort
+        + "]");
+    createDefaultSetup(props);
+
+    Integer nyPort = (Integer)vm2.invoke(WANCommandTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, punePort });
+
+    vm3.invoke(WANCommandTestBase.class, "createCache",
+        new Object[] { punePort });
+    vm4.invoke(WANCommandTestBase.class, "createCache",
+        new Object[] { punePort });
+    vm5.invoke(WANCommandTestBase.class, "createCache",
+        new Object[] { punePort });
+
+    String command = CliStrings.CREATE_GATEWAYRECEIVER;
+    CommandResult cmdResult = executeCommand(command);
+    if (cmdResult != null) {
+      String strCmdResult = commandResultToString(cmdResult);
+      Log.getLogWriter().info(
+          "testCreateGatewayReceiver stringResult : " + strCmdResult + ">>>>");
+      assertEquals(Result.Status.OK, cmdResult.getStatus());
+
+      TabularResultData resultData = (TabularResultData)cmdResult
+          .getResultData();
+      List<String> status = resultData.retrieveAllValues("Status");
+      assertEquals(4, status.size());//expected size 4 includes the manager node
+      // verify there is no error in the status
+      for (int i = 0; i < status.size(); i++) {
+        assertTrue("GatewayReceiver creation failed with: " + status.get(i),
+            status.get(i).indexOf("ERROR:") == -1);
+      }
+    }
+    else {
+      fail("testCreateGatewayReceiver failed as did not get CommandResult");
+    }
+
+    vm3.invoke(WANCommandTestBase.class,
+        "verifyReceiverCreationWithAttributes", new Object[] { !GatewayReceiver.DEFAULT_MANUAL_START,
+            GatewayReceiver.DEFAULT_START_PORT,
+            GatewayReceiver.DEFAULT_END_PORT,
+            GatewayReceiver.DEFAULT_BIND_ADDRESS,
+            GatewayReceiver.DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS,
+            GatewayReceiver.DEFAULT_SOCKET_BUFFER_SIZE, null });
+    vm4.invoke(WANCommandTestBase.class,
+        "verifyReceiverCreationWithAttributes", new Object[] { !GatewayReceiver.DEFAULT_MANUAL_START,
+            GatewayReceiver.DEFAULT_START_PORT,
+            GatewayReceiver.DEFAULT_END_PORT,
+            GatewayReceiver.DEFAULT_BIND_ADDRESS,
+            GatewayReceiver.DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS,
+            GatewayReceiver.DEFAULT_SOCKET_BUFFER_SIZE, null });
+    vm5.invoke(WANCommandTestBase.class,
+        "verifyReceiverCreationWithAttributes", new Object[] { !GatewayReceiver.DEFAULT_MANUAL_START,
+            GatewayReceiver.DEFAULT_START_PORT,
+            GatewayReceiver.DEFAULT_END_PORT,
+            GatewayReceiver.DEFAULT_BIND_ADDRESS,
+            GatewayReceiver.DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS,
+            GatewayReceiver.DEFAULT_SOCKET_BUFFER_SIZE, null });
+  }
+
+  /**
+   * GatewayReceiver with given attributes
+   */
+  public void testCreateGatewayReceiver() {
+
+    VM puneLocator = Host.getLocator();
+    int punePort = (Integer)puneLocator.invoke(WANCommandTestBase.class,
+        "getLocatorPort");
+
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort
+        + "]");
+    createDefaultSetup(props);
+
+    Integer nyPort = (Integer)vm2.invoke(WANCommandTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, punePort });
+
+    vm3.invoke(WANCommandTestBase.class, "createCache",
+        new Object[] { punePort });
+    vm4.invoke(WANCommandTestBase.class, "createCache",
+        new Object[] { punePort });
+    vm5.invoke(WANCommandTestBase.class, "createCache",
+        new Object[] { punePort });
+
+    String command = CliStrings.CREATE_GATEWAYRECEIVER 
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MANUALSTART+ "=true"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__BINDADDRESS + "=localhost"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__STARTPORT + "=10000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__ENDPORT + "=11000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MAXTIMEBETWEENPINGS + "=100000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__SOCKETBUFFERSIZE + "=512000";
+    CommandResult cmdResult = executeCommand(command);
+    if (cmdResult != null) {
+      String strCmdResult = commandResultToString(cmdResult);
+      Log.getLogWriter().info(
+          "testCreateGatewayReceiver stringResult : " + strCmdResult + ">>>>");
+      assertEquals(Result.Status.OK, cmdResult.getStatus());
+
+      TabularResultData resultData = (TabularResultData)cmdResult
+          .getResultData();
+      List<String> status = resultData.retrieveAllValues("Status");
+      assertEquals(4, status.size());//expected size 4 includes the manager node
+      // verify there is no error in the status
+      for (int i = 0; i < status.size(); i++) {
+        assertTrue("GatewayReceiver creation failed with: " + status.get(i),
+            status.get(i).indexOf("ERROR:") == -1);
+      }
+    }
+    else {
+      fail("testCreateGatewayReceiver failed as did not get CommandResult");
+    }
+
+    vm3.invoke(WANCommandTestBase.class,
+        "verifyReceiverCreationWithAttributes", new Object[] { false, 10000,
+            11000, "localhost", 100000, 512000, null });
+    vm4.invoke(WANCommandTestBase.class,
+        "verifyReceiverCreationWithAttributes", new Object[] { false, 10000,
+            11000, "localhost", 100000, 512000, null });
+    vm5.invoke(WANCommandTestBase.class,
+        "verifyReceiverCreationWithAttributes", new Object[] { false, 10000,
+            11000, "localhost", 100000, 512000, null });
+  }
+  
+  /**
+   * GatewayReceiver with given attributes and a single GatewayTransportFilter.
+   */
+  public void testCreateGatewayReceiverWithGatewayTransportFilter() {
+
+    VM puneLocator = Host.getLocator();
+    int punePort = (Integer)puneLocator.invoke(WANCommandTestBase.class,
+        "getLocatorPort");
+
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort
+        + "]");
+    createDefaultSetup(props);
+
+    Integer nyPort = (Integer)vm2.invoke(WANCommandTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, punePort });
+
+    vm3.invoke(WANCommandTestBase.class, "createCache",
+        new Object[] { punePort });
+    vm4.invoke(WANCommandTestBase.class, "createCache",
+        new Object[] { punePort });
+    vm5.invoke(WANCommandTestBase.class, "createCache",
+        new Object[] { punePort });
+
+    String command = CliStrings.CREATE_GATEWAYRECEIVER 
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MANUALSTART+ "=false"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__BINDADDRESS + "=localhost"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__STARTPORT + "=10000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__ENDPORT + "=11000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MAXTIMEBETWEENPINGS + "=100000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__SOCKETBUFFERSIZE + "=512000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__GATEWAYTRANSPORTFILTER + "=com.gemstone.gemfire.cache30.MyGatewayTransportFilter1";
+    CommandResult cmdResult = executeCommand(command);
+    if (cmdResult != null) {
+      String strCmdResult = commandResultToString(cmdResult);
+      Log.getLogWriter().info(
+          "testCreateGatewayReceiver stringResult : " + strCmdResult + ">>>>");
+      assertEquals(Result.Status.OK, cmdResult.getStatus());
+
+      TabularResultData resultData = (TabularResultData)cmdResult
+          .getResultData();
+      List<String> status = resultData.retrieveAllValues("Status");
+      assertEquals(4, status.size());//expected size 4 includes the manager node
+      // verify there is no error in the status
+      for (int i = 0; i < status.size(); i++) {
+        assertTrue("GatewayReceiver creation failed with: " + status.get(i),
+            status.get(i).indexOf("ERROR:") == -1);
+      }
+    }
+    else {
+      fail("testCreateGatewayReceiver failed as did not get CommandResult");
+    }
+
+    List<String> transportFilters = new ArrayList<String>();
+    transportFilters.add("com.gemstone.gemfire.cache30.MyGatewayTransportFilter1");
+    
+    vm3.invoke(WANCommandTestBase.class,
+        "verifyReceiverCreationWithAttributes", new Object[] { true, 10000,
+            11000, "localhost", 100000, 512000, transportFilters });
+    vm4.invoke(WANCommandTestBase.class,
+        "verifyReceiverCreationWithAttributes", new Object[] { true, 10000,
+            11000, "localhost", 100000, 512000, transportFilters });
+    vm5.invoke(WANCommandTestBase.class,
+        "verifyReceiverCreationWithAttributes", new Object[] { true, 10000,
+            11000, "localhost", 100000, 512000, transportFilters });
+  }
+  
+  /**
+   * GatewayReceiver with given attributes and multiple GatewayTransportFilters.
+   */
+  public void testCreateGatewayReceiverWithMultipleGatewayTransportFilters() {
+
+    VM puneLocator = Host.getLocator();
+    int punePort = (Integer)puneLocator.invoke(WANCommandTestBase.class,
+        "getLocatorPort");
+
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort
+        + "]");
+    createDefaultSetup(props);
+
+    Integer nyPort = (Integer)vm2.invoke(WANCommandTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, punePort });
+
+    vm3.invoke(WANCommandTestBase.class, "createCache",
+        new Object[] { punePort });
+    vm4.invoke(WANCommandTestBase.class, "createCache",
+        new Object[] { punePort });
+    vm5.invoke(WANCommandTestBase.class, "createCache",
+        new Object[] { punePort });
+
+    String command = CliStrings.CREATE_GATEWAYRECEIVER + " --"
+        + CliStrings.CREATE_GATEWAYRECEIVER__BINDADDRESS + "=localhost" + " --"
+        + CliStrings.CREATE_GATEWAYRECEIVER__STARTPORT + "=10000" + " --"
+        + CliStrings.CREATE_GATEWAYRECEIVER__ENDPORT + "=11000" + " --"
+        + CliStrings.CREATE_GATEWAYRECEIVER__MAXTIMEBETWEENPINGS + "=100000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__SOCKETBUFFERSIZE
+        + "=512000" + " --"
+        + CliStrings.CREATE_GATEWAYRECEIVER__GATEWAYTRANSPORTFILTER
+        + "=com.gemstone.gemfire.cache30.MyGatewayTransportFilter1,com.gemstone.gemfire.cache30.MyGatewayTransportFilter2";
+    CommandResult cmdResult = executeCommand(command);
+    if (cmdResult != null) {
+      String strCmdResult = commandResultToString(cmdResult);
+      Log.getLogWriter().info(
+          "testCreateGatewayReceiver stringResult : " + strCmdResult + ">>>>");
+      assertEquals(Result.Status.OK, cmdResult.getStatus());
+
+      TabularResultData resultData = (TabularResultData)cmdResult
+          .getResultData();
+      List<String> status = resultData.retrieveAllValues("Status");
+      assertEquals(4, status.size());//expected size 4 includes the manager node
+      // verify there is no error in the status
+      for (int i = 0; i < status.size(); i++) {
+        assertTrue("GatewayReceiver creation failed with: " + status.get(i),
+            status.get(i).indexOf("ERROR:") == -1);
+      }
+    }
+    else {
+      fail("testCreateGatewayReceiver failed as did not get CommandResult");
+    }
+
+    List<String> transportFilters = new ArrayList<String>();
+    transportFilters.add("com.gemstone.gemfire.cache30.MyGatewayTransportFilter1");
+    transportFilters.add("com.gemstone.gemfire.cache30.MyGatewayTransportFilter2");
+    
+    vm3.invoke(WANCommandTestBase.class,
+        "verifyReceiverCreationWithAttributes", new Object[] { !GatewayReceiver.DEFAULT_MANUAL_START, 10000,
+            11000, "localhost", 100000, 512000, transportFilters });
+    vm4.invoke(WANCommandTestBase.class,
+        "verifyReceiverCreationWithAttributes", new Object[] { !GatewayReceiver.DEFAULT_MANUAL_START, 10000,
+            11000, "localhost", 100000, 512000, transportFilters });
+    vm5.invoke(WANCommandTestBase.class,
+        "verifyReceiverCreationWithAttributes", new Object[] { !GatewayReceiver.DEFAULT_MANUAL_START, 10000,
+            11000, "localhost", 100000, 512000, transportFilters });
+  }
+
+  /**
+   * GatewayReceiver with given attributes.
+   * Error scenario where startPort is greater than endPort.
+   */
+  public void testCreateGatewayReceiver_Error() {
+
+    VM puneLocator = Host.getLocator();
+    int punePort = (Integer)puneLocator.invoke(WANCommandTestBase.class,
+        "getLocatorPort");
+
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort
+        + "]");
+    createDefaultSetup(props);
+
+    Integer nyPort = (Integer)vm2.invoke(WANCommandTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, punePort });
+
+    vm3.invoke(WANCommandTestBase.class, "createCache",
+        new Object[] { punePort });
+    vm4.invoke(WANCommandTestBase.class, "createCache",
+        new Object[] { punePort });
+    vm5.invoke(WANCommandTestBase.class, "createCache",
+        new Object[] { punePort });
+
+    String command = CliStrings.CREATE_GATEWAYRECEIVER 
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__BINDADDRESS + "=localhost"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__STARTPORT + "=11000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__ENDPORT + "=10000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MAXTIMEBETWEENPINGS + "=100000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__SOCKETBUFFERSIZE + "=512000";
+    CommandResult cmdResult = executeCommand(command);
+    if (cmdResult != null) {
+      String strCmdResult = commandResultToString(cmdResult);
+      Log.getLogWriter().info(
+          "testCreateGatewayReceiver stringResult : " + strCmdResult + ">>>>");
+      assertEquals(Result.Status.OK, cmdResult.getStatus());
+
+      TabularResultData resultData = (TabularResultData) cmdResult
+          .getResultData();
+      List<String> status = resultData.retrieveAllValues("Status");
+      assertEquals(4, status.size());// expected size 4 includes the manager
+                                     // node
+      // verify there is no error in the status
+      for (int i = 0; i < status.size(); i++) {
+        assertTrue("GatewayReceiver creation should have failed", status.get(i)
+            .indexOf("ERROR:") != -1);
+      }
+    } else {
+      fail("testCreateGatewayReceiver failed as did not get CommandResult");
+    }
+  }
+
+  /**
+   * GatewayReceiver with given attributes on the given member.
+   */
+  public void testCreateGatewayReceiver_onMember() {
+
+    VM puneLocator = Host.getLocator();
+    int punePort = (Integer)puneLocator.invoke(WANCommandTestBase.class,
+        "getLocatorPort");
+
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort
+        + "]");
+    createDefaultSetup(props);
+
+    Integer nyPort = (Integer)vm2.invoke(WANCommandTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, punePort });
+
+    vm3.invoke(WANCommandTestBase.class, "createCache",
+        new Object[] { punePort });
+    vm4.invoke(WANCommandTestBase.class, "createCache",
+        new Object[] { punePort });
+    vm5.invoke(WANCommandTestBase.class, "createCache",
+        new Object[] { punePort });
+    
+    final DistributedMember vm3Member = (DistributedMember) vm3.invoke(
+        WANCommandTestBase.class, "getMember");
+
+    String command = CliStrings.CREATE_GATEWAYRECEIVER 
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MANUALSTART + "=true"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__BINDADDRESS + "=localhost"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__STARTPORT + "=10000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__ENDPORT + "=11000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MAXTIMEBETWEENPINGS + "=100000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__SOCKETBUFFERSIZE + "=512000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MEMBER + "=" + vm3Member.getId();
+    CommandResult cmdResult = executeCommand(command);
+    if (cmdResult != null) {
+      String strCmdResult = commandResultToString(cmdResult);
+      Log.getLogWriter().info(
+          "testCreateGatewayReceiver stringResult : " + strCmdResult + ">>>>");
+      assertEquals(Result.Status.OK, cmdResult.getStatus());
+
+      TabularResultData resultData = (TabularResultData)cmdResult
+          .getResultData();
+      List<String> status = resultData.retrieveAllValues("Status");
+      assertEquals(1, status.size());
+      // verify there is no error in the status
+      for (int i = 0; i < status.size(); i++) {
+        assertTrue("GatewayReceiver creation failed with: " + status.get(i),
+            status.get(i).indexOf("ERROR:") == -1);
+      }
+    }
+    else {
+      fail("testCreateGatewayReceiver failed as did not get CommandResult");
+    }
+
+    vm3.invoke(WANCommandTestBase.class,
+        "verifyReceiverCreationWithAttributes", new Object[] { false, 10000,
+            11000, "localhost", 100000, 512000, null });
+  }
+
+  /**
+   * GatewayReceiver with given attributes on multiple members.
+   */
+  public void testCreateGatewayReceiver_onMultipleMembers() {
+
+    VM puneLocator = Host.getLocator();
+    int punePort = (Integer)puneLocator.invoke(WANCommandTestBase.class,
+        "getLocatorPort");
+
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort
+        + "]");
+    createDefaultSetup(props);
+
+    Integer nyPort = (Integer)vm2.invoke(WANCommandTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, punePort });
+
+    vm3.invoke(WANCommandTestBase.class, "createCache",
+        new Object[] { punePort });
+    vm4.invoke(WANCommandTestBase.class, "createCache",
+        new Object[] { punePort });
+    vm5.invoke(WANCommandTestBase.class, "createCache",
+        new Object[] { punePort });
+    
+    final DistributedMember vm3Member = (DistributedMember) vm3.invoke(
+        WANCommandTestBase.class, "getMember");
+    final DistributedMember vm4Member = (DistributedMember) vm4.invoke(
+        WANCommandTestBase.class, "getMember");
+
+    String command = CliStrings.CREATE_GATEWAYRECEIVER 
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MANUALSTART + "=true"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__BINDADDRESS + "=localhost"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__STARTPORT + "=10000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__ENDPORT + "=11000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MAXTIMEBETWEENPINGS + "=100000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__SOCKETBUFFERSIZE + "=512000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MEMBER + "=" + vm3Member.getId() + "," + vm4Member.getId();
+    CommandResult cmdResult = executeCommand(command);
+    if (cmdResult != null) {
+      String strCmdResult = commandResultToString(cmdResult);
+      Log.getLogWriter().info(
+          "testCreateGatewayReceiver stringResult : " + strCmdResult + ">>>>");
+      assertEquals(Result.Status.OK, cmdResult.getStatus());
+
+      TabularResultData resultData = (TabularResultData)cmdResult
+          .getResultData();
+      List<String> status = resultData.retrieveAllValues("Status");
+      assertEquals(2, status.size());
+      // verify there is no error in the status
+      for (int i = 0; i < status.size(); i++) {
+        assertTrue("GatewayReceiver creation failed with: " + status.get(i),
+            status.get(i).indexOf("ERROR:") == -1);
+      }
+    }
+    else {
+      fail("testCreateGatewayReceiver failed as did not get CommandResult");
+    }
+
+    vm3.invoke(WANCommandTestBase.class,
+        "verifyReceiverCreationWithAttributes", new Object[] { false, 10000,
+            11000, "localhost", 100000, 512000, null });
+    vm4.invoke(WANCommandTestBase.class,
+        "verifyReceiverCreationWithAttributes", new Object[] { false, 10000,
+            11000, "localhost", 100000, 512000, null });
+  }
+  
+  /**
+   * GatewayReceiver with given attributes on the given group.
+   */
+  public void testCreateGatewayReceiver_onGroup() {
+
+    VM puneLocator = Host.getLocator();
+    int punePort = (Integer)puneLocator.invoke(WANCommandTestBase.class,
+        "getLocatorPort");
+
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort
+        + "]");
+    createDefaultSetup(props);
+
+    Integer nyPort = (Integer)vm2.invoke(WANCommandTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, punePort });
+
+    vm3.invoke(WANCommandTestBase.class, "createCacheWithGroups",
+        new Object[] { punePort, "receiverGroup1" });
+    vm4.invoke(WANCommandTestBase.class, "createCacheWithGroups",
+        new Object[] { punePort, "receiverGroup1" });
+    vm5.invoke(WANCommandTestBase.class, "createCacheWithGroups",
+        new Object[] { punePort, "receiverGroup1" });
+
+    String command = CliStrings.CREATE_GATEWAYRECEIVER 
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MANUALSTART + "=true"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__BINDADDRESS + "=localhost"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__STARTPORT + "=10000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__ENDPORT + "=11000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MAXTIMEBETWEENPINGS + "=100000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__SOCKETBUFFERSIZE + "=512000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__GROUP + "=receiverGroup1";
+    CommandResult cmdResult = executeCommand(command);
+    if (cmdResult != null) {
+      String strCmdResult = commandResultToString(cmdResult);
+      Log.getLogWriter().info(
+          "testCreateGatewayReceiver stringResult : " + strCmdResult + ">>>>");
+      assertEquals(Result.Status.OK, cmdResult.getStatus());
+
+      TabularResultData resultData = (TabularResultData)cmdResult
+          .getResultData();
+      List<String> status = resultData.retrieveAllValues("Status");
+      assertEquals(3, status.size());//
+      // verify there is no error in the status
+      for (int i = 0; i < status.size(); i++) {
+        assertTrue("GatewayReceiver creation failed with: " + status.get(i),
+            status.get(i).indexOf("ERROR:") == -1);
+      }
+    }
+    else {
+      fail("testCreateGatewayReceiver failed as did not get CommandResult");
+    }
+
+    vm3.invoke(WANCommandTestBase.class,
+        "verifyReceiverCreationWithAttributes", new Object[] { false, 10000,
+            11000, "localhost", 100000, 512000, null });
+    vm4.invoke(WANCommandTestBase.class,
+        "verifyReceiverCreationWithAttributes", new Object[] { false, 10000,
+            11000, "localhost", 100000, 512000, null });
+    vm5.invoke(WANCommandTestBase.class,
+        "verifyReceiverCreationWithAttributes", new Object[] { false, 10000,
+            11000, "localhost", 100000, 512000, null });
+  }
+
+  /**
+   * GatewayReceiver with given attributes on the given group.
+   * Only 2 of 3 members are part of the group.
+   */
+  public void testCreateGatewayReceiver_onGroup_Scenario2() {
+
+    VM puneLocator = Host.getLocator();
+    int punePort = (Integer)puneLocator.invoke(WANCommandTestBase.class,
+        "getLocatorPort");
+
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort
+        + "]");
+    createDefaultSetup(props);
+
+    Integer nyPort = (Integer)vm2.invoke(WANCommandTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, punePort });
+
+    vm3.invoke(WANCommandTestBase.class, "createCacheWithGroups",
+        new Object[] { punePort, "receiverGroup1" });
+    vm4.invoke(WANCommandTestBase.class, "createCacheWithGroups",
+        new Object[] { punePort, "receiverGroup1" });
+    vm5.invoke(WANCommandTestBase.class, "createCacheWithGroups",
+        new Object[] { punePort, "receiverGroup2" });
+
+    String command = CliStrings.CREATE_GATEWAYRECEIVER 
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MANUALSTART + "=true"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__BINDADDRESS + "=localhost"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__STARTPORT + "=10000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__ENDPORT + "=11000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MAXTIMEBETWEENPINGS + "=100000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__SOCKETBUFFERSIZE + "=512000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__GROUP + "=receiverGroup1";
+    CommandResult cmdResult = executeCommand(command);
+    if (cmdResult != null) {
+      String strCmdResult = commandResultToString(cmdResult);
+      Log.getLogWriter().info(
+          "testCreateGatewayReceiver stringResult : " + strCmdResult + ">>>>");
+      assertEquals(Result.Status.OK, cmdResult.getStatus());
+
+      TabularResultData resultData = (TabularResultData)cmdResult
+          .getResultData();
+      List<String> status = resultData.retrieveAllValues("Status");
+      assertEquals(2, status.size());//
+      // verify there is no error in the status
+      for (int i = 0; i < status.size(); i++) {
+        assertTrue("GatewayReceiver creation failed with: " + status.get(i),
+            status.get(i).indexOf("ERROR:") == -1);
+      }
+    }
+    else {
+      fail("testCreateGatewayReceiver failed as did not get CommandResult");
+    }
+
+    vm3.invoke(WANCommandTestBase.class,
+        "verifyReceiverCreationWithAttributes", new Object[] { false, 10000,
+            11000, "localhost", 100000, 512000, null });
+    vm4.invoke(WANCommandTestBase.class,
+        "verifyReceiverCreationWithAttributes", new Object[] { false, 10000,
+            11000, "localhost", 100000, 512000, null });
+  }
+
+  /**
+   * GatewayReceiver with given attributes on multiple groups.
+   */
+  public void testCreateGatewayReceiver_onMultipleGroups() {
+
+    VM puneLocator = Host.getLocator();
+    int punePort = (Integer)puneLocator.invoke(WANCommandTestBase.class,
+        "getLocatorPort");
+
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + punePort
+        + "]");
+    createDefaultSetup(props);
+
+    Integer nyPort = (Integer)vm2.invoke(WANCommandTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, punePort });
+
+    vm3.invoke(WANCommandTestBase.class, "createCacheWithGroups",
+        new Object[] { punePort, "receiverGroup1" });
+    vm4.invoke(WANCommandTestBase.class, "createCacheWithGroups",
+        new Object[] { punePort, "receiverGroup1" });
+    vm5.invoke(WANCommandTestBase.class, "createCacheWithGroups",
+        new Object[] { punePort, "receiverGroup2" });
+
+    String command = CliStrings.CREATE_GATEWAYRECEIVER 
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MANUALSTART + "=true"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__BINDADDRESS + "=localhost"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__STARTPORT + "=10000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__ENDPORT + "=11000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__MAXTIMEBETWEENPINGS + "=100000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__SOCKETBUFFERSIZE + "=512000"
+        + " --" + CliStrings.CREATE_GATEWAYRECEIVER__GROUP + "=receiverGroup1,receiverGroup2";
+    CommandResult cmdResult = executeCommand(command);
+    if (cmdResult != null) {
+      String strCmdResult = commandResultToString(cmdResult);
+      Log.getLogWriter().info(
+          "testCreateGatewayReceiver stringResult : " + strCmdResult + ">>>>");
+      assertEquals(Result.Status.OK, cmdResult.getStatus());
+
+      TabularResultData resultData = (TabularResultData)cmdResult
+          .getResultData();
+      List<String> status = resultData.retrieveAllValues("Status");
+      assertEquals(3, status.size());//
+      // verify there is no error in the status
+      for (int i = 0; i < status.size(); i++) {
+        assertTrue("GatewayReceiver creation failed with: " + status.get(i),
+            status.get(i).indexOf("ERROR:") == -1);
+      }
+    }
+    else {
+      fail("testCreateGatewayReceiver failed as did not get CommandResult");
+    }
+
+    vm3.invoke(WANCommandTestBase.class,
+        "verifyReceiverCreationWithAttributes", new Object[] { false, 10000,
+            11000, "localhost", 100000, 512000, null });
+    vm4.invoke(WANCommandTestBase.class,
+        "verifyReceiverCreationWithAttributes", new Object[] { false, 10000,
+            11000, "localhost", 100000, 512000, null });
+    vm5.invoke(WANCommandTestBase.class,
+        "verifyReceiverCreationWithAttributes", new Object[] { false, 10000,
+            11000, "localhost", 100000, 512000, null });
+  }
+
+}


[65/70] incubator-geode git commit: GEODE-867: Undoing changes to pauseSender to wait for the pause

Posted by up...@apache.org.
GEODE-867: Undoing changes to pauseSender to wait for the pause

GEODE-864 changed WANTestBase.pauseSender to wait for the sender to
pause. But apparently in
ConcurrentSerialGatewaySenderOperationsDUnitTest the sender never
actually pauses, causing a hang in precheckin.

Temporarily undoing the changes for GEODE-864 and just changing the one
test to use pauseSenderAndWaitForDispatcher instead. That will leave
GEODE-864 fixed but also fix the hang until we can figure out why the
sender is not paused in this case.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/09bd5307
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/09bd5307
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/09bd5307

Branch: refs/heads/develop
Commit: 09bd5307994bd970bdf3bf4f1d5f302021e8b8e6
Parents: a724951
Author: Dan Smith <up...@apache.org>
Authored: Wed Jan 27 11:16:40 2016 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Wed Jan 27 11:16:40 2016 -0800

----------------------------------------------------------------------
 .../gemfire/internal/cache/wan/WANTestBase.java | 23 ++++++++++++++++++--
 ...arallelGatewaySenderOperationsDUnitTest.java |  8 +++----
 .../ParallelWANConflationDUnitTest.java         |  8 +++----
 3 files changed, 29 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/09bd5307/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
index 5539eb1..0c32d1f 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
@@ -2162,14 +2162,33 @@ public class WANTestBase extends DistributedTestCase{
         }
       }
       sender.pause();
-      ((AbstractGatewaySender) sender).getEventProcessor().waitForDispatcherToPause();
-      
     }
     finally {
       exp.remove();
       exln.remove();
     }
   }
+      
+  public static void pauseSenderAndWaitForDispatcherToPause(String senderId) {
+    final ExpectedException exln = addExpectedException("Could not connect");
+    ExpectedException exp = addExpectedException(ForceReattemptException.class
+        .getName());
+    try {
+      Set<GatewaySender> senders = cache.getGatewaySenders();
+      GatewaySender sender = null;
+      for (GatewaySender s : senders) {
+        if (s.getId().equals(senderId)) {
+          sender = s;
+          break;
+        }
+      }
+      sender.pause();
+      ((AbstractGatewaySender)sender).getEventProcessor().waitForDispatcherToPause();
+    } finally {
+      exp.remove();
+      exln.remove();
+    }    
+  }
   
   public static void resumeSender(String senderId) {
     final ExpectedException exln = addExpectedException("Could not connect");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/09bd5307/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
index 3d0eb5b..19f6c4b 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
@@ -210,10 +210,10 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
     vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 100 });
     
     //now, pause all of the senders
-    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm4.invoke(WANTestBase.class, "pauseSenderAndWaitForDispatcherToPause", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSenderAndWaitForDispatcherToPause", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSenderAndWaitForDispatcherToPause", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSenderAndWaitForDispatcherToPause", new Object[] { "ln" });
     
     //SECOND RUN: keep one thread doing puts to the region
     vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/09bd5307/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
index 763b9c4..bce63f5 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
@@ -430,10 +430,10 @@ public class ParallelWANConflationDUnitTest extends WANTestBase {
   }
 
   protected void pauseSenders() {
-    vm4.invoke(() ->pauseSender( "ln" ));
-    vm5.invoke(() ->pauseSender( "ln" ));
-    vm6.invoke(() ->pauseSender( "ln" ));
-    vm7.invoke(() ->pauseSender( "ln" ));
+    vm4.invoke(() ->pauseSenderAndWaitForDispatcherToPause( "ln" ));
+    vm5.invoke(() ->pauseSenderAndWaitForDispatcherToPause( "ln" ));
+    vm6.invoke(() ->pauseSenderAndWaitForDispatcherToPause( "ln" ));
+    vm7.invoke(() ->pauseSenderAndWaitForDispatcherToPause( "ln" ));
   }
 
   protected void startSenders() {


[20/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
new file mode 100644
index 0000000..0ee0b36
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
@@ -0,0 +1,846 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+/**
+ * 
+ */
+package com.gemstone.gemfire.internal.cache.wan.concurrent;
+
+import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+
+import dunit.AsyncInvocation;
+
+/**
+ * @author skumar
+ *
+ */
+public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTestBase {
+  private static final long serialVersionUID = 1L;
+  
+  public ConcurrentParallelGatewaySenderOperation_1_DUnitTest(String name) {
+    super(name);
+  }
+  
+  public void setUp() throws Exception {
+    super.setUp();
+    addExpectedException("Broken pipe");
+    addExpectedException("Connection reset");
+    addExpectedException("Unexpected IOException");
+  }
+  
+  public void testParallelGatewaySenderWithoutStarting() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY });
+    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY });
+    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+    
+    vm4.invoke(WANTestBase.class, "verifySenderStoppedState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "verifySenderStoppedState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "verifySenderStoppedState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "verifySenderStoppedState", new Object[] { "ln" });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 0 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 0 });
+  }
+  
+  /**
+   * Defect 44323 (ParallelGatewaySender should not be started on Accessor node)
+   */
+  public void testParallelGatewaySenderStartOnAccessorNode() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY });
+    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY });
+    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegionAsAccessor", new Object[] {
+        testName + "_PR", "ln", 1, 100 });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegionAsAccessor", new Object[] {
+        testName + "_PR", "ln", 1, 100 });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    
+    //start the senders
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    pause(2000);
+    
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 1000 });
+  }
+
+  
+  /**
+   * Normal scenario in which the sender is paused in between.
+   * @throws Exception
+   */
+  public void testParallelPropagationSenderPause() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    //make sure all the senders are running before doing any puts
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    //FIRST RUN: now, the senders are started. So, start the puts
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 100 });
+    
+    //now, pause all of the senders
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    pause(2000);
+    //SECOND RUN: keep one thread doing puts to the region
+    vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+    
+    //verify region size remains on remote vm and is restricted below a specified limit (i.e. number of puts in the first run)
+    vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {testName + "_PR", 100 });
+  }
+
+  /**
+   * Normal scenario in which a paused sender is resumed.
+   * @throws Exception
+   */
+  public void testParallelPropagationSenderResume() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 8, OrderPolicy.KEY });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 8, OrderPolicy.KEY });
+    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 8, OrderPolicy.KEY });
+    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 8, OrderPolicy.KEY });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    //make sure all the senders are running before doing any puts
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    //now, the senders are started. So, start the puts
+    vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+    
+    //now, pause all of the senders
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    
+    //sleep for a second or two
+    pause(2000);
+    
+    //resume the senders
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    
+    pause(2000);
+    
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    
+    //find the region size on remote vm
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 1000 });
+ 
+  }
+  
+  /**
+   * Negative scenario in which a sender that is stopped (and not paused) is resumed.
+   * Expected: resume is only valid for pause. If a sender which is stopped is resumed,
+   * it will not be started again.
+   * 
+   * @throws Exception
+   */
+  public void testParallelPropagationSenderResumeNegativeScenario() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 1, 100, isOffHeap() });
+  
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    //wait till the senders are running
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+
+    //start the puts
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 100 });
+
+    //let the queue drain completely
+    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln", 0 });
+    
+    //stop the senders
+    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    
+    //now, try to resume a stopped sender
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    
+    //do more puts
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+    
+    //validate region size on remote vm to contain only the events put in local site 
+    //before the senders are stopped.
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 100 });
+  }
+
+  /**
+   * Normal scenario in which a sender is stopped.
+   * @throws Exception
+   */
+  public void testParallelPropagationSenderStop() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 3, OrderPolicy.KEY });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 3, OrderPolicy.KEY });
+    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 3, OrderPolicy.KEY });
+    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 3, OrderPolicy.KEY });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    //make sure all the senders are running before doing any puts
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    //FIRST RUN: now, the senders are started. So, do some of the puts
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 100 });
+    
+    //now, stop all of the senders
+    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    
+    //SECOND RUN: keep one thread doing puts
+    vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+    
+    //verify region size remains on remote vm and is restricted below a specified limit (number of puts in the first run)
+    vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {testName + "_PR", 100 });
+  }
+
+  /**
+   * Normal scenario in which a sender is stopped and then started again.
+   */
+  public void testParallelPropagationSenderStartAfterStop() throws Throwable {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
+    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
+    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    //make sure all the senders are running before doing any puts
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    //FIRST RUN: now, the senders are started. So, do some of the puts
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 200 });
+    
+    //now, stop all of the senders
+    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+    vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+    vm6.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+    vm7.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+    
+    //SECOND RUN: do some of the puts after the senders are stopped
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+    
+    //Region size on remote site should remain same and below the number of puts done in the FIRST RUN
+    vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {testName + "_PR", 200 });
+    
+    //start the senders again
+    AsyncInvocation vm4start = vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    AsyncInvocation vm5start = vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    AsyncInvocation vm6start = vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    AsyncInvocation vm7start = vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    int START_TIMEOUT = 30000;
+    vm4start.getResult(START_TIMEOUT);
+    vm5start.getResult(START_TIMEOUT);
+    vm6start.getResult(START_TIMEOUT);
+    vm7start.getResult(START_TIMEOUT);
+
+    //Region size on remote site should remain same and below the number of puts done in the FIRST RUN
+    vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {testName + "_PR", 200 });
+
+    //SECOND RUN: do some more puts
+    AsyncInvocation async = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+    async.join();
+    
+    //verify all the buckets on all the sender nodes are drained
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    
+    //verify the events propagate to remote site
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 1000 });
+    
+    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+    vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+    vm6.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+    vm7.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+  }
+
+  /**
+   * Normal scenario in which a sender is stopped and then started again.
+   * Differs from above test case in the way that when the sender is starting from
+   * stopped state, puts are simultaneously happening on the region by another thread.
+   * @throws Exception
+   */
+  public void Bug47553_testParallelPropagationSenderStartAfterStop_Scenario2() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY });
+    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY });
+    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    //make sure all the senders are running before doing any puts
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    getLogWriter().info("All the senders are now started");
+    
+    //FIRST RUN: now, the senders are started. So, do some of the puts
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 200 });
+    
+    getLogWriter().info("Done few puts");
+    
+    //now, stop all of the senders
+    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    
+    getLogWriter().info("All the senders are stopped");
+    pause(2000);
+    
+    //SECOND RUN: do some of the puts after the senders are stopped
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+    getLogWriter().info("Done some more puts in second run");
+    
+    //Region size on remote site should remain same and below the number of puts done in the FIRST RUN
+    vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {testName + "_PR", 200 });
+    
+    //SECOND RUN: start async puts on region
+    AsyncInvocation async = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 5000 });
+    getLogWriter().info("Started high number of puts by async thread");
+
+    getLogWriter().info("Starting the senders at the same time");
+    //when puts are happening by another thread, start the senders
+    vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    getLogWriter().info("All the senders are started");
+    
+    async.join();
+        
+    pause(2000);
+    
+    //verify all the buckets on all the sender nodes are drained
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    
+    //verify that the queue size ultimately becomes zero. That means all the events propagate to remote site.
+    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln", 0 });
+  }
+  
+  /**
+   * Normal scenario in which a sender is stopped and then started again on accessor node.
+   * @throws Exception
+   */
+  public void testParallelPropagationSenderStartAfterStopOnAccessorNode() throws Throwable {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
+    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
+    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegionAsAccessor", new Object[] {
+        testName + "_PR", "ln", 1, 100});
+    vm7.invoke(WANTestBase.class, "createPartitionedRegionAsAccessor", new Object[] {
+        testName + "_PR", "ln", 1, 100});
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    //make sure all the senders are not running on accessor nodes and running on non-accessor nodes
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    //FIRST RUN: now, the senders are started. So, do some of the puts
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 200 });
+    
+    //now, stop all of the senders
+    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    
+    pause(2000);
+    
+    //SECOND RUN: do some of the puts after the senders are stopped
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+    
+    //Region size on remote site should remain same and below the number of puts done in the FIRST RUN
+    vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {testName + "_PR", 200 });
+    
+    //start the senders again
+    AsyncInvocation vm4start = vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    AsyncInvocation vm5start = vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    AsyncInvocation vm6start = vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    AsyncInvocation vm7start = vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    int START_TIMEOUT = 30000;
+    vm4start.getResult(START_TIMEOUT);
+    vm5start.getResult(START_TIMEOUT);
+    vm6start.getResult(START_TIMEOUT);
+    vm7start.getResult(START_TIMEOUT);
+
+    //Region size on remote site should remain same and below the number of puts done in the FIRST RUN
+    vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {testName + "_PR", 200 });
+
+    //SECOND RUN: do some more puts
+    AsyncInvocation async = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+    async.join();
+    pause(5000);
+    
+    //verify all buckets drained only on non-accessor nodes.
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    
+    //verify the events propagate to remote site
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 1000 });
+  }
+
+  
+  /**
+   * Normal scenario in which a combinations of start, pause, resume operations
+   * is tested
+   */
+  public void testStartPauseResumeParallelGatewaySender() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    getLogWriter().info("Created cache on local site");
+    
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+    
+    getLogWriter().info("Created senders on local site");
+    
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    getLogWriter().info("Created PRs on local site");
+    
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    getLogWriter().info("Created PRs on remote site");
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+    getLogWriter().info("Done 1000 puts on local site");
+    
+    //Since puts are already done on userPR, it will have the buckets created. 
+    //During sender start, it will wait until those buckets are created for shadowPR as well.
+    //Start the senders in async threads, so colocation of shadowPR will be complete and 
+    //missing buckets will be created in PRHARedundancyProvider.createMissingBuckets().
+    vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    getLogWriter().info("Started senders on local site");
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 5000 });
+    getLogWriter().info("Done 5000 puts on local site");
+    
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    getLogWriter().info("Paused senders on local site");
+    
+    vm4.invoke(WANTestBase.class, "verifySenderPausedState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "verifySenderPausedState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "verifySenderPausedState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "verifySenderPausedState", new Object[] { "ln" });
+    
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
+        new Object[] { testName + "_PR", 1000 });
+    getLogWriter().info("Started 1000 async puts on local site");
+
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    getLogWriter().info("Resumed senders on local site");
+
+    vm4.invoke(WANTestBase.class, "verifySenderResumedState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "verifySenderResumedState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "verifySenderResumedState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "verifySenderResumedState", new Object[] { "ln" });
+
+    try {
+      inv1.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail("Interrupted the async invocation.");
+    }
+    
+    //verify all buckets drained on all sender nodes.
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 5000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 5000 });
+  }
+}



[05/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
new file mode 100644
index 0000000..85c45f7
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
@@ -0,0 +1,382 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.wan.serial;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener;
+import com.gemstone.gemfire.cache.wan.GatewaySender;
+import com.gemstone.gemfire.internal.AvailablePortHelper;
+import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
+import com.gemstone.gemfire.internal.cache.wan.MyGatewaySenderEventListener;
+import com.gemstone.gemfire.internal.cache.wan.MyGatewaySenderEventListener2;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+
+import dunit.DistributedTestCase;
+
+/**
+ * @author skumar
+ *
+ */
+public class SerialGatewaySenderEventListenerDUnitTest extends WANTestBase {
+
+  private static final long serialVersionUID = 1L;
+
+  public SerialGatewaySenderEventListenerDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+  }
+
+  /**
+   * Test validates whether the listener attached receives all the events.
+   * this test hangs after the Darrel's checkin 36685. Need to work with Darrel.Commenting it out so that test suit will not hang 
+   */
+  public void __testGatewaySenderEventListenerInvocationWithoutLocator() {
+    int mPort = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    vm4.invoke(WANTestBase.class, "createCacheWithoutLocator", new Object[] {mPort });
+    vm5.invoke(WANTestBase.class, "createCacheWithoutLocator", new Object[] {mPort });
+    vm6.invoke(WANTestBase.class, "createCacheWithoutLocator", new Object[] {mPort });
+    vm7.invoke(WANTestBase.class, "createCacheWithoutLocator", new Object[] {mPort });
+
+    vm4.invoke(WANTestBase.class, "createSenderWithListener", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, false, true});
+    vm5.invoke(WANTestBase.class, "createSenderWithListener", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, false, true});
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    final Map keyValues = new HashMap();
+    for(int i=0; i< 1000; i++) {
+      keyValues.put(i, i);
+    }
+    
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR",
+      keyValues });
+
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", keyValues.size() });
+    
+    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", keyValues.size() });
+    
+    vm4.invoke(WANTestBase.class, "printEventListenerMap", new Object[]{});
+    vm5.invoke(WANTestBase.class, "printEventListenerMap", new Object[]{});
+    
+    vm4.invoke(SerialGatewaySenderEventListenerDUnitTest.class, "validateReceivedEventsMapSizeListener1", new Object[] {"ln", keyValues });
+  }
+  
+  /**
+   * Test validates whether the listener attached receives all the events.
+   */
+  public void testGatewaySenderEventListenerInvocation() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSenderWithListener", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, false, true});
+    vm5.invoke(WANTestBase.class, "createSenderWithListener", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, false, true});
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    final Map keyValues = new HashMap();
+    for(int i=0; i< 1000; i++) {
+      keyValues.put(i, i);
+    }
+
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR",
+      keyValues });
+
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", keyValues.size() });
+    
+    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", keyValues.size() });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 0 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 0 });
+    
+    vm4.invoke(SerialGatewaySenderEventListenerDUnitTest.class, "validateReceivedEventsMapSizeListener1", new Object[] {"ln", keyValues });
+  }
+
+  /**
+   * Test validates whether the listener attached receives all the events. 
+   * When there are 2 listeners attcahed to the GatewaySender.
+   */
+  public void testGatewaySender2EventListenerInvocation() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSenderWithListener", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true, true});
+    vm5.invoke(WANTestBase.class, "createSenderWithListener", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true, true});
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    final Map keyValues = new HashMap();
+    for(int i=0; i< 1000; i++) {
+      keyValues.put(i, i);
+    }
+
+    
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR",
+      keyValues });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 0 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 0 });
+    
+    vm4.invoke(SerialGatewaySenderEventListenerDUnitTest.class, "validateReceivedEventsMapSizeListener2", new Object[] {"ln", keyValues });
+  }
+  
+  /**
+   * Test vaildates whether the PoolImpl is created. Ideally when a listener is attached
+   * pool should not be created.
+   */
+  public void testGatewaySenderEventListenerPoolImpl() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, "createFirstLocatorWithDSId",
+        new Object[] {1});
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] {2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver",
+        new Object[] {nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver",
+        new Object[] {nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSenderWithListener", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, false, false });
+    
+    vm4.invoke(SerialGatewaySenderEventListenerDUnitTest.class, "validateNoPoolCreation", new Object[] {"ln" });
+  }
+  
+  // Test start/stop/resume on listener invocation
+  //this test hangs after the Darrel's checkin 36685. Need to work with Darrel.Commenting it out so that test suit will not hang
+  public void __testGatewaySenderEventListener_GatewayOperations() {
+
+    int mPort = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    vm4.invoke(WANTestBase.class, "createCacheWithoutLocator", new Object[] {mPort });
+    vm5.invoke(WANTestBase.class, "createCacheWithoutLocator", new Object[] {mPort });
+    vm6.invoke(WANTestBase.class, "createCacheWithoutLocator", new Object[] {mPort });
+    vm7.invoke(WANTestBase.class, "createCacheWithoutLocator", new Object[] {mPort });
+
+    vm4.invoke(WANTestBase.class, "createSenderWithListener", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, false, true});
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    final Map initialKeyValues = new HashMap();
+    for(int i=0; i< 1000; i++) {
+      initialKeyValues.put(i, i);
+    }
+    
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR",
+      initialKeyValues });
+
+    vm4.invoke(SerialGatewaySenderEventListenerDUnitTest.class, "validateReceivedEventsMapSizeListener1", new Object[] {"ln", initialKeyValues });
+    
+    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    
+    final Map keyValues = new HashMap();
+    for(int i=1000; i< 2000; i++) {
+      keyValues.put(i, i);
+    }
+    
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR",
+      keyValues });
+    
+    vm4.invoke(SerialGatewaySenderEventListenerDUnitTest.class, "validateReceivedEventsMapSizeListener1", new Object[] {"ln", initialKeyValues });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    final Map finalKeyValues = new HashMap();
+    for(int i=2000; i< 3000; i++) {
+      finalKeyValues.put(i, i);
+    }
+    
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR",
+      finalKeyValues });
+    
+    finalKeyValues.putAll(initialKeyValues);
+    vm4.invoke(SerialGatewaySenderEventListenerDUnitTest.class, "validateReceivedEventsMapSizeListener1", new Object[] {"ln", finalKeyValues });
+    
+  }
+    
+  public static void validateNoPoolCreation(final String siteId) {
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    for(GatewaySender sender: senders) {
+      if (sender.getId().equals(siteId)) {
+        AbstractGatewaySender sImpl = (AbstractGatewaySender)sender;
+        assertNull(sImpl.getProxy());
+      }
+    }
+  }
+  
+  public static void validateReceivedEventsMapSizeListener1(final String senderId, final HashMap map) {
+
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    GatewaySender sender = null;
+    for(GatewaySender s : senders){
+      if(s.getId().equals(senderId)){
+        sender = s;
+        break;
+      }
+    }
+    
+    final List<AsyncEventListener> listeners = ((AbstractGatewaySender)sender).getAsyncEventListeners();
+    if(listeners.size() == 1) {
+      final AsyncEventListener l = listeners.get(0);
+
+      WaitCriterion wc = new WaitCriterion() {
+        Map listenerMap;
+        public boolean done() {
+          listenerMap = ((MyGatewaySenderEventListener)l)
+              .getEventsMap();
+          boolean sizeCorrect = map.size() == listenerMap.size();
+          boolean keySetCorrect = listenerMap.keySet().containsAll(map.keySet());
+          boolean valuesCorrect = listenerMap.values().containsAll(map.values());
+          return sizeCorrect && keySetCorrect && valuesCorrect;
+        }
+
+        public String description() {
+          return "Waiting for all sites to get updated, the sizes are " + listenerMap.size() + " and " + map.size();
+        }
+      };
+      DistributedTestCase.waitForCriterion(wc, 60000, 500, true); 
+    }
+  }
+  
+  public static void validateReceivedEventsMapSizeListener2(final String senderId, final HashMap map) {
+
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    GatewaySender sender = null;
+    for(GatewaySender s : senders){
+      if(s.getId().equals(senderId)){
+        sender = s;
+        break;
+      }
+    }
+    
+    final List<AsyncEventListener> listeners = ((AbstractGatewaySender)sender).getAsyncEventListeners();
+    if(listeners.size() == 2) {
+      final AsyncEventListener l1 = listeners.get(0);
+      final AsyncEventListener l2 = listeners.get(1);
+
+      WaitCriterion wc = new WaitCriterion() {
+        Map listenerMap1, listenerMap2;
+        public boolean done() {
+          listenerMap1 = ((MyGatewaySenderEventListener)l1)
+              .getEventsMap();
+          
+          listenerMap2 = ((MyGatewaySenderEventListener2)l2)
+          .getEventsMap();
+          
+          boolean sizeCorrect = map.size() == listenerMap1.size();
+          boolean keySetCorrect = listenerMap1.keySet().containsAll(map.keySet());
+          boolean valuesCorrect = listenerMap1.values().containsAll(map.values());
+          
+          boolean sizeCorrect2 = map.size() == listenerMap2.size();
+          boolean keySetCorrect2 = listenerMap2.keySet().containsAll(map.keySet());
+          boolean valuesCorrect2 = listenerMap2.values().containsAll(map.values());
+          
+          
+          return sizeCorrect && keySetCorrect && valuesCorrect && sizeCorrect2 && keySetCorrect2 && valuesCorrect2;
+        }
+
+        public String description() {
+          return "Waiting for all sites to get updated, the sizes are "
+              + listenerMap1.size() + " and listenerMap2 "
+              + listenerMap2.size() + " expected map size " + map.size();
+        }
+      };
+      DistributedTestCase.waitForCriterion(wc, 60000, 500, true); 
+    }
+  }
+}
+

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
new file mode 100644
index 0000000..70b6ecb
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
@@ -0,0 +1,688 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+/**
+ * 
+ */
+package com.gemstone.gemfire.internal.cache.wan.serial;
+
+import java.util.Set;
+
+import org.junit.Ignore;
+
+import com.gemstone.gemfire.cache.RegionDestroyedException;
+import com.gemstone.gemfire.cache.wan.GatewaySender;
+import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
+import com.gemstone.gemfire.internal.cache.wan.GatewaySenderException;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+
+import dunit.AsyncInvocation;
+import dunit.RMIException;
+
+/**
+ * @author skumar
+ * 
+ */
+public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
+
+  private static final long serialVersionUID = 1L;
+
+  public SerialGatewaySenderOperationsDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+    addExpectedException("Connection reset");
+    addExpectedException("Broken pipe");
+    addExpectedException("Connection refused");
+    addExpectedException("could not get remote locator information");
+    addExpectedException("Unexpected IOException");
+    
+    //Stopping the gateway closed the region,
+    //which causes this exception to get logged
+    addExpectedException(RegionDestroyedException.class.getSimpleName());
+  }
+
+  public void testSerialGatewaySenderOperationsWithoutStarting() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        10000 });
+
+    vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
+        "verifyGatewaySenderOperations", new Object[] { "ln" });
+    vm5.invoke(SerialGatewaySenderOperationsDUnitTest.class,
+        "verifyGatewaySenderOperations", new Object[] { "ln" });
+
+  }
+
+  
+  public void testStartPauseResumeSerialGatewaySender() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        10000 });
+
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+
+    vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
+        "verifySenderPausedState", new Object[] { "ln" });
+    vm5.invoke(SerialGatewaySenderOperationsDUnitTest.class,
+        "verifySenderPausedState", new Object[] { "ln" });
+
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
+        new Object[] { testName + "_RR", 1000 });
+
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+
+    vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
+        "verifySenderResumedState", new Object[] { "ln" });
+    vm5.invoke(SerialGatewaySenderOperationsDUnitTest.class,
+        "verifySenderResumedState", new Object[] { "ln" });
+
+    try {
+      inv1.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail("Interrupted the async invocation.");
+    }
+
+    getLogWriter().info("Completed puts in the region");
+    
+    vm4.invoke(WANTestBase.class,
+        "validateQueueContents", new Object[] { "ln", 0 });
+    vm5.invoke(WANTestBase.class,
+        "validateQueueContents", new Object[] { "ln", 0 });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 10000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 10000 });
+
+  }
+
+  public void testStopSerialGatewaySender() throws Throwable {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        200 });
+    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+
+    vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
+        "verifySenderStoppedState", new Object[] { "ln" });
+    vm5.invoke(SerialGatewaySenderOperationsDUnitTest.class,
+        "verifySenderStoppedState", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+    vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+    /**
+     * Should have no effect on GatewaySenderState
+     */
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+
+    vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
+        "verifySenderStoppedState", new Object[] { "ln" });
+    vm5.invoke(SerialGatewaySenderOperationsDUnitTest.class,
+        "verifySenderStoppedState", new Object[] { "ln" });
+
+    AsyncInvocation vm4async = vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    AsyncInvocation vm5async = vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    int START_WAIT_TIME = 30000;
+    vm4async.getResult(START_WAIT_TIME);
+    vm5async.getResult(START_WAIT_TIME);
+
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+      10000 });
+
+    vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
+        "verifySenderResumedState", new Object[] { "ln" });
+    vm5.invoke(SerialGatewaySenderOperationsDUnitTest.class,
+        "verifySenderResumedState", new Object[] { "ln" });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", 10000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", 10000 });
+  }
+
+  public void testStopOneSerialGatewaySenderBothPrimary() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+
+    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+
+    vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
+        "verifySenderStoppedState", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        10000 });
+    
+    getLogWriter().info("Completed puts in the region");
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 10000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 10000 });
+  }
+
+  public void testStopOneSerialGatewaySender_PrimarySecondary() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+
+    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+
+    vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
+        "verifySenderStoppedState", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        10000 });
+    
+    getLogWriter().info("Completed puts in the region");
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 10000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 10000 });
+  }
+  
+  public void testStopOneSender_StartAnotherSender() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true });
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
+        "verifySenderStoppedState", new Object[] { "ln" });
+
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      false, 100, 10, false, true, null, true });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        10000 });
+    getLogWriter().info("Completed puts in the region");
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 10000 });
+  }
+
+  public void test_Bug44153_StopOneSender_StartAnotherSender_CheckQueueSize() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true });
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
+      1000 });
+    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+
+    vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
+        "verifySenderStoppedState", new Object[] { "ln" });
+
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      false, 100, 10, false, true, null, true });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm5.invoke(WANTestBase.class, "doPutsFrom", new Object[] { testName + "_RR", 1000, 11000 });
+
+    vm5.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
+        10000 });
+    vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm5.invoke(SerialGatewaySenderOperationsDUnitTest.class,
+        "verifySenderStoppedState", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
+      1000 });
+    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    getLogWriter().info("Completed puts in the region");
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 10000 });
+    vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 11000 });
+    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+  }
+  
+  /**
+   * Destroy SerialGatewaySender on all the nodes.
+   */
+  public void testDestroySerialGatewaySenderOnAllNodes() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+    
+    //before destroying, stop the sender
+    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "removeSenderFromTheRegion", new Object[] { "ln", testName + "_RR" });
+    vm5.invoke(WANTestBase.class, "removeSenderFromTheRegion", new Object[] { "ln", testName + "_RR" });
+
+    vm4.invoke(WANTestBase.class, "destroySender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "destroySender", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "verifySenderDestroyed", new Object[] { "ln", false });
+    vm5.invoke(WANTestBase.class, "verifySenderDestroyed", new Object[] { "ln", false });
+  }
+
+  /**
+   * Destroy SerialGatewaySender on a single node.
+   */
+  public void testDestroySerialGatewaySenderOnSingleNode() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+    
+    //before destroying, stop the sender
+    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+        
+    vm4.invoke(WANTestBase.class, "removeSenderFromTheRegion", new Object[] { "ln", testName + "_RR" });
+    
+    vm4.invoke(WANTestBase.class, "destroySender", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "verifySenderDestroyed", new Object[] { "ln", false });
+    vm5.invoke(WANTestBase.class, "verifySenderRunningState", new Object[] { "ln" });
+  }
+  
+  /**
+   * Since the sender is attached to a region and in use, it can not be destroyed.
+   * Hence, exception is thrown by the sender API.
+   */
+  public void testDestroySerialGatewaySenderExceptionScenario() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+    
+    try {
+      vm4.invoke(WANTestBase.class, "destroySender", new Object[] { "ln" });
+    } catch (RMIException e) {
+      assertTrue("Cause of the exception should be GatewaySenderException", e.getCause() instanceof GatewaySenderException);
+    }
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+  }
+  
+  public static void verifySenderPausedState(String senderId) {
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    GatewaySender sender = null;
+    for (GatewaySender s : senders) {
+      if (s.getId().equals(senderId)) {
+        sender = (AbstractGatewaySender)s;
+        break;
+      }
+    }
+    assertTrue(sender.isPaused());
+  }
+
+  public static void verifySenderResumedState(String senderId) {
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    AbstractGatewaySender sender = null;
+    for (GatewaySender s : senders) {
+      if (s.getId().equals(senderId)) {
+        sender = (AbstractGatewaySender)s;
+        break;
+      }
+    }
+    assertFalse(sender.isPaused());
+    assertTrue(sender.isRunning());
+  }
+
+  public static void verifySenderStoppedState(String senderId) {
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    AbstractGatewaySender sender = null;
+    for (GatewaySender s : senders) {
+      if (s.getId().equals(senderId)) {
+        sender = (AbstractGatewaySender)s;
+        break;
+      }
+    }
+    assertFalse(sender.isRunning());
+    assertFalse(sender.isPaused());
+  }
+
+  public static void verifyGatewaySenderOperations(String senderId) {
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    GatewaySender sender = null;
+    for (GatewaySender s : senders) {
+      if (s.getId().equals(senderId)) {
+        sender = s;
+        break;
+      }
+    }
+    assertFalse(sender.isPaused());
+    assertFalse(((AbstractGatewaySender)sender).isRunning());
+    sender.pause();
+    sender.resume();
+    sender.stop();
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
new file mode 100644
index 0000000..240d7f2
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
@@ -0,0 +1,329 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.wan.serial;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.DiskStore;
+import com.gemstone.gemfire.cache.DiskStoreFactory;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
+import com.gemstone.gemfire.cache.wan.GatewayEventFilter;
+import com.gemstone.gemfire.cache.wan.GatewaySender;
+import com.gemstone.gemfire.cache.wan.GatewaySenderFactory;
+import com.gemstone.gemfire.cache.wan.GatewayTransportFilter;
+import com.gemstone.gemfire.cache30.MyGatewayEventFilter1;
+import com.gemstone.gemfire.cache30.MyGatewayTransportFilter1;
+import com.gemstone.gemfire.cache30.MyGatewayTransportFilter2;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.internal.cache.RegionQueue;
+import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+
+import dunit.VM;
+
+
+public class SerialGatewaySenderQueueDUnitTest extends WANTestBase{
+
+  private static final long serialVersionUID = 1L;
+
+  public SerialGatewaySenderQueueDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+  }
+  
+  
+  public void testPrimarySecondaryQueueDrainInOrder_RR() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, "createFirstLocatorWithDSId",
+        new Object[] { 1 });
+
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createCache", new Object[] {nyPort });
+    vm3.invoke(WANTestBase.class, "createCache", new Object[] {nyPort });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm2.invoke(WANTestBase.class, "createReceiver2", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver2", new Object[] { nyPort });
+    
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSenderWithMultipleDispatchers", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true, 1, OrderPolicy.KEY });
+    vm5.invoke(WANTestBase.class, "createSenderWithMultipleDispatchers", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true, 1, OrderPolicy.KEY });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    
+    vm4.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ln", false});
+    vm5.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ln", false});
+    
+    vm2.invoke(WANTestBase.class, "addListenerOnRegion", new Object[] {testName + "_RR"});
+    vm3.invoke(WANTestBase.class, "addListenerOnRegion", new Object[] {testName + "_RR"});
+
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln"});
+    
+    vm6.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+      1000 });
+    pause(5000);
+    HashMap primarySenderUpdates = (HashMap)vm4.invoke(WANTestBase.class, "checkQueue");
+    HashMap secondarySenderUpdates = (HashMap)vm5.invoke(WANTestBase.class, "checkQueue");
+    assertEquals(primarySenderUpdates, secondarySenderUpdates);
+    
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln"});
+    pause(2000);
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln"});
+    pause(2000);
+    // We should wait till primarySenderUpdates and secondarySenderUpdates become same
+    // If in 300000ms they don't then throw error.
+    primarySenderUpdates = (HashMap)vm4.invoke(WANTestBase.class, "checkQueue");
+    secondarySenderUpdates = (HashMap)vm5.invoke(WANTestBase.class, "checkQueue");
+    
+    vm5.invoke(WANTestBase.class,
+        "checkQueueOnSecondary", new Object[] { primarySenderUpdates });
+//    assertEquals(primarySenderUpdates, secondarySenderUpdates);
+    
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln"});
+    pause(5000);
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", 1000 });
+    primarySenderUpdates = (HashMap)vm4.invoke(WANTestBase.class, "checkQueue");
+    HashMap receiverUpdates = (HashMap)vm2.invoke(WANTestBase.class, "checkQueue");
+    
+    List destroyList = (List)primarySenderUpdates.get("Destroy");
+    List createList = (List)receiverUpdates.get("Create");
+    for(int i = 0; i< 1000; i++){
+      assertEquals(destroyList.get(i), createList.get(i));
+    }
+    assertEquals(primarySenderUpdates.get("Destroy"), receiverUpdates.get("Create"));
+    
+    pause(5000);
+    // We expect that after this much time secondary would have got batchremoval message
+    // removing all the keys.
+    secondarySenderUpdates = (HashMap)vm5.invoke(WANTestBase.class, "checkQueue");
+    assertEquals(secondarySenderUpdates.get("Destroy"), receiverUpdates.get("Create"));
+  }
+  
+  public void testPrimarySecondaryQueueDrainInOrder_PR() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 1, 100, isOffHeap() });
+  
+    vm2.invoke(WANTestBase.class, "addListenerOnRegion", new Object[] {testName + "_PR"});
+    vm3.invoke(WANTestBase.class, "addListenerOnRegion", new Object[] {testName + "_PR"});
+  
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSenderWithMultipleDispatchers", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true, 1, OrderPolicy.KEY });
+    vm5.invoke(WANTestBase.class, "createSenderWithMultipleDispatchers", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true,1, OrderPolicy.KEY });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ln", false});
+    vm5.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ln", false});
+
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln"});
+    
+    vm6.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+      1000 });
+    pause(5000);
+    HashMap primarySenderUpdates = (HashMap)vm4.invoke(WANTestBase.class, "checkQueue");
+    HashMap secondarySenderUpdates = (HashMap)vm5.invoke(WANTestBase.class, "checkQueue");
+    vm5.invoke(WANTestBase.class,
+        "checkQueueOnSecondary", new Object[] { primarySenderUpdates });
+    
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln"});
+    pause(4000);
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln"});
+    pause(15000);
+    primarySenderUpdates = (HashMap)vm4.invoke(WANTestBase.class, "checkQueue");
+    secondarySenderUpdates = (HashMap)vm5.invoke(WANTestBase.class, "checkQueue");
+    assertEquals(primarySenderUpdates, secondarySenderUpdates);
+    
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln"});
+    pause(5000);
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 1000 });
+  }
+  
+  /**
+   * Test to validate that serial gateway sender queue diskSynchronous attribute
+   * when persistence of sender is enabled. 
+   */
+  public void test_ValidateSerialGatewaySenderQueueAttributes_1() {
+    Integer localLocPort = (Integer) vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    Integer remoteLocPort = (Integer) vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, localLocPort });
+
+    WANTestBase test = new WANTestBase(testName);
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost["
+        + localLocPort + "]");
+    InternalDistributedSystem ds = test.getSystem(props);
+    cache = CacheFactory.create(ds);
+
+    File directory = new File("TKSender" + "_disk_"
+        + System.currentTimeMillis() + "_" + VM.getCurrentVMNum());
+    directory.mkdir();
+    File[] dirs1 = new File[] { directory };
+    DiskStoreFactory dsf = cache.createDiskStoreFactory();
+    dsf.setDiskDirs(dirs1);
+    DiskStore diskStore = dsf.create("FORNY");
+
+    GatewaySenderFactory fact = cache.createGatewaySenderFactory();
+    fact.setBatchConflationEnabled(true);
+    fact.setBatchSize(200);
+    fact.setBatchTimeInterval(300);
+    fact.setPersistenceEnabled(true);// enable the persistence
+    fact.setDiskSynchronous(true);
+    fact.setDiskStoreName("FORNY");
+    fact.setMaximumQueueMemory(200);
+    fact.setAlertThreshold(1200);
+    GatewayEventFilter myeventfilter1 = new MyGatewayEventFilter1();
+    fact.addGatewayEventFilter(myeventfilter1);
+    GatewayTransportFilter myStreamfilter1 = new MyGatewayTransportFilter1();
+    fact.addGatewayTransportFilter(myStreamfilter1);
+    GatewayTransportFilter myStreamfilter2 = new MyGatewayTransportFilter2();
+    fact.addGatewayTransportFilter(myStreamfilter2);
+    final ExpectedException exTKSender = addExpectedException("Could not connect");
+    try {
+      GatewaySender sender1 = fact.create("TKSender", 2);
+
+      AttributesFactory factory = new AttributesFactory();
+      factory.addGatewaySenderId(sender1.getId());
+      factory.setDataPolicy(DataPolicy.PARTITION);
+      Region region = cache.createRegionFactory(factory.create()).create(
+          "test_ValidateGatewaySenderAttributes");
+      Set<GatewaySender> senders = cache.getGatewaySenders();
+      assertEquals(senders.size(), 1);
+      GatewaySender gatewaySender = senders.iterator().next();
+      Set<RegionQueue> regionQueues = ((AbstractGatewaySender) gatewaySender)
+          .getQueues();
+      assertEquals(regionQueues.size(), GatewaySender.DEFAULT_DISPATCHER_THREADS);
+      RegionQueue regionQueue = regionQueues.iterator().next();
+      assertEquals(true, regionQueue.getRegion().getAttributes()
+          .isDiskSynchronous());
+    } finally {
+      exTKSender.remove();
+    }
+
+  }
+  
+  /**
+   * Test to validate that serial gateway sender queue diskSynchronous attribute
+   * when persistence of sender is not enabled. 
+   */
+  public void test_ValidateSerialGatewaySenderQueueAttributes_2() {
+    Integer localLocPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    
+    Integer remoteLocPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, localLocPort });
+    
+    WANTestBase test = new WANTestBase(testName);
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + localLocPort + "]");
+    InternalDistributedSystem ds = test.getSystem(props);
+    cache = CacheFactory.create(ds);  
+
+    GatewaySenderFactory fact = cache.createGatewaySenderFactory();
+    fact.setBatchConflationEnabled(true);
+    fact.setBatchSize(200);
+    fact.setBatchTimeInterval(300);
+    fact.setPersistenceEnabled(false);//set persistence to false
+    fact.setDiskSynchronous(true);
+    fact.setMaximumQueueMemory(200);
+    fact.setAlertThreshold(1200);
+    GatewayEventFilter myeventfilter1 = new MyGatewayEventFilter1();
+    fact.addGatewayEventFilter(myeventfilter1);
+    GatewayTransportFilter myStreamfilter1 = new MyGatewayTransportFilter1();
+    fact.addGatewayTransportFilter(myStreamfilter1);
+    GatewayTransportFilter myStreamfilter2 = new MyGatewayTransportFilter2();
+    fact.addGatewayTransportFilter(myStreamfilter2);
+    final ExpectedException exp = addExpectedException("Could not connect");
+    try {
+      GatewaySender sender1 = fact.create("TKSender", 2);
+
+      AttributesFactory factory = new AttributesFactory();
+      factory.addGatewaySenderId(sender1.getId());
+      factory.setDataPolicy(DataPolicy.PARTITION);
+      Region region = cache.createRegionFactory(factory.create()).create(
+          "test_ValidateGatewaySenderAttributes");
+      Set<GatewaySender> senders = cache.getGatewaySenders();
+      assertEquals(senders.size(), 1);
+      GatewaySender gatewaySender = senders.iterator().next();
+      Set<RegionQueue> regionQueues = ((AbstractGatewaySender) gatewaySender)
+          .getQueues();
+      assertEquals(regionQueues.size(), GatewaySender.DEFAULT_DISPATCHER_THREADS);
+      RegionQueue regionQueue = regionQueues.iterator().next();
+
+      assertEquals(false, regionQueue.getRegion().getAttributes()
+          .isDiskSynchronous());
+    } finally {
+      exp.remove();
+    }
+  }
+  
+}


[54/70] incubator-geode git commit: GEODE-804: Remaining WAN and CQ changes from pivotal

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fdbab40/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
index 74501fb..01c618c 100644
--- a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
@@ -65,7 +65,7 @@ public class ParallelGatewaySenderImpl extends AbstractRemoteGatewaySender {
   
   @Override
   public void start() {
-    this.lifeCycleLock.writeLock().lock(); 
+    this.getLifeCycleLock().writeLock().lock(); 
     try {
       if (isRunning()) {
         logger.warn(LocalizedMessage.create(LocalizedStrings.GatewaySender_SENDER_0_IS_ALREADY_RUNNING, this.getId()));
@@ -112,7 +112,7 @@ public class ParallelGatewaySenderImpl extends AbstractRemoteGatewaySender {
       }
     }
     finally {
-      this.lifeCycleLock.writeLock().unlock();
+      this.getLifeCycleLock().writeLock().unlock();
     }
   }
   
@@ -127,7 +127,7 @@ public class ParallelGatewaySenderImpl extends AbstractRemoteGatewaySender {
 
   @Override
   public void stop() {
-    this.lifeCycleLock.writeLock().lock(); 
+    this.getLifeCycleLock().writeLock().lock(); 
     try {
       if (!this.isRunning()) {
         return;
@@ -164,7 +164,7 @@ public class ParallelGatewaySenderImpl extends AbstractRemoteGatewaySender {
 //      }
     }
     finally {
-      this.lifeCycleLock.writeLock().unlock();
+      this.getLifeCycleLock().writeLock().unlock();
     }
   }
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fdbab40/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderImpl.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderImpl.java
index d69d747..ad89c22 100644
--- a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderImpl.java
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderImpl.java
@@ -69,7 +69,7 @@ public class SerialGatewaySenderImpl extends AbstractRemoteGatewaySender {
       logger.debug("Starting gatewaySender : {}", this);
     }
     
-    this.lifeCycleLock.writeLock().lock();
+    this.getLifeCycleLock().writeLock().lock();
     try {
       if (isRunning()) {
         logger.warn(LocalizedMessage.create(LocalizedStrings.GatewaySender_SENDER_0_IS_ALREADY_RUNNING, this.getId()));
@@ -118,7 +118,7 @@ public class SerialGatewaySenderImpl extends AbstractRemoteGatewaySender {
   
       enqueueTempEvents();
     } finally {
-      this.lifeCycleLock.writeLock().unlock();
+      this.getLifeCycleLock().writeLock().unlock();
     }
   }
   
@@ -127,7 +127,7 @@ public class SerialGatewaySenderImpl extends AbstractRemoteGatewaySender {
     if (logger.isDebugEnabled()) {
       logger.debug("Stopping Gateway Sender : {}", this);
     }
-    this.lifeCycleLock.writeLock().lock();
+    this.getLifeCycleLock().writeLock().lock();
     try {
       // Stop the dispatcher
       AbstractGatewaySenderEventProcessor ev = this.eventProcessor;
@@ -148,7 +148,7 @@ public class SerialGatewaySenderImpl extends AbstractRemoteGatewaySender {
       
       clearTempEventsAfterSenderStopped();
     } finally {
-      this.lifeCycleLock.writeLock().unlock();
+      this.getLifeCycleLock().writeLock().unlock();
     }
     if (this.isPrimary()) {
       try {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fdbab40/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
index 751a697..84b4395 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
@@ -2221,8 +2221,20 @@ public class WANTestBase extends DistributedTestCase{
     }
   }
   
+  public static void stopReceivers() {
+    Set<GatewayReceiver> receivers = cache.getGatewayReceivers();
+    for (GatewayReceiver receiver : receivers) {
+      receiver.stop();
+    }
+  }
+  
+  public static void startReceivers() throws IOException {
+    Set<GatewayReceiver> receivers = cache.getGatewayReceivers();
+    for (GatewayReceiver receiver : receivers) {
+      receiver.start();
+    }
+  }
   
-   
   public static void createSender(String dsName, int remoteDsId,
       boolean isParallel, Integer maxMemory,
       Integer batchSize, boolean isConflation, boolean isPersistent,
@@ -3948,11 +3960,23 @@ public class WANTestBase extends DistributedTestCase{
     }
   }
   
-  public static void validateQueueSizeStat(String id, int queueSize) {
-    GatewaySender sender = cache.getGatewaySender(id);
-    GatewaySenderStats stats = ((AbstractGatewaySender) sender).getStatistics();
-    assertEquals(queueSize, stats.getEventQueueSize());
-    assertEquals(0, stats.getTempEventQueueSize());
+  public static void validateQueueSizeStat(String id, final int queueSize) {
+    final AbstractGatewaySender sender = (AbstractGatewaySender)  cache.getGatewaySender(id);
+    
+    waitForCriterion(new WaitCriterion() {
+      
+      @Override
+      public boolean done() {
+        return sender.getEventQueueSize() == queueSize;
+      }
+      
+      @Override
+      public String description() {
+        // TODO Auto-generated method stub
+        return null;
+      }
+    }, 30000, 50, false);
+    assertEquals(queueSize, sender.getEventQueueSize());
   }
   /**
    * This method is specifically written for pause and stop operations.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fdbab40/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
index 0ee0b36..9b78a8f 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
@@ -483,11 +483,8 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes
     vm6.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
     vm7.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
     
-    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
-    vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
-    vm6.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
-    vm7.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
-    
+    pause(2000);
+
     //SECOND RUN: do some of the puts after the senders are stopped
     vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
     

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fdbab40/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
index afb3555..2105cef 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
@@ -201,21 +201,28 @@ public class ConcurrentSerialGatewaySenderOperationsDUnitTest  extends WANTestBa
         testName + "_RR", "ln", isOffHeap() });
 
     vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        1000 });
+        20 });
 
     vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
     vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
 
     vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        1000 });
+        20 });
     
     vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 1000 });
+        testName + "_RR", 20 });
     vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 1000 });
+        testName + "_RR", 20 });
+    
+    vm2.invoke(WANTestBase.class, "stopReceivers");
+    vm3.invoke(WANTestBase.class, "stopReceivers");
     
     vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        200 });
+        20 });
+    
+    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 20 });
+    vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 20 });
+    
     vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
     vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
 
@@ -223,9 +230,9 @@ public class ConcurrentSerialGatewaySenderOperationsDUnitTest  extends WANTestBa
         "verifySenderStoppedState", new Object[] { "ln" });
     vm5.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
         "verifySenderStoppedState", new Object[] { "ln" });
+
     vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
     vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
-
     /**
      * Should have no effect on GatewaySenderState
      */
@@ -242,9 +249,18 @@ public class ConcurrentSerialGatewaySenderOperationsDUnitTest  extends WANTestBa
     int START_WAIT_TIME = 30000;
     vm4async.getResult(START_WAIT_TIME);
     vm5async.getResult(START_WAIT_TIME);
+    
+    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 20 });
+    vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 20 });
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-      10000 });
+    vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+      110 });
+    
+    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 130 });
+    vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 130 });
+    
+    vm2.invoke(WANTestBase.class, "startReceivers");
+    vm3.invoke(WANTestBase.class, "startReceivers");
 
     vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
         "verifySenderResumedState", new Object[] { "ln" });
@@ -252,12 +268,16 @@ public class ConcurrentSerialGatewaySenderOperationsDUnitTest  extends WANTestBa
         "verifySenderResumedState", new Object[] { "ln" });
     
     vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      testName + "_RR", 10000 });
+      testName + "_RR", 110 });
     vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      testName + "_RR", 10000 });
+      testName + "_RR", 110 });
+    
+    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+    vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
   }
 
-  public void testStopOneSerialGatewaySenderBothPrimary() {
+
+  public void testStopOneSerialGatewaySenderBothPrimary() throws Throwable {
     addExpectedException("Broken pipe");
     Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
         "createFirstLocatorWithDSId", new Object[] { 1 });
@@ -295,7 +315,7 @@ public class ConcurrentSerialGatewaySenderOperationsDUnitTest  extends WANTestBa
     vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
 
     vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        1000 });
+        100 });
 
     vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
 
@@ -303,14 +323,31 @@ public class ConcurrentSerialGatewaySenderOperationsDUnitTest  extends WANTestBa
         "verifySenderStoppedState", new Object[] { "ln" });
     
     vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        10000 });
+        200 });
     
     getLogWriter().info("Completed puts in the region");
 
     vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 10000 });
+        testName + "_RR", 200 });
     vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 10000 });
+        testName + "_RR", 200 });
+    
+  //Do some puts while restarting a sender
+    AsyncInvocation asyncPuts = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        2000 });
+    
+    Thread.sleep(10);
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    asyncPuts.getResult();
+    getLogWriter().info("Completed puts in the region");
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 2000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 2000 });
+    
+    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
   }
 
   public void Bug46921_testStopOneSerialGatewaySender_PrimarySecondary() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fdbab40/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
index 5aac8f1..cd25f16 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
@@ -490,11 +490,6 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
     vm6.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
     vm7.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
     
-    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
-    vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
-    vm6.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
-    vm7.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
-    
     pause(2000);
     
     //SECOND RUN: do some of the puts after the senders are stopped

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fdbab40/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
index 70b6ecb..bdaec73 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
@@ -210,21 +210,28 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
         testName + "_RR", "ln", isOffHeap() });
 
     vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        1000 });
+        20 });
 
     vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
     vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
 
     vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        1000 });
+        20 });
     
     vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 1000 });
+        testName + "_RR", 20 });
     vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 1000 });
+        testName + "_RR", 20 });
+    
+    vm2.invoke(WANTestBase.class, "stopReceivers");
+    vm3.invoke(WANTestBase.class, "stopReceivers");
     
     vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        200 });
+        20 });
+    
+    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 20 });
+    vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 20 });
+    
     vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
     vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
 
@@ -252,9 +259,17 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
     vm4async.getResult(START_WAIT_TIME);
     vm5async.getResult(START_WAIT_TIME);
 
+    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 20 });
+    vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 20 });
 
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-      10000 });
+    vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+      110 });
+    
+    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 130 });
+    vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 130 });
+    
+    vm2.invoke(WANTestBase.class, "startReceivers");
+    vm3.invoke(WANTestBase.class, "startReceivers");
 
     vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
         "verifySenderResumedState", new Object[] { "ln" });
@@ -262,12 +277,15 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
         "verifySenderResumedState", new Object[] { "ln" });
     
     vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      testName + "_RR", 10000 });
+      testName + "_RR", 110 });
     vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      testName + "_RR", 10000 });
+      testName + "_RR", 110 });
+    
+    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+    vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
   }
 
-  public void testStopOneSerialGatewaySenderBothPrimary() {
+  public void testStopOneSerialGatewaySenderBothPrimary() throws Throwable {
     Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
         "createFirstLocatorWithDSId", new Object[] { 1 });
     Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
@@ -304,7 +322,7 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
     vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
 
     vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        1000 });
+        100 });
 
     vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
 
@@ -312,14 +330,32 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
         "verifySenderStoppedState", new Object[] { "ln" });
     
     vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        10000 });
+        200 });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 200 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 200 });
+    
+    //Do some puts while restarting a sender
+    AsyncInvocation asyncPuts = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        2000 });
+    
+    Thread.sleep(10);
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
     
+    asyncPuts.getResult();
     getLogWriter().info("Completed puts in the region");
-
+    
     vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 10000 });
+        testName + "_RR", 2000 });
     vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 10000 });
+        testName + "_RR", 2000 });
+    
+    Thread.sleep(5000);
+    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+    
+    
   }
 
   public void testStopOneSerialGatewaySender_PrimarySecondary() {


[42/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
new file mode 100644
index 0000000..f4f524d
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
@@ -0,0 +1,3315 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+
+package com.gemstone.gemfire.cache.query.cq.dunit;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.EvictionAction;
+import com.gemstone.gemfire.cache.EvictionAttributes;
+import com.gemstone.gemfire.cache.MirrorType;
+import com.gemstone.gemfire.cache.PartitionAttributes;
+import com.gemstone.gemfire.cache.PartitionAttributesFactory;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionAttributes;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.client.PoolFactory;
+import com.gemstone.gemfire.cache.client.PoolManager;
+import com.gemstone.gemfire.cache.query.CqAttributes;
+import com.gemstone.gemfire.cache.query.CqAttributesFactory;
+import com.gemstone.gemfire.cache.query.CqAttributesMutator;
+import com.gemstone.gemfire.cache.query.CqExistsException;
+import com.gemstone.gemfire.cache.query.CqListener;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.IndexType;
+import com.gemstone.gemfire.cache.query.Query;
+import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.cache.query.SelectResults;
+import com.gemstone.gemfire.cache.query.Struct;
+import com.gemstone.gemfire.cache.query.data.Portfolio;
+import com.gemstone.gemfire.cache.query.internal.CqStateImpl;
+import com.gemstone.gemfire.cache.query.internal.DefaultQueryService;
+import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.cache30.CacheTestCase;
+import com.gemstone.gemfire.cache30.CertifiableTestCacheListener;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.internal.AvailablePortHelper;
+import com.gemstone.gemfire.internal.cache.InitialImageOperation;
+import com.gemstone.gemfire.internal.cache.LocalRegion;
+import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier;
+import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy;
+import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
+
+import dunit.DistributedTestCase;
+import dunit.Host;
+import dunit.SerializableRunnable;
+import dunit.VM;
+
+/**
+ * This class tests the ContiunousQuery mechanism in GemFire.
+ * It does so by creating a cache server with a cache and a pre-defined region and
+ * a data loader. The client creates the same region and attaches the connection pool.
+ * 
+ *
+ * @author anil
+ */
+public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
+  
+  /** The port on which the bridge server was started in this VM */
+  private static int bridgeServerPort;
+  
+  protected static int port = 0;
+  protected static int port2 = 0;
+  
+  public static int noTest = -1;
+  
+  public final String[] regions = new String[] {
+      "regionA",
+      "regionB"
+  };
+  
+  private final static int CREATE = 0;
+  private final static int UPDATE = 1;
+  private final static int DESTROY = 2;
+  private final static int INVALIDATE = 3;
+  private final static int CLOSE = 4;
+  private final static int REGION_CLEAR = 5;
+  private final static int REGION_INVALIDATE = 6;
+
+  static public final String KEY = "key-";
+
+  static private final String WAIT_PROPERTY = "CqQueryTest.maxWaitTime";
+
+  static private final int WAIT_DEFAULT = (20 * 1000);
+  
+  public static final long MAX_TIME = Integer.getInteger(WAIT_PROPERTY, 
+      WAIT_DEFAULT).intValue();
+
+  public final String[] cqs = new String [] {
+      //0 - Test for ">" 
+      "SELECT ALL * FROM /root/" + regions[0] + " p where p.ID > 0",
+      
+      //1 -  Test for "=" and "and".
+      "SELECT ALL * FROM /root/" + regions[0] + " p where p.ID = 2 and p.status='active'",
+      
+      //2 -  Test for "<" and "and".
+      "SELECT ALL * FROM /root/" + regions[1] + " p where p.ID < 5 and p.status='active'",
+      
+      // FOLLOWING CQS ARE NOT TESTED WITH VALUES; THEY ARE USED TO TEST PARSING LOGIC WITHIN CQ.
+      //3
+      "SELECT * FROM /root/" + regions[0] + " ;",
+      //4
+      "SELECT ALL * FROM /root/" + regions[0],
+      //5
+      "import com.gemstone.gemfire.cache.\"query\".data.Portfolio; " +
+      "SELECT ALL * FROM /root/" + regions[0] +  " TYPE Portfolio",
+      //6
+      "import com.gemstone.gemfire.cache.\"query\".data.Portfolio; " +
+      "SELECT ALL * FROM /root/" + regions[0] +  " p TYPE Portfolio",
+      //7
+      "SELECT ALL * FROM /root/" + regions[1] + " p where p.ID < 5 and p.status='active';",
+      //8
+      "SELECT ALL * FROM /root/" + regions[0] + "  ;",
+      //9
+      "SELECT ALL * FROM /root/" + regions[0] +" p where p.description = NULL",
+      // 10
+      "SELECT ALL * FROM /root/" + regions[0] + " p where p.ID > 0 and p.status='active'",
+      //11 - Test for "No Alias" 
+      "SELECT ALL * FROM /root/" + regions[0] + " where ID > 0",
+      
+  };
+  
+  private String[] invalidCQs = new String [] {
+      // Test for ">"
+      "SELECT ALL * FROM /root/invalidRegion p where p.ID > 0"
+  };
+  
+  public CqQueryUsingPoolDUnitTest(String name) {
+    super(name);
+  }
+  
+  public void setUp() throws Exception {
+    super.setUp();
+    
+    //We're seeing this on the server when the client
+    //disconnects.
+    addExpectedException("Connection reset");
+    addExpectedException("SocketTimeoutException");
+    addExpectedException("ServerConnectivityException");
+    addExpectedException("Socket Closed");
+    addExpectedException("SocketException");
+    // avoid IllegalStateException from HandShake by connecting all vms tor
+    // system before creating connection pools
+    getSystem();
+    invokeInEveryVM(new SerializableRunnable("getSystem") {
+      public void run() {
+        getSystem();
+      }
+    });
+    
+  }
+  
+  /* Returns Cache Server Port */
+  static int getCacheServerPort() {
+    return bridgeServerPort;
+  }
+  
+  /* Create Cache Server */
+  public void createServer(VM server)
+  {
+    createServer(server, 0);
+  }
+
+  public void createServer(VM server, final int p)
+  {
+    createServer(server, p, false);
+  }
+
+  public void createServer(VM server, final int thePort, final boolean eviction) {
+    MirrorType mirrorType = MirrorType.KEYS_VALUES;
+    createServer(server, thePort, eviction, mirrorType);
+  }
+  
+  public void createServer(VM server, final int thePort, final boolean eviction, final MirrorType mirrorType)
+  {
+    SerializableRunnable createServer = new CacheSerializableRunnable(
+        "Create Cache Server") {
+      public void run2() throws CacheException
+      {
+        getLogWriter().info("### Create Cache Server. ###");
+        AttributesFactory factory = new AttributesFactory();
+        factory.setScope(Scope.DISTRIBUTED_ACK);
+        factory.setMirrorType(mirrorType);
+
+        // setting the eviction attributes.
+        if (eviction) {
+          EvictionAttributes evictAttrs = EvictionAttributes
+            .createLRUEntryAttributes(100000, EvictionAction.OVERFLOW_TO_DISK);
+          factory.setEvictionAttributes(evictAttrs);
+        }
+
+        for (int i = 0; i < regions.length; i++) {
+          createRegion(regions[i], factory.createRegionAttributes());
+        }
+        
+        try {
+          startBridgeServer(thePort, true);
+        }
+
+        catch (Exception ex) {
+          fail("While starting CacheServer", ex);
+        }
+        
+      }
+    };
+
+    server.invoke(createServer);
+  }
+  
+  /**
+   * Create a bridge server with partitioned region.
+   * @param server VM where to create the bridge server.
+   * @param port bridge server port.
+   * @param isAccessor if true the under lying partitioned region will not host data on this vm.
+   * @param redundantCopies number of redundant copies for the primary bucket.
+   */
+  public void createServerWithPR(VM server, final int port, final boolean isAccessor, final int redundantCopies)
+  {
+    SerializableRunnable createServer = new CacheSerializableRunnable(
+        "Create Cache Server") {
+      public void run2() throws CacheException
+      {
+          getLogWriter().info("### Create Cache Server. ###");
+          //AttributesFactory factory = new AttributesFactory();
+          //factory.setScope(Scope.DISTRIBUTED_ACK);
+          //factory.setMirrorType(MirrorType.KEYS_VALUES);
+          
+          //int maxMem = 0;
+          AttributesFactory attr = new AttributesFactory();
+          //attr.setValueConstraint(valueConstraint);
+          PartitionAttributesFactory paf = new PartitionAttributesFactory();
+          if (isAccessor){
+            paf.setLocalMaxMemory(0);
+          }
+          PartitionAttributes prAttr = paf.setTotalNumBuckets(197).setRedundantCopies(redundantCopies).create();
+          attr.setPartitionAttributes(prAttr);
+          
+          assertFalse(getSystem().isLoner());
+          //assertTrue(getSystem().getDistributionManager().getOtherDistributionManagerIds().size() > 0);
+          for (int i = 0; i < regions.length; i++) {
+            Region r = createRegion(regions[i], attr.create());
+            getLogWriter().info("Server created the region: "+r);
+          }
+          try {
+            startBridgeServer(port, true);
+          }
+          catch (Exception ex) {
+            fail("While starting CacheServer", ex);
+          }
+       
+      }
+    };
+
+    server.invoke(createServer);
+  }
+  
+  
+  /* Close Cache Server */
+  public void closeServer(VM server) {
+    server.invoke(new SerializableRunnable("Close CacheServer") {
+      public void run() {
+        getLogWriter().info("### Close CacheServer. ###");
+        stopBridgeServer(getCache());
+      }
+    });
+  }
+  
+  /* Create Client */
+  public void createClient(VM client, final int serverPort, final String serverHost) {
+    int[] serverPorts = new int[] {serverPort};
+    createClient(client, serverPorts, serverHost, null, null); 
+  }
+  
+  /* Create Client */
+  public void createClient(VM client, final int[] serverPorts, final String serverHost, final String redundancyLevel, 
+      final String poolName) {
+    SerializableRunnable createQService =
+      new CacheSerializableRunnable("Create Client") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Create Client. ###");
+        //Region region1 = null;
+        // Initialize CQ Service.
+        try {
+          getCache().getQueryService();
+          addExpectedException("java.net.ConnectException");
+        } catch (Exception cqe) {
+          fail("Failed to getCQService.", cqe);
+        }
+        
+        AttributesFactory regionFactory = new AttributesFactory();
+        regionFactory.setScope(Scope.LOCAL);
+        
+        if (poolName != null) {
+          regionFactory.setPoolName(poolName);
+        } else {
+          if (redundancyLevel != null){
+            ClientServerTestCase.configureConnectionPool(regionFactory, serverHost, serverPorts, true, Integer.parseInt(redundancyLevel), -1, null);
+          } else {
+            ClientServerTestCase.configureConnectionPool(regionFactory, serverHost,serverPorts, true, -1, -1, null);
+          }
+        }
+        for (int i=0; i < regions.length; i++) {        
+          createRegion(regions[i], regionFactory.createRegionAttributes());
+          getLogWriter().info("### Successfully Created Region on Client :" + regions[i]);
+          //region1.getAttributesMutator().setCacheListener(new CqListener());
+        }
+      }
+    };
+    
+    client.invoke(createQService);
+  }
+
+
+  /* Close Client */
+  public void closeClient(VM client) {
+    SerializableRunnable closeCQService =
+      new CacheSerializableRunnable("Close Client") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Close Client. ###");
+        try {
+          ((DefaultQueryService)getCache().getQueryService()).closeCqService();
+        } catch (Exception ex) {
+          getLogWriter().info("### Failed to get CqService during ClientClose() ###");
+        }
+        
+      }
+    };
+    
+    client.invoke(closeCQService);
+    pause(1000);
+  }
+
+  public void createFunctionalIndex(VM vm, final String indexName, final String indexedExpression, final String fromClause) {
+    vm.invoke(new CacheSerializableRunnable("Create Functional Index") {
+      public void run2() throws CacheException {
+        QueryService qs = null;
+        try {
+          qs = getCache().getQueryService();
+        }catch (Exception ex) {
+          getLogWriter().info("### Failed to get CqService during ClientClose() ###");
+        }
+        try {
+          qs.createIndex(indexName, IndexType.FUNCTIONAL, indexedExpression, fromClause);
+        } catch (Exception ex) {
+          getLogWriter().info("### Failed to create Index :" + indexName);
+        }
+      }
+    });
+  }
+
+  /* Create/Init values */
+  public void createValues(VM vm, final String regionName, final int size) {
+    vm.invoke(new CacheSerializableRunnable("Create values") {
+      public void run2() throws CacheException {
+        Region region1 = getRootRegion().getSubregion(regionName);
+        for (int i = 1; i <= size; i++) {
+          region1.put(KEY+i, new Portfolio(i, i));
+        }
+        getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
+      }
+    });
+  }
+
+  /* Create/Init values */
+  public void createValuesWithTime(VM vm, final String regionName, final int size) {
+    vm.invoke(new CacheSerializableRunnable("Create values") {
+      public void run2() throws CacheException {
+        Region region1 = getRootRegion().getSubregion(regionName);
+        for (int i = 1; i <= size; i++) {
+          Portfolio portfolio = new Portfolio(i);
+          portfolio.createTime = System.currentTimeMillis();
+          region1.put(KEY+i, portfolio);
+        }
+        getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
+      }
+    });
+  }
+
+  /* delete values */
+  public void deleteValues(VM vm, final String regionName, final int size) {
+    vm.invoke(new CacheSerializableRunnable("Create values") {
+      public void run2() throws CacheException {
+        Region region1 = getRootRegion().getSubregion(regionName);
+        for (int i = 1; i <= size; i++) {
+          region1.destroy(KEY+i);
+        }
+        getLogWriter().info("### Number of Entries In Region after Delete :" + region1.keys().size());
+      }
+      
+    });
+  }
+  
+  /**
+   * support for invalidating values.
+   */  
+  public void invalidateValues(VM vm, final String regionName, final int size) {
+    vm.invoke(new CacheSerializableRunnable("Create values") {
+      public void run2() throws CacheException {
+        Region region1 = getRootRegion().getSubregion(regionName);
+        for (int i = 1; i <= size; i++) {
+          region1.invalidate(KEY+i);
+        }
+        getLogWriter().info("### Number of Entries In Region after Delete :" + region1.keys().size());
+      }
+      
+    });
+  }
+
+  public void createPool(VM vm, String poolName, String server, int port) {
+    createPool(vm, poolName, new String[]{server}, new int[]{port});  
+  }
+
+  public void createPool(VM vm, final String poolName, final String[] servers, final int[] ports) {
+    createPool(vm, poolName, servers, ports, null);
+  }
+  
+  public void createPool(VM vm, final String poolName, final String[] servers, final int[] ports, final String redundancyLevel) {
+    vm.invoke(new CacheSerializableRunnable("createPool :" + poolName) {
+      public void run2() throws CacheException {
+        // Create Cache.
+        getCache();
+        addExpectedException("java.net.ConnectException");
+        
+        PoolFactory cpf = PoolManager.createFactory();
+        cpf.setSubscriptionEnabled(true);
+
+        if (redundancyLevel != null){
+          int redundancy = Integer.parseInt(redundancyLevel);
+          cpf.setSubscriptionRedundancy(redundancy);
+        } 
+        
+        for (int i=0; i < servers.length; i++){
+          getLogWriter().info("### Adding to Pool. ### Server : " + servers[i] + " Port : " + ports[i]);
+          cpf.addServer(servers[i], ports[i]);
+        }
+        
+        cpf.create(poolName);
+      }
+    });   
+  }
+
+  /* Register CQs */
+  public void createCQ(VM vm, final String poolName, final String cqName, final String queryStr) {
+    vm.invoke(new CacheSerializableRunnable("Create CQ :" + cqName) {
+      public void run2() throws CacheException {
+        //pause(60 * 1000);
+        //getLogWriter().info("### DEBUG CREATE CQ START ####");
+        //pause(20 * 1000);
+        
+        getLogWriter().info("### Create CQ. ###" + cqName);
+        // Get CQ Service.
+        QueryService qService = null;
+        try {
+          qService = (PoolManager.find(poolName)).getQueryService();
+        } catch (Exception cqe) {
+          fail("Failed to getCQService.", cqe);
+        }
+        // Create CQ Attributes.
+        CqAttributesFactory cqf = new CqAttributesFactory();
+        CqListener[] cqListeners = {new CqQueryTestListener(getLogWriter())};
+        ((CqQueryTestListener)cqListeners[0]).cqName = cqName;
+        
+        cqf.initCqListeners(cqListeners);
+        CqAttributes cqa = cqf.create();
+        
+        // Create CQ.
+        try {
+          CqQuery cq1 = qService.newCq(cqName, queryStr, cqa);
+          assertTrue("newCq() state mismatch", cq1.getState().isStopped());
+        } catch (Exception ex){
+          AssertionError err = new AssertionError("Failed to create CQ " + cqName + " . ");
+          err.initCause(ex);
+          getLogWriter().info("QueryService is :" + qService, err);
+          throw err;
+        }
+      }
+    });   
+  }
+
+  // REMOVE..........
+  public void createCQ(VM vm, final String cqName, final String queryStr) {
+    vm.invoke(new CacheSerializableRunnable("Create CQ :" + cqName) {
+      public void run2() throws CacheException {
+        //pause(60 * 1000);
+        //getLogWriter().info("### DEBUG CREATE CQ START ####");
+        //pause(20 * 1000);
+        
+        getLogWriter().info("### Create CQ. ###" + cqName);
+        // Get CQ Service.
+        QueryService qService = null;
+        try {
+          qService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          fail("Failed to getCQService.", cqe);
+        }
+        // Create CQ Attributes.
+        CqAttributesFactory cqf = new CqAttributesFactory();
+        CqListener[] cqListeners = {new CqQueryTestListener(getLogWriter())};
+        ((CqQueryTestListener)cqListeners[0]).cqName = cqName;
+        
+        cqf.initCqListeners(cqListeners);
+        CqAttributes cqa = cqf.create();
+        
+        // Create CQ.
+        try {
+          CqQuery cq1 = qService.newCq(cqName, queryStr, cqa);
+          assertTrue("newCq() state mismatch", cq1.getState().isStopped());
+        } catch (Exception ex){
+          AssertionError err = new AssertionError("Failed to create CQ " + cqName + " . ");
+          err.initCause(ex);
+          getLogWriter().info("QueryService is :" + qService, err);
+          throw err;
+        }
+      }
+    });   
+  }
+
+  /* Register CQs  with no name, execute, and close*/
+  public void createAndExecCQNoName(VM vm, final String poolName,  final String queryStr) {
+    vm.invoke(new CacheSerializableRunnable("Create CQ with no name:" ) {
+      public void run2() throws CacheException {
+        //pause(60 * 1000);
+        getLogWriter().info("### DEBUG CREATE CQ START ####");
+        //pause(20 * 1000);
+        
+        getLogWriter().info("### Create CQ with no name. ###");
+        // Get CQ Service.
+        QueryService qService = null;
+        CqQuery cq1 = null;
+        String cqName = null;
+
+        try {
+          qService = (PoolManager.find(poolName)).getQueryService();
+        } catch (Exception cqe) {
+          fail("Failed to getCQService.", cqe);
+        }
+        
+        SelectResults cqResults = null;
+        for (int i = 0; i < 20; ++i) {
+          // Create CQ Attributes.
+          CqAttributesFactory cqf = new CqAttributesFactory();
+          CqListener[] cqListeners = {new CqQueryTestListener(getLogWriter())};
+          
+          cqf.initCqListeners(cqListeners);
+          CqAttributes cqa = cqf.create();
+          
+          // Create CQ with no name and execute with initial results.
+          try {
+            cq1 = qService.newCq(queryStr, cqa);
+            ((CqQueryTestListener)cqListeners[0]).cqName = cq1.getName();
+          } catch (Exception ex){
+            getLogWriter().info("CQService is :" + qService);
+            fail("Failed to create CQ with no name" +  " . ", ex);
+          }
+          
+          if (cq1 == null) {
+            getLogWriter().info("Failed to get CqQuery object for CQ with no name.");
+          }
+          else {
+            cqName = cq1.getName();
+            getLogWriter().info("Created CQ with no name, generated CQ name: " + cqName + " CQ state:" + cq1.getState());
+            assertTrue("Create CQ with no name illegal state", cq1.getState().isStopped());
+          }
+          if ( i%2 == 0) {
+            try {
+              cqResults = cq1.executeWithInitialResults();
+            } catch (Exception ex){
+              getLogWriter().info("CqService is :" + qService);
+              fail("Failed to execute CQ with initial results, cq name: " 
+                  + cqName + " . ",  ex);
+            }
+            getLogWriter().info("initial result size = " + cqResults.size());
+            getLogWriter().info("CQ state after execute with initial results = " + cq1.getState());
+            assertTrue("executeWithInitialResults() state mismatch", cq1.getState().isRunning());
+          }
+          else {
+            try {
+              cq1.execute();
+            } catch (Exception ex){
+              getLogWriter().info("CQService is :" + qService);
+              fail("Failed to execute CQ " + cqName + " . ", ex);
+            }
+            getLogWriter().info("CQ state after execute = " + cq1.getState());
+            assertTrue("execute() state mismatch", cq1.getState().isRunning());
+          }
+          
+          //Close the CQ
+          try {
+            cq1.close();
+          } catch (Exception ex){
+            getLogWriter().info("CqService is :" + qService);
+            fail("Failed to close CQ " + cqName + " . ", ex);
+          }
+          assertTrue("closeCq() state mismatch", cq1.getState().isClosed());
+        }
+      }
+    });   
+  }
+  
+  public void executeCQ(VM vm, final String cqName, final boolean initialResults,
+      String expectedErr) {
+    executeCQ(vm, cqName, initialResults, noTest, null, expectedErr);
+  }    
+  
+  /**
+   * Execute/register CQ as running.
+   * @param initialResults true if initialResults are requested
+   * @param expectedResultsSize if >= 0, validate results against this size
+   * @param expectedErr if not null, an error we expect
+   */    
+  public void executeCQ(VM vm, final String cqName,
+      final boolean initialResults,
+      final int expectedResultsSize,
+      final String[] expectedKeys,
+      final String expectedErr) {
+    vm.invoke(new CacheSerializableRunnable("Execute CQ :" + cqName) {
+
+      private void work() throws CacheException {
+      //pause(60 * 1000);
+      getLogWriter().info("### DEBUG EXECUTE CQ START ####");
+      //pause(20 * 1000);
+      
+      // Get CQ Service.
+      QueryService cqService = null;
+      CqQuery cq1 = null;
+//    try {
+      cqService = getCache().getQueryService();
+//    } catch (Exception cqe) {
+//    getLogWriter().error(cqe);
+//    AssertionError err = new AssertionError("Failed to get QueryService" + cqName);
+//    err.initCause(ex);
+//    throw err;
+//    fail("Failed to getCQService.");
+//    }
+      
+      // Get CqQuery object.
+      try {
+        cq1 = cqService.getCq(cqName);
+        if (cq1 == null) {
+          getLogWriter().info("Failed to get CqQuery object for CQ name: " + cqName);
+          fail("Failed to get CQ " + cqName);
+        }
+        else {
+          getLogWriter().info("Obtained CQ, CQ name: " + cq1.getName());
+          assertTrue("newCq() state mismatch", cq1.getState().isStopped());
+        }
+      } catch (Exception ex){
+        getLogWriter().info("CqService is :" + cqService);
+        getLogWriter().error(ex);
+        AssertionError err = new AssertionError("Failed to execute  CQ " + cqName);
+        err.initCause(ex);
+        throw err;
+      }
+      
+      if (initialResults) {
+        SelectResults cqResults = null;
+        
+        try {
+          cqResults = cq1.executeWithInitialResults();
+        } catch (Exception ex){
+          getLogWriter().info("CqService is :" + cqService);
+          ex.printStackTrace();
+          AssertionError err = new AssertionError("Failed to execute  CQ " + cqName);
+          err.initCause(ex);
+          throw err;
+        }
+        getLogWriter().info("initial result size = " + cqResults.size());
+        assertTrue("executeWithInitialResults() state mismatch", cq1.getState().isRunning());
+        if (expectedResultsSize >= 0) {
+          assertEquals("Unexpected results size for CQ: " + cqName + 
+              " CQ Query :" + cq1.getQueryString(), 
+              expectedResultsSize, cqResults.size());
+        }
+        
+        if (expectedKeys != null) {
+          HashSet resultKeys = new HashSet();
+          for (Object o : cqResults.asList()) {
+            Struct s = (Struct)o;
+            resultKeys.add(s.get("key"));
+          }
+          for (int i =0; i < expectedKeys.length; i++){
+            assertTrue("Expected key :" +  expectedKeys[i] + 
+                " Not found in CqResults for CQ: " + cqName + 
+              " CQ Query :" + cq1.getQueryString() + 
+              " Keys in CqResults :" + resultKeys,
+              resultKeys.contains(expectedKeys[i]));
+          }
+        }
+      } 
+      else {
+        try {
+          cq1.execute();
+        } catch (Exception ex){
+          AssertionError err = new AssertionError("Failed to execute  CQ " + cqName);
+          err.initCause(ex);
+          if (expectedErr == null) {
+            getLogWriter().info("CqService is :" + cqService, err);
+          }
+          throw err;
+        }
+        assertTrue("execute() state mismatch", cq1.getState().isRunning());
+      }
+    }
+      
+      public void run2() throws CacheException {
+        if (expectedErr != null) {
+          getCache().getLogger().info("<ExpectedException action=add>"
+                + expectedErr + "</ExpectedException>");
+        }
+        try {
+          work();
+        } 
+        finally {
+          if (expectedErr != null) {
+            getCache().getLogger().info("<ExpectedException action=remove>"
+              + expectedErr + "</ExpectedException>");
+          }
+        }
+      }
+      });   
+  }
+  
+  /* Stop/pause CQ */
+  public void stopCQ(VM vm, final String cqName) throws Exception {
+    vm.invoke(new CacheSerializableRunnable("Stop CQ :" + cqName) {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Stop CQ. ###" + cqName);
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          fail("Failed to getCQService.", cqe);
+        }
+        
+        // Stop CQ.
+        CqQuery cq1 = null;
+        try {
+          cq1 = cqService.getCq(cqName);
+          cq1.stop();
+        } catch (Exception ex){
+          fail("Failed to stop CQ " + cqName + " . ", ex);
+        }
+        assertTrue("Stop CQ state mismatch", cq1.getState().isStopped());
+      }
+    });
+  }
+  
+  // Stop and execute CQ repeatedly
+  /* Stop/pause CQ */
+  private void stopExecCQ(VM vm, final String cqName, final int count) throws Exception {
+    vm.invoke(new CacheSerializableRunnable("Stop CQ :" + cqName) {
+      public void run2() throws CacheException {
+        CqQuery cq1 = null;
+        getLogWriter().info("### Stop and Exec CQ. ###" + cqName);
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          fail("Failed to getCqService.", cqe);
+        }
+        
+        // Get CQ.
+        try {
+          cq1 = cqService.getCq(cqName);
+        } catch (Exception ex){
+          fail("Failed to get CQ " + cqName + " . ", ex);
+        }
+        
+        for (int i = 0; i < count; ++i) {
+          // Stop CQ.
+          try {
+            cq1.stop();
+          } catch (Exception ex) {
+            fail("Count = " + i + "Failed to stop CQ " + cqName + " . ", ex);
+          }
+          assertTrue("Stop CQ state mismatch, count = " + i, cq1.getState().isStopped());
+          getLogWriter().info("After stop in Stop and Execute loop, ran successfully, loop count: " + i);
+          getLogWriter().info("CQ state: " + cq1.getState());
+          
+          // Re-execute CQ
+          try {
+            cq1.execute();
+          } catch (Exception ex) {
+            fail("Count = " + i + "Failed to execute CQ " + cqName + " . ", ex);
+          }
+          assertTrue("Execute CQ state mismatch, count = " + i, cq1.getState().isRunning());
+          getLogWriter().info("After execute in Stop and Execute loop, ran successfully, loop count: " + i);
+          getLogWriter().info("CQ state: " + cq1.getState());
+        }
+      }
+    });
+  }
+  
+  
+  /* UnRegister CQs */
+  public void closeCQ(VM vm, final String cqName) throws Exception {
+    vm.invoke(new CacheSerializableRunnable("Close CQ :" + cqName) {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Close CQ. ###" + cqName);
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          fail("Failed to getCqService.", cqe);
+        }
+        
+        // Close CQ.
+        CqQuery cq1 = null;
+        try {
+          cq1 = cqService.getCq(cqName);
+          cq1.close();
+        } catch (Exception ex) {
+          fail("Failed to close CQ " + cqName + " . ", ex);
+        }
+        assertTrue("Close CQ state mismatch", cq1.getState().isClosed());
+      }
+    });
+  }
+  
+  /* Register CQs */
+  public void registerInterestListCQ(VM vm, final String regionName, final int keySize, final boolean all) {
+    vm.invoke(new CacheSerializableRunnable("Register InterestList and CQ") {
+      public void run2() throws CacheException {
+        
+        // Get CQ Service.
+        Region region = null;
+        try {
+          region = getRootRegion().getSubregion(regionName);
+          region.getAttributesMutator().setCacheListener(new CertifiableTestCacheListener(getLogWriter()));
+        } catch (Exception cqe) {
+          AssertionError err = new AssertionError("Failed to get Region.");
+          err.initCause(cqe);
+          throw err;
+
+        }
+        
+        try {
+          if (all) {
+            region.registerInterest("ALL_KEYS");
+          } else {
+            List list = new ArrayList();
+            for (int i = 1; i <= keySize; i++) {
+              list.add(KEY+i);
+            }
+            region.registerInterest(list);
+          }
+        } catch (Exception ex) {
+          AssertionError err = new AssertionError("Failed to Register InterestList");
+          err.initCause(ex);
+          throw err;
+        }
+      }
+    });   
+  }
+  
+  /* Validate CQ Count */
+  public void validateCQCount(VM vm, final int cqCnt) throws Exception {
+    vm.invoke(new CacheSerializableRunnable("validate cq count") {
+      public void run2() throws CacheException {
+        // Get CQ Service.
+        
+        QueryService cqService = null;
+        try {
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          fail("Failed to getCQService.", cqe);
+        }
+        
+        int numCqs = 0;
+        try {
+          numCqs = cqService.getCqs().length;
+        } catch (Exception ex) {
+          fail ("Failed to get the CQ Count.", ex);
+        }
+        assertEquals("Number of cqs mismatch.", cqCnt, numCqs);
+      }
+    });
+  }
+  
+  
+  /** 
+   * Throws AssertionError if the CQ can be found or if any other
+   * error occurs
+   */
+  private void failIfCQExists(VM vm, final String cqName) {
+    vm.invoke(new CacheSerializableRunnable("Fail if CQ exists") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Fail if CQ Exists. ### " + cqName);
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {          
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          fail("Failed to getCQService.", cqe);
+        }
+        
+        CqQuery cQuery = cqService.getCq(cqName);
+        if (cQuery != null) {
+          fail("Unexpectedly found CqQuery for CQ : " + cqName);
+        }
+      }
+    });
+  }
+  
+  private void validateCQError(VM vm, final String cqName,
+      final int numError) {
+    vm.invoke(new CacheSerializableRunnable("Validate CQs") {
+      public void run2() throws CacheException {
+        
+        getLogWriter().info("### Validating CQ. ### " + cqName);
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {          
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          fail("Failed to getCQService.", cqe);
+        }
+        
+        CqQuery cQuery = cqService.getCq(cqName);
+        if (cQuery == null) {
+          fail("Failed to get CqQuery for CQ : " + cqName);
+        }
+        
+        CqAttributes cqAttr = cQuery.getCqAttributes();
+        CqListener cqListener = cqAttr.getCqListener();
+        CqQueryTestListener listener = (CqQueryTestListener) cqListener;
+        listener.printInfo(false);
+        
+        // Check for totalEvents count.
+        if (numError != noTest) {
+          // Result size validation.
+          listener.printInfo(true);
+          assertEquals("Total Event Count mismatch", numError, listener.getErrorEventCount());
+        }
+      }
+    });
+  }
+  
+  public void validateCQ(VM vm, final String cqName,
+      final int resultSize,
+      final int creates,
+      final int updates,
+      final int deletes) {
+    validateCQ(vm, cqName, resultSize, creates, updates, deletes,
+        noTest, noTest, noTest, noTest);
+  }
+  
+  public void validateCQ(VM vm, final String cqName,
+      final int resultSize,
+      final int creates,
+      final int updates,
+      final int deletes,
+      final int queryInserts,
+      final int queryUpdates,
+      final int queryDeletes,
+      final int totalEvents) {
+    vm.invoke(new CacheSerializableRunnable("Validate CQs") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Validating CQ. ### " + cqName);
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {          
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          fail("Failed to getCQService.", cqe);
+        }
+        
+        CqQuery cQuery = cqService.getCq(cqName);
+        if (cQuery == null) {
+          fail("Failed to get CqQuery for CQ : " + cqName);
+        }
+        
+        CqAttributes cqAttr = cQuery.getCqAttributes();
+        CqListener cqListeners[] = cqAttr.getCqListeners();
+        CqQueryTestListener listener = (CqQueryTestListener) cqListeners[0];
+        listener.printInfo(false);
+        
+        // Check for totalEvents count.
+        if (totalEvents != noTest) {
+          // Result size validation.
+          listener.printInfo(true);
+          assertEquals("Total Event Count mismatch", totalEvents, listener.getTotalEventCount());
+        }
+        
+        if (resultSize != noTest) {
+          //SelectResults results = cQuery.getCqResults();
+          //getLogWriter().info("### CQ Result Size is :" + results.size());
+          // Result size validation.
+          // Since ResultSet is not maintained for this release.
+          // Instead of resultSize its been validated with total number of events.
+          fail("test for event counts instead of results size");
+//        assertEquals("Result Size mismatch", resultSize, listener.getTotalEventCount());
+        }
+        
+        // Check for create count.
+        if (creates != noTest) {
+          // Result size validation.
+          listener.printInfo(true);
+          assertEquals("Create Event mismatch", creates, listener.getCreateEventCount());
+        }
+        
+        // Check for update count.
+        if (updates != noTest) {
+          // Result size validation.
+          listener.printInfo(true);
+          assertEquals("Update Event mismatch", updates, listener.getUpdateEventCount());
+        }
+        
+        // Check for delete count.
+        if (deletes != noTest) {
+          // Result size validation.
+          listener.printInfo(true);
+          assertEquals("Delete Event mismatch", deletes, listener.getDeleteEventCount());
+        }
+        
+        // Check for queryInsert count.
+        if (queryInserts != noTest) {
+          // Result size validation.
+          listener.printInfo(true);
+          assertEquals("Query Insert Event mismatch", queryInserts, listener.getQueryInsertEventCount());
+        }
+        
+        // Check for queryUpdate count.
+        if (queryUpdates != noTest) {
+          // Result size validation.
+          listener.printInfo(true);
+          assertEquals("Query Update Event mismatch", queryUpdates, listener.getQueryUpdateEventCount());
+        }
+        
+        // Check for queryDelete count.
+        if (queryDeletes != noTest) {
+          // Result size validation.
+          listener.printInfo(true);
+          assertEquals("Query Delete Event mismatch", queryDeletes, listener.getQueryDeleteEventCount());
+        }        
+      }
+    });
+  }
+  
+  public void waitForCreated(VM vm, final String cqName, final String key){
+    waitForEvent(vm, 0, cqName, key);
+  }
+  
+  public void waitForUpdated(VM vm, final String cqName, final String key){
+    waitForEvent(vm, 1, cqName, key);
+  }
+  
+  public void waitForDestroyed(VM vm, final String cqName, final String key){
+    waitForEvent(vm, 2, cqName, key);
+  }
+  
+  public void waitForInvalidated(VM vm, final String cqName, final String key){
+    waitForEvent(vm, 3, cqName, key);
+  }
+  
+  public void waitForClose(VM vm, final String cqName){
+    waitForEvent(vm, 4, cqName, null);
+  }
+  
+  public void waitForRegionClear(VM vm, final String cqName){
+    waitForEvent(vm, 5, cqName, null);
+  }
+
+  public void waitForRegionInvalidate(VM vm, final String cqName){
+    waitForEvent(vm, 6, cqName, null);
+  }
+
+  private void waitForEvent(VM vm, final int event, final String cqName, final String key) {
+    vm.invoke(new CacheSerializableRunnable("validate cq count") {
+      public void run2() throws CacheException {
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          fail("Failed to getCQService.", cqe);
+        }
+        
+        CqQuery cQuery = cqService.getCq(cqName);
+        if (cQuery == null) {
+          fail("Failed to get CqQuery for CQ : " + cqName);
+        }
+        
+        CqAttributes cqAttr = cQuery.getCqAttributes();
+        CqListener[] cqListener = cqAttr.getCqListeners();
+        CqQueryTestListener listener = (CqQueryTestListener) cqListener[0];
+        
+        switch (event) {
+          case CREATE :
+            listener.waitForCreated(key);
+            break;
+            
+          case UPDATE :
+            listener.waitForUpdated(key);
+            break;
+            
+          case DESTROY :
+            listener.waitForDestroyed(key);
+            break;            
+            
+          case INVALIDATE :
+            listener.waitForInvalidated(key);
+            break;            
+            
+          case CLOSE :
+            listener.waitForClose();
+            break;            
+
+          case REGION_CLEAR :
+            listener.waitForRegionClear();
+            break;            
+
+          case REGION_INVALIDATE :
+            listener.waitForRegionInvalidate();
+            break;            
+
+        }
+      }
+    });
+  }
+  
+  /**
+   * Waits till the CQ state is same as the expected.
+   * Waits for max time, if the CQ state is not same as expected 
+   * throws exception.
+   */
+  public void waitForCqState(VM vm, final String cqName, final int state) {
+    vm.invoke(new CacheSerializableRunnable("Wait For cq State") {
+      public void run2() throws CacheException {
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          fail("Failed to getCQService.", cqe);
+        }
+
+        CqQuery cQuery = cqService.getCq(cqName);
+        if (cQuery == null) {
+          fail("Failed to get CqQuery for CQ : " + cqName);
+        }
+
+        // Get CQ State.
+        CqStateImpl cqState = (CqStateImpl)cQuery.getState();
+        // Wait max time, till the CQ state is as expected.
+        final long start = System.currentTimeMillis();
+        while (cqState.getState() != state) {
+          junit.framework.Assert.assertTrue("Waited over " + MAX_TIME 
+              + "ms for Cq State to be changed to " + state
+              + "; consider raising " + WAIT_PROPERTY, 
+              (System.currentTimeMillis() - start) < MAX_TIME);
+          pause(100);
+        }
+      }
+    });
+  }
+
+  public void clearCQListenerEvents(VM vm, final String cqName) {
+    vm.invoke(new CacheSerializableRunnable("validate cq count") {
+      public void run2() throws CacheException {
+        // Get CQ Service.
+        
+        QueryService cqService = null;
+        try {
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          fail("Failed to getCQService.", cqe);
+        }
+        
+        CqQuery cQuery = cqService.getCq(cqName);
+        if (cQuery == null) {
+          fail("Failed to get CqQuery for CQ : " + cqName);
+        }
+        
+        CqAttributes cqAttr = cQuery.getCqAttributes();
+        CqListener cqListener = cqAttr.getCqListener();
+        CqQueryTestListener listener = (CqQueryTestListener) cqListener;
+        listener.getEventHistory();        
+      }
+    });
+  }
+  
+  public void validateQuery(VM vm, final String query, final int resultSize) {
+    vm.invoke(new CacheSerializableRunnable("Validate Query") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Validating Query. ###");
+        QueryService qs = getCache().getQueryService();
+        
+        Query q = qs.newQuery(query);
+        try {
+          Object r = q.execute();
+          if(r instanceof Collection){
+            int rSize = ((Collection)r).size();
+            getLogWriter().info("### Result Size is :" + rSize);
+            assertEquals(rSize, resultSize);
+          }
+        }
+        catch (Exception e) {
+          fail("Failed to execute the query.", e);
+        }
+      }
+    });
+  }
+  
+  private Properties getConnectionProps(String[] hosts, int[] ports, Properties newProps) {
+    
+    Properties props = new Properties();
+    String endPoints = "";
+    String host = hosts[0];
+    for (int i=0; i < ports.length; i++){
+      if (hosts.length > 1)
+      {
+        host = hosts[i];
+      }
+      endPoints = endPoints + "server" + i + "=" + host + ":" + ports[i];
+      if (ports.length > (i+1))
+      {
+        endPoints = endPoints + ",";
+      }
+    }
+    
+    props.setProperty("endpoints", endPoints);
+    props.setProperty("retryAttempts", "1");
+    //props.setProperty("establishCallbackConnection", "true");
+    //props.setProperty("LBPolicy", "Sticky");
+    //props.setProperty("readTimeout", "120000");
+    
+    // Add other property elements.
+    if (newProps != null) {
+      Enumeration e = newProps.keys();
+      while(e.hasMoreElements()) {
+        String key = (String)e.nextElement();
+        props.setProperty(key, newProps.getProperty(key));
+      }
+    }
+    return props;
+  }
+  
+  
+  // Exercise CQ attributes mutator functions
+  private void mutateCQAttributes(VM vm, final String cqName, final int mutator_function) throws Exception {
+    vm.invoke(new CacheSerializableRunnable("Stop CQ :" + cqName) {
+      public void run2() throws CacheException {
+        CqQuery cq1 = null;
+        getLogWriter().info("### CQ attributes mutator for ###" + cqName);
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          fail("Failed to getCQService.", cqe);
+        }
+        
+        // Get CQ.
+        try {
+          cq1 = cqService.getCq(cqName);
+        } catch (Exception ex) {
+          fail("Failed to get CQ " + cqName + " . ", ex);
+        }
+        CqAttributesMutator cqAttrMutator = cq1.getCqAttributesMutator();
+        CqAttributes cqAttr = cq1.getCqAttributes();
+        CqListener cqListeners[];
+        switch (mutator_function) {
+          case CREATE:
+            // Reinitialize with 2 CQ Listeners
+            CqListener cqListenersArray[] = {new CqQueryTestListener(getCache().getLogger()), 
+              new CqQueryTestListener(getCache().getLogger())};
+            cqAttrMutator.initCqListeners(cqListenersArray);
+            cqListeners = cqAttr.getCqListeners();
+            assertEquals("CqListener count mismatch", cqListeners.length, 2);
+            break;
+            
+          case UPDATE:
+            // Add 2 new CQ Listeners
+            CqListener newListener1 = new CqQueryTestListener(getCache().getLogger());
+            CqListener newListener2 = new CqQueryTestListener(getCache().getLogger());
+            cqAttrMutator.addCqListener(newListener1);
+            cqAttrMutator.addCqListener(newListener2);
+            
+            cqListeners = cqAttr.getCqListeners();
+            assertEquals("CqListener count mismatch", cqListeners.length, 3);
+            break;
+            
+          case DESTROY:
+            cqListeners = cqAttr.getCqListeners();
+            cqAttrMutator.removeCqListener(cqListeners[0]);
+            cqListeners = cqAttr.getCqListeners();
+            assertEquals("CqListener count mismatch", cqListeners.length, 2);
+            
+            // Remove a listener and validate
+            cqAttrMutator.removeCqListener(cqListeners[0]);
+            cqListeners = cqAttr.getCqListeners();
+            assertEquals("CqListener count mismatch", cqListeners.length, 1);
+            break;
+        }
+      }
+    });
+  }
+  
+  
+  
+  
+  /**
+   * Test for InterestList and CQ registered from same clients.
+   * @throws Exception
+   */
+  public void testInterestListAndCQs() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    
+    /* Init Server and Client */
+    createServer(server);
+    final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    
+    String poolName = "testInterestListAndCQs";
+    createPool(client, poolName, host0, thePort);
+    
+    createClient(client, thePort, host0);
+    
+    /* Create CQs. */
+    createCQ(client, poolName, "testInterestListAndCQs_0", cqs[0]); 
+    validateCQCount(client, 1);
+    
+    /* Init values at server. */
+    final int size = 10;
+    
+    executeCQ(client, "testInterestListAndCQs_0", false, null); 
+    registerInterestListCQ(client, regions[0], size, false);
+    
+    createValues(server, regions[0], size);
+    // Wait for client to Synch.
+    
+    for (int i=1; i <=10; i++){
+      waitForCreated(client, "testInterestListAndCQs_0", KEY + i);
+    }
+    pause(5 * 1000);
+    
+    // validate CQs.
+    validateCQ(client, "testInterestListAndCQs_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ noTest,
+        /* deletes; */ noTest,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    
+    // Validate InterestList.
+    // CREATE
+    client.invoke(new CacheSerializableRunnable("validate updates") {
+      public void run2() throws CacheException {
+        final Region region = getRootRegion().getSubregion(regions[0]);
+        assertNotNull(region);
+        
+//        Set keys = region.entrySet();
+//        assertEquals("Mismatch, number of keys in local region is not equal to the interest list size", 
+//            size, keys.size());
+        // TODO does this WaitCriterion actually help?
+        WaitCriterion wc = new WaitCriterion() {
+          String excuse;
+          public boolean done() {
+            int sz = region.entrySet().size();
+            if (sz == size) {
+              return true;
+            }
+            excuse = "Mismatch, number of keys (" + sz + 
+                ") in local region is not equal to the interest list size (" +
+                size + ")";
+            return false;
+          }
+          public String description() {
+            return excuse;
+          }
+        };
+        DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+        
+        CertifiableTestCacheListener ctl = (CertifiableTestCacheListener) region.getAttributes().getCacheListener();
+        for (int i = 1; i <= 10; i++) {
+          ctl.waitForCreated(KEY+i);
+          assertNotNull(region.getEntry(KEY+i));
+        }
+      }
+    });
+    
+    // UPDATE
+    createValues(server, regions[0], size);
+    // Wait for client to Synch.
+    for (int i=1; i <=10; i++){
+      waitForUpdated(client, "testInterestListAndCQs_0", KEY + i);
+    }
+    
+    
+    client.invoke(new CacheSerializableRunnable("validate updates") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regions[0]);
+        assertNotNull(region);
+        
+        Set keys = region.entrySet();
+        assertEquals("Mismatch, number of keys in local region is not equal to the interest list size", 
+            size, keys.size());
+        
+        CertifiableTestCacheListener ctl = (CertifiableTestCacheListener) region.getAttributes().getCacheListener();
+        for (int i = 1; i <= 10; i++) {
+          ctl.waitForUpdated(KEY+i);
+          assertNotNull(region.getEntry(KEY+i));
+        }
+      }
+    });
+    
+    // INVALIDATE
+    server.invoke(new CacheSerializableRunnable("Invalidate values") {
+      public void run2() throws CacheException {
+        Region region1 = getRootRegion().getSubregion(regions[0]);
+        for (int i = 1; i <= size; i++) {
+          region1.invalidate(KEY+i);
+        }
+      }
+    });
+    
+    
+    waitForInvalidated(client, "testInterestListAndCQs_0", KEY + 10);
+    
+    
+    client.invoke(new CacheSerializableRunnable("validate invalidates") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regions[0]);
+        assertNotNull(region);
+        
+        Set keys = region.entrySet();
+        assertEquals("Mismatch, number of keys in local region is not equal to the interest list size", 
+            size, keys.size());
+        
+        CertifiableTestCacheListener ctl = (CertifiableTestCacheListener) region.getAttributes().getCacheListener();
+        for (int i = 1; i <= 10; i++) {
+          ctl.waitForInvalidated(KEY+i);
+          assertNotNull(region.getEntry(KEY+i));
+        }
+      }
+    });
+    
+    validateCQ(client, "testInterestListAndCQs_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ noTest,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ size,
+        /* totalEvents: */ size * 3);
+    
+    // DESTROY - this should not have any effect on CQ, as the events are
+    // already destroyed from invalidate events.
+    server.invoke(new CacheSerializableRunnable("Invalidate values") {
+      public void run2() throws CacheException {
+        Region region1 = getRootRegion().getSubregion(regions[0]);
+        for (int i = 1; i <= size; i++) {
+          region1.destroy(KEY+i);
+        }
+      }
+    });
+
+    // Wait for destroyed.
+    client.invoke(new CacheSerializableRunnable("validate destroys") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regions[0]);
+        assertNotNull(region);
+                
+        CertifiableTestCacheListener ctl = (CertifiableTestCacheListener) region.getAttributes().getCacheListener();
+        for (int i = 1; i <= 10; i++) {
+          ctl.waitForDestroyed(KEY+i);
+        }
+      }
+    });
+
+    validateCQ(client, "testInterestListAndCQs_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ noTest,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ size,
+        /* totalEvents: */ size * 3);
+
+    closeClient(client);
+    closeServer(server);
+  }
+  
+  
+  /**
+   * Test for CQ register and UnRegister.
+   * @throws Exception
+   */
+  public void testCQStopExecute() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    
+    /* Init Server and Client */
+    createServer(server);
+    final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    
+    String poolName = "testCQStopExecute";
+    createPool(client, poolName, host0, thePort);
+    
+    //createClient(client, thePort, host0);
+    
+    /* Create CQs. */
+    createCQ(client, poolName, "testCQStopExecute_0", cqs[0]); 
+    validateCQCount(client, 1);
+    
+    executeCQ(client, "testCQStopExecute_0", false, null); 
+    
+    /* Init values at server. */
+    int size = 10;
+    createValues(server, regions[0], size);
+    // Wait for client to Synch.
+    
+    waitForCreated(client, "testCQStopExecute_0", KEY+size);
+    
+    
+    // Check if Client and Server in sync.
+    //validateServerClientRegionEntries(server, client, regions[0]);
+    validateQuery(server, cqs[0], 10);    
+    // validate CQs.
+    //validateCQ(client, "testCQStopExecute_0", size, noTest, noTest, noTest);
+    validateCQ(client, "testCQStopExecute_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    // Test  CQ stop
+    stopCQ(client, "testCQStopExecute_0");
+    
+    // Test  CQ re-enable
+    executeCQ(client, "testCQStopExecute_0", false, null);
+    
+    /* Init values at server. */
+    createValues(server, regions[0], 20);
+    // Wait for client to Synch.
+    waitForCreated(client, "testCQStopExecute_0", KEY+20);
+    size = 30;
+    
+    // Check if Client and Server in sync.
+    //validateServerClientRegionEntries(server, client, regions[0]);
+    validateQuery(server, cqs[0], 20);    
+    // validate CQs.
+    //validateCQ(client, "testCQStopExecute_0", size, noTest, noTest, noTest);
+    validateCQ(client, "testCQStopExecute_0",
+        /* resultSize: */ noTest,
+        /* creates: */ 20,
+        /* updates: */ 10,
+        /* deletes; */ 0,
+        /* queryInserts: */ 20,
+        /* queryUpdates: */ 10,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    
+    // Stop and execute CQ 20 times
+    stopExecCQ(client, "testCQStopExecute_0", 20);
+    
+    // Test  CQ Close
+    closeCQ(client, "testCQStopExecute_0");
+    
+    // Close.
+    closeClient(client);
+    closeServer(server);
+  }
+  
+  /**
+   * Test for CQ Attributes Mutator functions
+   * @throws Exception
+   */
+  public void testCQAttributesMutator() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    
+    /* Init Server and Client */
+    createServer(server);
+    final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    
+    String poolName = "testCQAttributesMutator";
+    createPool(client, poolName, host0, thePort);
+    //createClient(client, thePort, host0);
+    
+    /* Create CQs. */
+    String cqName = new String("testCQAttributesMutator_0");
+    createCQ(client, poolName, cqName, cqs[0]); 
+    validateCQCount(client, 1);    
+    executeCQ(client,cqName, false, null); 
+    
+    /* Init values at server. */
+    int size = 10;
+    createValues(server, regions[0], size);
+    // Wait for client to Synch.
+    waitForCreated(client, cqName, KEY + size);
+    
+    // validate CQs.
+    validateCQ(client, cqName,
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    // Add 2 new CQ Listeners
+    mutateCQAttributes(client, cqName, UPDATE);
+    
+    /* Init values at server. */
+    createValues(server, regions[0], size * 2);
+    waitForCreated(client, cqName, KEY + (size * 2));
+        
+    validateCQ(client, cqName,
+        /* resultSize: */ noTest,
+        /* creates: */ 20,
+        /* updates: */ 10,
+        /* deletes; */ 0,
+        /* queryInserts: */ 20,
+        /* queryUpdates: */ 10,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ 30);
+    
+    // Remove 2 listeners and validate
+    mutateCQAttributes(client, cqName, DESTROY);
+    
+    validateCQ(client, cqName,
+        /* resultSize: */ noTest,
+        /* creates: */ 10,
+        /* updates: */ 10,
+        /* deletes; */ 0,
+        /* queryInserts: */ 10,
+        /* queryUpdates: */ 10,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ 20);
+    
+    // Reinitialize with 2 CQ Listeners
+    mutateCQAttributes(client, cqName, CREATE);  
+    
+    /* Delete values at server. */
+    deleteValues(server, regions[0], 20);
+    // Wait for client to Synch.
+    waitForDestroyed(client, cqName, KEY + (size * 2));
+    
+    validateCQ(client, cqName,
+        /* resultSize: */ noTest,
+        /* creates: */ 0,
+        /* updates: */ 0,
+        /* deletes; */ 20,
+        /* queryInserts: */ 0,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 20,
+        /* totalEvents: */ 20);
+    
+    // Close CQ
+    closeCQ(client, cqName);
+    
+    // Close.
+    closeClient(client);
+    closeServer(server);
+  }
+  
+  /**
+   * Test for CQ register and UnRegister.
+   * @throws Exception
+   */
+  public void testCQCreateClose() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    
+    /* Init Server and Client */
+    createServer(server);
+    final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    
+    String poolName = "testCQCreateClose";
+    System.out.println("##### Pool Name :" + poolName + " host :" + host0 + " port :" + thePort);
+    createPool(client, poolName, host0, thePort);
+
+    // createClient(client, thePort, host0);
+    
+    /* debug */
+    //getLogWriter().info("### DEBUG STOP ####");
+    //pause(60 * 1000);
+    //getLogWriter().info("### DEBUG START ####");
+    
+    /* Create CQs. */
+    createCQ(client, poolName, "testCQCreateClose_0", cqs[0]); 
+    validateCQCount(client, 1);
+    
+    executeCQ(client, "testCQCreateClose_0", false, null); 
+    
+    /* Init values at server. */
+    int size = 10;
+    createValues(server, regions[0], size);
+    // Wait for client to Synch.
+    waitForCreated(client, "testCQCreateClose_0", KEY+size);
+    
+    // Check if Client and Server in sync.
+    //validateServerClientRegionEntries(server, client, regions[0]);
+    validateQuery(server, cqs[0], 10);    
+    // validate CQs.
+    validateCQ(client, "testCQCreateClose_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    // Test  CQ stop
+    stopCQ(client, "testCQCreateClose_0");
+    
+    // Test  CQ re-enable
+    executeCQ(client, "testCQCreateClose_0", false, null);
+    
+    // Test  CQ Close
+    closeCQ(client, "testCQCreateClose_0");
+    
+    //Create CQs with no name, execute, and close. 
+    // UNCOMMENT....
+    createAndExecCQNoName(client, poolName, cqs[0]); 
+    
+    // Accessing the closed CQ.
+    failIfCQExists(client, "testCQCreateClose_0");
+    
+    // re-Create the cq which is closed.
+    createCQ(client, poolName, "testCQCreateClose_0", cqs[0]);
+    
+    /* Test CQ Count */
+    validateCQCount(client, 1);
+    
+    // Registering CQ with same name from same client.
+    try {
+      createCQ(client, poolName, "testCQCreateClose_0", cqs[0]);
+      fail("Trying to create CQ with same name. Should have thrown CQExistsException");
+    } catch (dunit.RMIException rmiExc) {
+      Throwable cause = rmiExc.getCause();
+      assertTrue("unexpected cause: " + cause.getClass().getName(), cause instanceof AssertionError);
+      Throwable causeCause = cause.getCause(); // should be a CQExistsException
+      assertTrue("Got wrong exception: " + causeCause.getClass().getName(),
+          causeCause instanceof CqExistsException);
+    }
+    
+    // Getting values from non-existent CQ.
+    failIfCQExists(client, "testCQCreateClose_NO");
+    
+    // Server Registering CQ.
+    try {
+      createCQ(server, "testCQCreateClose_1", cqs[0]);
+      fail("Trying to create CQ on Cache Server. Should have thrown Exception.");
+    } catch (dunit.RMIException rmiExc) {
+      Throwable cause = rmiExc.getCause();
+      assertTrue("unexpected cause: " + cause.getClass().getName(), 
+          cause instanceof AssertionError);
+      Throwable causeCause = cause.getCause(); // should be a IllegalStateException
+      assertTrue("Got wrong exception: " + causeCause.getClass().getName(),
+          causeCause instanceof IllegalStateException);
+    }
+        
+    validateCQCount(client, 1);
+    
+    createCQ(client, poolName, "testCQCreateClose_3", cqs[2]);
+    
+    validateCQCount(client, 2);
+    
+    /* Test for closeAllCQs() */
+    
+    client.invoke(new CacheSerializableRunnable("CloseAll CQ :") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Close All CQ. ###");
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {          
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          getLogWriter().info("Failed to getCQService.", cqe);
+          fail("Failed to getCQService.", cqe);
+        }
+        
+        // Close CQ.
+        try {
+          cqService.closeCqs();
+        } catch (Exception ex) {
+          getLogWriter().info("Failed to close All CQ.", ex);
+          fail("Failed to close All CQ. ", ex);
+        }
+      }
+    });
+    
+    validateCQCount(client, 0);
+    
+    // Initialize.
+    createCQ(client, poolName, "testCQCreateClose_2", cqs[1]);
+    createCQ(client, poolName, "testCQCreateClose_4", cqs[1]);
+    createCQ(client, poolName, "testCQCreateClose_5", cqs[1]);
+    
+    // Execute few of the initialized cqs
+    executeCQ(client, "testCQCreateClose_4", false, null);
+    executeCQ(client, "testCQCreateClose_5", false, null);
+    
+    // Call close all CQ.
+    client.invoke(new CacheSerializableRunnable("CloseAll CQ 2 :") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Close All CQ 2. ###");
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {          
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          fail("Failed to getCQService.", cqe);
+        }
+        
+        // Close CQ.
+        try {
+          cqService.closeCqs();
+        } catch (Exception ex) {
+          fail("Failed to close All CQ  . ", ex);
+        }
+      }
+    });
+    
+    // Close.
+    closeClient(client);
+    closeServer(server);
+  }
+  
+  /**
+   * This will test the events after region destory.
+   * The CQs on the destroy region needs to be closed.
+   *
+   */
+  public void testRegionDestroy() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    
+    /* Init Server and Client */
+    createServer(server);
+    final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    
+    String poolName = "testRegionDestroy";
+    createPool(client, poolName, host0, thePort);
+    
+    createClient(client, thePort, host0);
+    
+    /* Create CQs. */
+    createCQ(client, poolName, "testRegionDestroy_0", cqs[0]); 
+    createCQ(client, poolName, "testRegionDestroy_1", cqs[0]); 
+    createCQ(client, poolName, "testRegionDestroy_2", cqs[0]); 
+    
+    executeCQ(client, "testRegionDestroy_0", false, null);
+    executeCQ(client, "testRegionDestroy_1", false, null);
+    executeCQ(client, "testRegionDestroy_2", false, null);
+    
+    /* Init values at server. */
+    final int size = 10;
+    registerInterestListCQ(client, regions[0], size, false);    
+    createValues(server, regions[0], size);
+    
+    // Wait for client to Synch.
+    
+    waitForCreated(client, "testRegionDestroy_0", KEY + 10);
+    
+    
+    // validate CQs.
+    validateCQ(client, "testRegionDestroy_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ noTest,
+        /* deletes; */ noTest,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    // Validate InterestList.
+    // CREATE
+    client.invoke(new CacheSerializableRunnable("validate updates") {
+      public void run2() throws CacheException {
+        // Wait for the region to become the correct size
+        WaitCriterion wc = new WaitCriterion() {
+          String excuse;
+          public boolean done() {
+            Region region = getRootRegion().getSubregion(regions[0]);
+            if (region == null) {
+              excuse = "Can't find region";
+              return false;
+            }
+            int sz = region.entrySet().size();
+            if (sz != size) {
+              excuse = "Region is of size " + sz + ", expected " + size;
+              return false;
+            }
+            return true;
+          }
+          public String description() {
+            return excuse;
+          }
+        };
+        DistributedTestCase.waitForCriterion(wc, 30 * 1000, 250, true);
+        
+        Region region = getRootRegion().getSubregion(regions[0]);
+        assertNotNull(region);
+        
+        CertifiableTestCacheListener ctl = (CertifiableTestCacheListener) 
+            region.getAttributes().getCacheListener();
+        for (int i = 1; i <= 10; i++) {
+          ctl.waitForCreated(KEY+i);
+          assertNotNull(region.getEntry(KEY+i));
+        }
+      }
+    });
+    
+    // Destroy Region.
+    server.invoke(new CacheSerializableRunnable("Destroy Region") {
+      public void run2() throws CacheException {
+        Region region1 = getRootRegion().getSubregion(regions[0]);
+        region1.destroyRegion();
+      }
+    });
+    
+    pause(2 * 1000);
+    validateCQCount(client, 0);
+    
+    closeClient(client);
+    closeServer(server);
+    
+  }
+  
+  /**
+   * Test for CQ with multiple clients.
+   */
+  public void testCQWithMultipleClients() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client1 = host.getVM(1);
+    VM client2 = host.getVM(2);
+    VM client3 = host.getVM(3);
+    
+    /* Create Server and Client */
+    createServer(server);
+    final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    
+    String poolName1 = "testCQWithMultipleClients1";
+    String poolName2 = "testCQWithMultipleClients2";
+    String poolName3 = "testCQWithMultipleClients3";
+    
+    createPool(client1, poolName1, host0, thePort);
+    createPool(client2, poolName2, host0, thePort);
+    
+    /* Create CQs. and initialize the region */
+    createCQ(client1, poolName1, "testCQWithMultipleClients_0", cqs[0]);
+    executeCQ(client1, "testCQWithMultipleClients_0", false, null);
+
+    createCQ(client2, poolName2, "testCQWithMultipleClients_0", cqs[0]);
+    executeCQ(client2, "testCQWithMultipleClients_0", false, null);
+    
+    int size = 10;
+    
+    // Create Values on Server.
+    createValues(server, regions[0], size);
+    
+    waitForCreated(client1, "testCQWithMultipleClients_0", KEY + 10);
+    
+    /* Validate the CQs */
+    validateCQ(client1, "testCQWithMultipleClients_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    waitForCreated(client2, "testCQWithMultipleClients_0", KEY + 10);
+    
+    validateCQ(client2, "testCQWithMultipleClients_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    
+    /* Close test */
+    closeCQ(client1, "testCQWithMultipleClients_0");
+    
+    validateCQ(client2, "testCQWithMultipleClients_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    /* Init new client and create cq */
+    createPool(client3, poolName3, host0, thePort);
+    
+    createCQ(client3, poolName3, "testCQWithMultipleClients_0", cqs[0]);
+    createCQ(client3, poolName3, "testCQWithMultipleClients_1", cqs[1]);
+    executeCQ(client3, "testCQWithMultipleClients_0", false, null);
+    executeCQ(client3, "testCQWithMultipleClients_1", false, null);
+    
+    // Update values on Server. This will be updated on new Client CQs.
+    createValues(server, regions[0], size);
+    
+    
+    waitForUpdated(client3, "testCQWithMultipleClients_0", KEY + 10);
+    
+    
+    validateCQ(client3, "testCQWithMultipleClients_0",
+        /* resultSize: */ noTest,
+        /* creates: */ 0,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ 0,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    validateCQ(client3, "testCQWithMultipleClients_1",
+        /* resultSize: */ noTest,
+        /* creates: */ 0,
+        /* updates: */ 1,
+        /* deletes; */ 0,
+        /* queryInserts: */ 0,
+        /* queryUpdates: */ 1,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ 1);    
+    
+    /* Validate the CQ count */
+    validateCQCount(client1, 0);
+    validateCQCount(client2, 1);
+    validateCQCount(client3, 2);
+    
+    /* Close Client Test */
+    closeClient(client1);
+    
+    clearCQListenerEvents(client2, "testCQWithMultipleClients_0");
+    clearCQListenerEvents(client3, "testCQWithMultipleClients_1");
+    
+    // Update values on server, update again.
+    createValues(server, regions[0], size);
+    
+    
+    waitForUpdated(client2, "testCQWithMultipleClients_0", KEY + 10);
+    
+    
+    validateCQ(client2, "testCQWithMultipleClients_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ size * 2,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size * 2,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size * 3);
+    
+    waitForUpdated(client3, "testCQWithMultipleClients_1", KEY + 2);
+    
+    validateCQ(client3, "testCQWithMultipleClients_1",
+        /* resultSize: */ noTest,
+        /* creates: */ 0,
+        /* updates: */ 2,
+        /* deletes; */ 0,
+        /* queryInserts: */ 0,
+        /* queryUpdates: */ 2,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ 2);    
+    
+    /* Close Server and Client */
+    closeClient(client2);
+    closeClient(client3);
+    closeServer(server);
+  }
+  
+  /**
+   * Test for CQ ResultSet.
+   */
+  public void testCQResultSet() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    
+    createServer(server);
+    
+    final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    
+    String poolName = "testCQResultSet";
+    createPool(client, poolName, host0, thePort);
+    
+    // Create client.
+    // createClient(client, thePort, host0);
+    
+    /* CQ Test with initial Values. */
+    int size = 10;
+    createValues(server, regions[0], size);
+    pause(1*500);
+    
+    // Create CQs.
+    createCQ(client, poolName, "testCQResultSet_0", cqs[0]);    
+    
+    // Check resultSet Size.
+    executeCQ(client, "testCQResultSet_0", true, 10, null, null);
+    
+    /* CQ Test with no Values on Region */
+    createCQ(client, poolName, "testCQResultSet_1", cqs[2]);
+    // Check resultSet Size.
+    executeCQ(client, "testCQResultSet_1", true, 0, null, null);
+    stopCQ(client, "testCQResultSet_1");
+    
+    // Init values.
+    createValues(server, regions[1], 5);    
+    validateQuery(server, cqs[2], 2);
+    
+    executeCQ(client, "testCQResultSet_1", true, 2, null, null);
+    
+    /* compare values...
+     Disabled since we don't currently maintain results on the client
+     
+     validateCQ(client, "testCQResultSet_1", 2, noTest, noTest, noTest);
+     Portfolio[] values = new Portfolio[] {new Portfolio(2), new Portfolio(4)}; 
+     Hashtable t = new Hashtable();
+     String[] keys = new String[] {"key-2", "key-4"};
+     t.put(keys[0], values[0]);
+     t.put(keys[1], values[1]);
+     
+     compareValues(client, "testCQResultSet_1", t);
+     
+     deleteValues(server, regions[1], 3);
+     t.remove("key-4");
+     pause(2 * 1000);
+     
+     try {
+     compareValues(client, "testCQResultSet_1", t);
+     fail("Should have thrown Exception. The value should not be present in cq results region");
+     }
+     catch (Exception ex) { // @todo check for specific exception type
+     }
+     
+     */
+    
+    // Close.
+    closeClient(client);    
+    closeServer(server);
+  }
+  
+  /**
+   * Test for CQ Listener events.
+   *
+   */
+  public void testCQEvents() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    
+    createServer(server);
+    
+    final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+
+    String poolName = "testCQEvents";
+    createPool(client, poolName, host0, thePort);
+
+    // Create client.
+    //createClient(client, thePort, host0);
+    
+    // Create CQs.
+    createCQ(client, poolName, "testCQEvents_0", cqs[0]);
+    
+    executeCQ(client, "testCQEvents_0", false, null); 
+    
+    // Init values at server.
+    int size = 10;
+    createValues(server, regions[0], size);
+    
+    waitForCreated(client, "testCQEvents_0", KEY+size);
+    
+    // validate Create events.
+    validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    // Update values.
+    createValues(server, regions[0], 5);
+    createValues(server, regions[0], 10);
+    
+    waitForUpdated(client, "testCQEvents_0", KEY+size);
+    
+    
+    // validate Update events.
+    validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ 15,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 15,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size + 15);
+    
+    // Validate delete events.
+    deleteValues(server, regions[0], 5);
+    waitForDestroyed(client, "testCQEvents_0", KEY+5);
+    
+    validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ 15,
+        /* deletes; */5,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 15,
+        /* queryDeletes: */ 5,
+        /* totalEvents: */ size + 15 + 5);
+    
+    // Insert invalid Events.
+    server.invoke(new CacheSerializableRunnable("Create values") {
+      public void run2() throws CacheException {
+        Region region1 = getRootRegion().getSubregion(regions[0]);
+        for (int i = -1; i >= -5; i--) {
+          //change : new Portfolio(i) rdubey ( for Suspect strings problem).
+          //region1.put(KEY+i, new Portfolio(i) ); 
+          region1.put(KEY+i, KEY+i);
+        }
+      }
+    });
+    
+    pause(1 * 1000);
+    // cqs should not get any creates, deletes or updates. rdubey.
+    validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ 15,
+        /* deletes; */5,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 15,
+        /* queryDeletes: */ 5,
+        /* totalEvents: */ size + 15 + 5);
+       
+    // Close.
+    closeClient(client);
+    closeServer(server);
+  }
+  
+  /**
+   * Test query execution multiple times on server without ALIAS.
+   * @throws Exception
+   */
+  public void testCqEventsWithoutAlias() throws Exception {
+
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    
+    createServer(server);
+    
+    final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+
+    String poolName = "testCQEvents";
+    createPool(client, poolName, host0, thePort);
+
+    // Create client.
+    //createClient(client, thePort, host0);
+    
+    // Create CQs.
+    createCQ(client, poolName, "testCQEvents_0", cqs[11]);
+    
+    executeCQ(client, "testCQEvents_0", false, null); 
+    
+    // Init values at server.
+    int size = 10;
+    createValues(server, regions[0], size);
+    
+    waitForCreated(client, "testCQEvents_0", KEY+size);
+    
+    // validate Create events.
+    validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    // Update values.
+    createValues(server, regions[0], 5);
+    createValues(server, regions[0], 10);
+    
+    waitForUpdated(client, "testCQEvents_0", KEY+size);
+    
+    
+    // validate Update events.
+    validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ 15,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 15,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size + 15);
+    
+    // Validate delete events.
+    deleteValues(server, regions[0], 5);
+    waitForDestroyed(client, "testCQEvents_0", KEY+5);
+    
+    validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ 15,
+        /* deletes; */5,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 15,
+        /* queryDeletes: */ 5,
+        /* totalEvents: */ size + 15 + 5);
+    
+    // Insert invalid Events.
+    server.invoke(new CacheSerializableRunnable("Create values") {
+      public void run2() throws CacheException {
+        Region region1 = getRootRegion().getSubregion(regions[0]);
+        for (int i = -1; i >= -5; i--) {
+          //change : new Portfolio(i) rdubey ( for Suspect strings problem).
+          //region1.put(KEY+i, new Portfolio(i) ); 
+          region1.put(KEY+i, KEY+i);
+        }
+      }
+    });
+    
+    pause(1 * 1000);
+    // cqs should not get any creates, deletes or updates. rdubey.
+    validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ 15,
+        /* deletes; */5,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 15,
+        /* queryDeletes: */ 5,
+        /* totalEvents: */ size + 15 + 5);
+       
+    // Close.
+    closeClient(client);
+    closeServer(server);
+  }
+  /**
+   * Test for stopping and restarting CQs.
+   * @throws Exception
+   */
+  public void testEnableDisableCQ() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    
+    createServer(server);
+    
+    final int thePort = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+
+    String poolName = "testEnableDisableCQ";
+    createPool(client, poolName, host0, thePort);
+
+    // Create client.
+    //createClient(client, thePort, host0);
+    
+    // Create CQs.
+    createCQ(client, poolName, "testEnableDisable_0", cqs[0]);
+    executeCQ(client, "testEnableDisable_0", false, null);
+    
+    /* Test for disableCQ */
+    client.invoke(new CacheSerializableRunnable("Client disableCQs()") {
+      public void run2() throws CacheException {
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {
+          cqService = getCache().getQueryService();
+          cqService.stopCqs();
+        } catch (Exception cqe) {
+          fail("Failed to getCQService.", cqe);
+        }                
+      }      
+    });
+    
+    pause(1 * 1000);
+    // Init values at server.
+    int size = 10;
+    createValues(server, regions[0], size);
+    pause(1 * 500);
+    // There should not be any creates.
+    validateCQ(client, "testEnableDisable_0",
+        /* resultSize: */ noTest,
+        /* creates: */ 0,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ 0,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ 0);
+    
+    /* Test for enable CQ */
+    client.invoke(new CacheSerializableRunnable("Client enableCQs()") {
+      public void run2() throws CacheException {
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {
+          cqService = getCache().getQueryService();
+          cqService.executeCqs();
+        } catch (Exception cqe) {
+          fail("Failed to getCQService.", cqe);
+        }                
+      }
+    });
+    pause(1 * 1000);
+    createValues(server, regions[0], size);    
+    waitForUpdated(client, "testEnableDisable_0", KEY+size);
+    // It gets created on the CQs
+    validateCQ(client, "testEnableDisable_0",
+        /* resultSize: */ noTest,
+        /* creates: */ 0,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ 0,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    /* Test for disableCQ on Region*/
+    client.invoke(new CacheSerializableRunnable("Client disableCQs()") {
+      public void run2() throws CacheException {
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {
+          cqService = getCache().getQueryService();
+          cqService.stopCqs("/root/" + regions[0]);
+        } catch (Exception cqe) {
+          fail("Failed to getCQService.", cqe);
+        }                
+      }
+    });
+    
+    pause(2 * 1000);
+    deleteValues(server, regions[0], size / 2);
+    pause(1 * 500);    
+    // There should not be any deletes.
+    validateCQ(client, "testEnableDisable_0",
+        /* resultSize: */ noTest,
+        /* creates: */ 0,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ 0,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    /* Test for enable CQ on region */
+    client.invoke(new CacheSerializableRunnable("Client enableCQs()") {
+      public void run2() throws CacheException {
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {
+          cqService = getCache().getQueryService();
+          cqService.executeCqs("/root/" + regions[0]);
+        } catch (Exception cqe) {
+          fail("Failed to getCQService.", cqe);
+        }                
+      }
+    });
+    pause(1 * 1000);
+    createValues(server, regions[0], size / 2);    
+    waitForCreated(client, "testEnableDisable_0", KEY+(size / 2));
+    // Gets updated on the CQ.
+    validateCQ(client, "testEnableDisable_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size / 2,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size / 2,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size * 3 / 2);
+    
+    // Close.
+    closeClient(client);
+    closeServer(server);    
+  }
+  
+  /**
+   * Test for Complex queries.
+   * @throws Exception
+   */
+  public void testQuery() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    
+    createServer(server);
+    
+    final int thePort = server.invokeInt

<TRUNCATED>


[15/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java
new file mode 100644
index 0000000..1c073f9
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java
@@ -0,0 +1,1124 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.wan.misc;
+
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.CacheClosedException;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.EntryExistsException;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionDestroyedException;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.client.ServerConnectivityException;
+import com.gemstone.gemfire.cache.client.ServerOperationException;
+import com.gemstone.gemfire.cache.wan.GatewaySender;
+import com.gemstone.gemfire.distributed.internal.ReplyException;
+import com.gemstone.gemfire.internal.cache.BucketRegion;
+import com.gemstone.gemfire.internal.cache.ForceReattemptException;
+import com.gemstone.gemfire.internal.cache.PartitionedRegion;
+import com.gemstone.gemfire.internal.cache.PrimaryBucketException;
+import com.gemstone.gemfire.internal.cache.PutAllPartialResultException;
+import com.gemstone.gemfire.internal.cache.RegionQueue;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+
+import dunit.AsyncInvocation;
+import dunit.DistributedTestCase;
+import dunit.DistributedTestCase.ExpectedException;
+import dunit.DistributedTestCase.WaitCriterion;
+
+public class ReplicatedRegion_ParallelWANPropogationDUnitTest extends WANTestBase{
+
+  public ReplicatedRegion_ParallelWANPropogationDUnitTest(String name) {
+    super(name);
+    // TODO Auto-generated constructor stub
+  }
+
+  final String expectedExceptions = null;
+  
+  
+  /**
+   * 
+   */
+  private static final long serialVersionUID = 1L;
+
+  public void test_DR_PGS_1Nodes_Put_Receiver() throws Exception {
+    try {
+      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+          "createFirstLocatorWithDSId", new Object[] { 1 });
+      Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+          "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+      vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+      vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", null, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+      vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", "ln1", isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+          true, 10, 100, false, false, null, true });
+
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
+      fail("Expected GatewaySenderConfigException where parallel gateway sender can not be used with replicated region");
+    }
+    catch (Exception e) {
+      if (!e.getCause().getMessage()
+          .contains("can not be used with replicated region")) {
+        fail("Expected GatewaySenderConfigException where parallel gateway sender can not be used with replicated region");
+      }
+    }
+  }
+  
+  /*1. Validate that parallelGAtewaySenderId can be added to distributed region
+   *Region distributed ack/noack + PGS
+   *1. Find out the restrictions on totalNumBuckets on shadowPR
+   *2. Find out the restrictions on redundancy on shadowPR
+   *3. Find out the restrictions on localMaxMemory on shadowPR
+   *4. Find out the best way user will specify PR attributes to PGS
+   *5. Find out the restrictions on ordering.
+   *6. put on region populates the queue    
+   *7. put on region reaches to remote site. Dispatcher works as expected
+   *8. m1 and m2 has DR(ack/noack). put on DR from m1 populates queue on both m1 and m2. Validate that remote site got all the events
+   *9. m1 and m2 has DR(ack/noack). create/put/destroy/operations populates the queue. Validate that remote site got correct events
+   *10. m1 and m2 has DR(ack/noack). localDestory is called on m1's DR. This locally destroys M1's shadowPr
+   *11. m1 and m2 has DR(ack/noack). destory is called on m1's DR. This destroys entire shadowPr on m1 and m2
+   *12. m1 and m2 has DR(ack/noack). close Region is called on m1's DR. This locally destroys shadowPr on m1
+   *13. m1 and m2 has DR(ack/noack). cache.close on m1'. This locally destroys shadowPr on m1
+   *14. Validate HA scenario does not cause any event loss
+   *15. PDX events of DR are propagated to remote sites
+   *16. validate stats
+   *17: PR and DR regions with same name.. Can this be created. If yes then how to differentiate these 2 different shadowPR. 
+   *18. test for redundancy. FOR SPR's redundancy will be equal to the number of nodes where DR is present. Max is 3. I know this needs to be figure it out at runtime. 
+   *19. test without prviding diskstorename..I suspect some problem with this code. diskStoreName=null looks like this is not handled very well. need to verify
+   *20. PAralleGatewaySenderQueue#addPR method has multiple check for inPersistenceEnabled. Can's we do it with only one check.  
+  */
+  
+  /**
+   * Test to validate that created parallel gatewaySenderls id can be added to
+   * distributed region
+   * Below test is disabled intentionally
+    1> In this release 8.0, for rolling upgrade support queue name is changed to old style
+    2>Comman parallel sender for different non colocated regions is not supported in 8.0 so no need to bother about 
+      ParallelGatewaySenderQueue#convertPathToName
+    3> We have to enabled it in next release
+    4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 
+     and version prior to 8.0
+   */
+  public void DISABLED_test_PGS_Started_DR_CREATED_NO_RECEIVER() throws Exception {
+    try {
+      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+          "createFirstLocatorWithDSId", new Object[] { 1 });
+      Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+          "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+      vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+/*      ExpectedException exp1 = addExpectedException(GatewaySenderException.class
+          .getName(), vm4);
+      ExpectedException exp2 = addExpectedException(InterruptedException.class
+          .getName(), vm4);
+      try {
+*/        vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+            true, 10, 100, false, false, null, false });
+        vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+            testName + "_RR", "ln1", isOffHeap()  });
+        vm4.invoke(WANTestBase.class, "doPuts", new Object[] {
+            testName + "_RR", 1000 });
+        vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] {
+            "ln1", 1000 });
+
+/*      }
+      finally {
+        exp1.remove();
+        exp2.remove();
+      }
+*/    }
+    catch (Exception e) {
+      fail("Unexpected exception", e);
+    }
+  }
+
+  /**
+   * Test to validate that distributed region with given paralleGAtewaySender id
+   * is created first and then a same parallelGatewaySender is created
+   * a single put in DR is enqueued in parallelQueue
+   * Below test is disabled intentionally
+    1> In this release 8.0, for rolling upgrade support queue name is changed to old style
+    2>Comman parallel sender for different non colocated regions is not supported in 8.0 so no need to bother about 
+      ParallelGatewaySenderQueue#convertPathToName
+    3> We have to enabled it in next release
+    4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 
+     and version prior to 8.0
+   */
+  public void DISABLED_test_DR_CREATED_PGS_STARTED_NO_RECEIVER() throws Exception {
+    try {
+      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+          "createFirstLocatorWithDSId", new Object[] { 1 });
+      Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+          "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+      vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln1", isOffHeap()  });
+/*      ExpectedException exp1 = addExpectedException(GatewaySenderException.class
+          .getName(), vm4);
+      ExpectedException exp2 = addExpectedException(InterruptedException.class
+          .getName(), vm4);
+      try {*/
+        vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+            true, 10, 100, false, false, null, false });
+        vm4.invoke(WANTestBase.class, "doPuts", new Object[] {
+            testName + "_RR", 1000 });
+        vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] {
+            "ln1", 1000 });
+/*      }
+      finally {
+        exp1.remove();
+        exp2.remove();
+      }
+*/    }
+    catch (Exception e) {
+      fail("Unexpected exception", e);
+    }
+  }
+
+  /**Below test is disabled intentionally
+  1> In this release 8.0, for rolling upgrade support queue name is changed to old style
+  2>Comman parallel sender for different non colocated regions is not supported in 8.0 so no need to bother about 
+      ParallelGatewaySenderQueue#convertPathToName
+  3> We have to enabled it in next release
+  4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 
+     and version prior to 8.0*/
+  public void DISABLED_test_DR_PGS_1Node_Put_ValidateQueue_No_Receiver() throws Exception {
+    try {
+      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+          "createFirstLocatorWithDSId", new Object[] { 1 });
+      Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+          "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+      vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      
+      vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", "ln1", isOffHeap()  });
+      
+/*      ExpectedException exp1 = addExpectedException(GatewaySenderException.class
+          .getName(), vm4);
+      ExpectedException exp2 = addExpectedException(InterruptedException.class
+          .getName(), vm4);
+      try {*/
+        vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+            true, 10, 100, false, false, null, true });
+        vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
+
+        vm4.invoke(WANTestBase.class, "doPuts", new Object[] {
+            testName + "_RR", 10000 });
+
+        vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+            testName + "_RR", 10000 });
+        vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] {
+            "ln1", 10000 });
+/*      }
+    finally {
+      exp1.remove();
+      exp2.remove();
+    }
+     */ 
+    }
+    catch (Exception e) {
+      fail("Unexpected exception", e);
+    }
+  }
+  
+  /**Below test is disabled intentionally
+  1> In this release 8.0, for rolling upgrade support queue name is changed to old style
+  2>Comman parallel sender for different non colocated regions is not supported in 8.0 so no need to bother about 
+      ParallelGatewaySenderQueue#convertPathToName
+  3> We have to enabled it in next release
+  4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 
+     and version prior to 8.0*/
+  public void DISABLED_test_DR_PGS_2Nodes_Put_ValidateQueue_No_Receiver() throws Exception {
+    try {
+      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+          "createFirstLocatorWithDSId", new Object[] { 1 });
+      Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+          "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+      vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      
+      vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", "ln1", isOffHeap()  });
+      vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln1", isOffHeap()  });
+      
+/*      ExpectedException exp1 = addExpectedException(
+          GatewaySenderException.class.getName());
+      ExpectedException exp2 = addExpectedException(
+          InterruptedException.class.getName());
+      ExpectedException exp3 = addExpectedException(
+          CacheClosedException.class.getName());
+      try {
+*/        vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+            true, 10, 100, false, false, null, true });
+        vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+            true, 10, 100, false, false, null, true });
+
+        vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
+        vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
+
+        vm4.invoke(WANTestBase.class, "doPuts", new Object[] {
+            testName + "_RR", 1000 });
+
+        vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+            testName + "_RR", 1000 });
+        vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+            testName + "_RR", 1000 });
+
+        vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] {
+            "ln1", 1000 });
+        vm5.invoke(WANTestBase.class, "validateQueueContents", new Object[] {
+            "ln1", 1000 });
+
+/*      }
+      finally {
+        exp1.remove();
+        exp2.remove();
+        exp3.remove();
+      }
+*/      
+    }
+    catch (Exception e) {
+      fail("Unexpected exception", e);
+    }
+  }
+  
+//  public void test_DR_PGS_ORDERPOLICY_PARTITION_EXPECTException(){
+//    
+//  }
+//  public void test_DR_PGS_DISKSTORE_NAME_PROVIDED_VALIDATE_DISK(){
+//    
+//  }
+//  public void test_DR_PGS_DISKSTORE_NAME_NOT_PROVIDED_VALIDATE_DISK(){
+//    
+//  }
+//  
+//  public void test_DR_PGS_START_STOP_START(){
+//    
+//  }
+//
+//  public void test_DR_PGS_PERSISTENCE_START_STOP_START(){
+//    
+//  }
+//  
+//  public void test_DR_PGS_START_PAUSE_STOP(){
+//    
+//  }
+//
+//  public void test_DR_PGS_START_PAUSE_RESUME_VALIDATE_RECEIVER(){
+//    
+//  }
+
+  /**Below test is disabled intentionally
+  1> In this release 8.0, for rolling upgrade support queue name is changed to old style
+  2>Comman parallel sender for different non colocated regions is not supported in 8.0 so no need to bother about 
+      ParallelGatewaySenderQueue#convertPathToName
+  3> We have to enabled it in next release
+  4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 
+     and version prior to 8.0*/
+  public void DISABLED_test_DR_PGS_1Nodes_Put_Receiver() throws Exception {
+    try {
+      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+          "createFirstLocatorWithDSId", new Object[] { 1 });
+      Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+          "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+      vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+      vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+      
+      vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      
+      vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", "ln1", isOffHeap()  });
+      
+      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+        true, 10, 100, false, false, null, true});
+
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln1"});
+      
+      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000});
+     
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName + "_RR",
+        1000});
+      
+      vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln1",
+        0 });
+      
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000});
+    }
+    catch (Exception e) {
+      fail("Unexpected exception", e);
+    }
+  }
+  
+  /**Below test is disabled intentionally
+  1> In this release 8.0, for rolling upgrade support queue name is changed to old style
+  2>Comman parallel sender for different non colocated regions is not supported in 8.0 so no need to bother about 
+      ParallelGatewaySenderQueue#convertPathToName
+  3> We have to enabled it in next release
+  4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 
+     and version prior to 8.0*/
+  public void DISABLED_test_DR_PGS_2Nodes_Put_Receiver() throws Exception {
+    try {
+      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+          "createFirstLocatorWithDSId", new Object[] { 1 });
+      Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+          "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+      vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+      vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+      
+      vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      
+      vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", "ln1", isOffHeap()  });
+      vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln1", isOffHeap()  });
+      
+      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+        true, 10, 100, false, false, null, true});
+      vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+      true, 10, 100, false, false, null, true});
+
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln1"});
+      vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln1"});
+      
+      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+     
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName + "_RR",
+        1000 });
+      vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName + "_RR",
+        1000 });
+      
+      vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln1",
+        0 });
+      vm5.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln1",
+        0 });
+      
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    }
+    catch (Exception e) {
+      fail("Unexpected exception", e);
+    }
+  }
+  
+  /**Below test is disabled intentionally
+  1> In this release 8.0, for rolling upgrade support queue name is changed to old style
+  2>Comman parallel sender for different non colocated regions is not supported in 8.0 so no need to bother about 
+      ParallelGatewaySenderQueue#convertPathToName
+  3> We have to enabled it in next release
+  4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 
+     and version prior to 8.0*/
+  public void DISABLED_test_DR_PGS_2Nodes_EMPTY_Put_Receiver() throws Exception {
+    try {
+      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+          "createFirstLocatorWithDSId", new Object[] { 1 });
+      Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+          "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+      vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+      vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+      
+      vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      
+      vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", "ln1", Scope.DISTRIBUTED_ACK, DataPolicy.EMPTY, isOffHeap()  });
+      vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln1", Scope.DISTRIBUTED_ACK, DataPolicy.REPLICATE, isOffHeap()  });
+      
+      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+        true, 10, 100, false, false, null, true});
+      vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+      true, 10, 100, false, false, null, true});
+
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln1"});
+      vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln1"});
+      
+      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+     
+//      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName + "_RR",
+//        1000 });
+      vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName + "_RR",
+        1000 });
+      
+      vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln1",
+        0 });
+      vm5.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln1",
+        0 });
+      
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    }
+    catch (Exception e) {
+      fail("Unexpected exception", e);
+    }
+  }
+  
+  /**Below test is disabled intentionally
+  1> In this release 8.0, for rolling upgrade support queue name is changed to old style
+  2>Comman parallel sender for different non colocated regions is not supported in 8.0 so no need to bother about 
+      ParallelGatewaySenderQueue#convertPathToName
+  3> We have to enabled it in next release
+  4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 
+     and version prior to 8.0*/
+  public void DISABLED_test_DR_PR_PGS_4Nodes_Put_Receiver_2Nodes() throws Exception {
+    try {
+      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+          "createFirstLocatorWithDSId", new Object[] { 1 });
+      Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+          "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+      vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+      vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+      
+      vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+      vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+      
+      vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap()  });
+      vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap()  });
+      
+      vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 100, isOffHeap()  });
+      vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 100, isOffHeap()  });
+      vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 100, isOffHeap()  });
+      vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 100, isOffHeap()  });
+
+      vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", "ln", isOffHeap()  });
+      vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", "ln", isOffHeap()  });
+      vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", "ln", isOffHeap()  });
+      vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", "ln", isOffHeap()  });
+
+      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+          true, 10, 100, false, false, null, true });
+      vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+          true, 10, 100, false, false, null, true });
+      vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+          true, 10, 100, false, false, null, true });
+      vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+          true, 10, 100, false, false, null, true });
+
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln"});
+      vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln"});
+      vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln"});
+      vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln"});
+      
+      vm4.invoke(WANTestBase.class, "waitForSenderRunningState",
+          new Object[] { "ln" });
+      vm5.invoke(WANTestBase.class, "waitForSenderRunningState",
+          new Object[] { "ln" });
+      vm6.invoke(WANTestBase.class, "waitForSenderRunningState",
+          new Object[] { "ln" });
+      vm7.invoke(WANTestBase.class, "waitForSenderRunningState",
+          new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+      vm5.invoke(WANTestBase.class, "doNextPuts", new Object[] { testName + "_PR",
+        1000, 2000 });
+      
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName + "_PR",
+        1000 });
+      vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName + "_RR",
+        1000 });
+      
+      vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
+        0 });
+      vm5.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
+        0 });
+      
+/*      ExpectedException exp1 = addExpectedException(CacheClosedException.class
+          .getName());
+      try {*/
+        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+            testName + "_RR", 1000 });
+        vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+            testName + "_RR", 1000 });
+        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+            testName + "_PR", 1000 });
+        vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+            testName + "_PR", 1000 });
+/*      }
+      finally {
+        exp1.remove();
+      }
+*/    }
+    catch (Exception e) {
+      fail("Unexpected exception", e);
+    }
+  }
+  
+  /**Below test is disabled intentionally
+  1> In this release 8.0, for rolling upgrade support queue name is changed to old style
+  2>Comman parallel sender for different non colocated regions is not supported in 8.0 so no need to bother about 
+      ParallelGatewaySenderQueue#convertPathToName
+  3> We have to enabled it in next release
+  4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 
+     and version prior to 8.0*/
+  public void DISABLED_test_DR_PGS_NOMANUALSTART_4Nodes_Put_ValidateReceiver() throws Exception {
+    try {
+      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+          "createFirstLocatorWithDSId", new Object[] { 1 });
+      Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+          "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+      vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+      vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+      
+      vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      
+      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+          true, 10, 100, false, false, null, false });
+      vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+          true, 10, 100, false, false, null, false });
+      vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+          true, 10, 100, false, false, null, false });
+      vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+          true, 10, 100, false, false, null, false });
+    
+      vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", "ln1", isOffHeap()  });
+      vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", "ln1", isOffHeap()  });
+      vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", "ln1", isOffHeap()  });
+      vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", "ln1", isOffHeap()  });
+
+      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+     
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName + "_RR",
+        1000 });
+      vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName + "_RR",
+        1000 });
+      vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName + "_RR",
+        1000 });
+      vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName + "_RR",
+        1000 });
+
+      
+      vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln1",
+        0 });
+      vm5.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln1",
+        0 });
+      vm6.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln1",
+        0 });
+      vm7.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln1",
+        0 });
+      
+/*      ExpectedException exp1 = addExpectedException(CacheClosedException.class
+          .getName());
+      try {*/
+        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+            testName + "_RR", 1000 });
+/*      }
+      finally {
+        exp1.remove();
+      }*/
+    }
+    catch (Exception e) {
+      fail("Unexpected exception", e);
+    }
+  }
+  
+  /**Below test is disabled intentionally
+  1> In this release 8.0, for rolling upgrade support queue name is changed to old style
+  2>Comman parallel sender for different non colocated regions is not supported in 8.0 so no need to bother about 
+      ParallelGatewaySenderQueue#convertPathToName
+  3> We have to enabled it in next release
+  4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 
+     and version prior to 8.0*/
+  public void DISABLED_test_DR_PGS_4Nodes_Put_CLOSE4NODESCACHE_RECREATE_PUT_ValidateReceiver()
+      throws Exception {
+    try {
+      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+          "createFirstLocatorWithDSId", new Object[] { 1 });
+      Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+          "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+      vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+      vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+      vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+          true, 100, 10, false, false, null, true });
+      vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+          true, 100, 10, false, false, null, true });
+      vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+          true, 100, 10, false, false, null, true });
+      vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+          true, 100, 10, false, false, null, true });
+
+      vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", "ln", isOffHeap()  });
+      vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", "ln", isOffHeap()  });
+      vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", "ln", isOffHeap()  });
+      vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", "ln", isOffHeap()  });
+
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+      vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+      vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+      vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+      vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", null, isOffHeap()  });
+      vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", null, isOffHeap()  });
+
+      // before doing any puts, let the senders be running in order to ensure
+      // that
+      // not a single event will be lost
+      vm4.invoke(WANTestBase.class, "waitForSenderRunningState",
+          new Object[] { "ln" });
+      vm5.invoke(WANTestBase.class, "waitForSenderRunningState",
+          new Object[] { "ln" });
+      vm6.invoke(WANTestBase.class, "waitForSenderRunningState",
+          new Object[] { "ln" });
+      vm7.invoke(WANTestBase.class, "waitForSenderRunningState",
+          new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+          1000 });
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_RR", 1000 });
+
+/*      ExpectedException exp1 = addExpectedException(CacheClosedException.class
+          .getName());
+      try {*/
+        vm4.invoke(WANTestBase.class, "killSender", new Object[] {});
+        vm5.invoke(WANTestBase.class, "killSender", new Object[] {});
+        vm6.invoke(WANTestBase.class, "killSender", new Object[] {});
+        vm7.invoke(WANTestBase.class, "killSender", new Object[] {});
+/*      }
+      finally {
+        exp1.remove();
+      }*/
+
+      vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+          true, 100, 10, false, false, null, true });
+      vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+          true, 100, 10, false, false, null, true });
+      vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+          true, 100, 10, false, false, null, true });
+      vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+          true, 100, 10, false, false, null, true });
+
+      vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", "ln", isOffHeap()  });
+      vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", "ln", isOffHeap()  });
+      vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", "ln", isOffHeap()  });
+      vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", "ln", isOffHeap()  });
+
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+      vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+      vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+      vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "waitForSenderRunningState",
+          new Object[] { "ln" });
+      vm5.invoke(WANTestBase.class, "waitForSenderRunningState",
+          new Object[] { "ln" });
+      vm6.invoke(WANTestBase.class, "waitForSenderRunningState",
+          new Object[] { "ln" });
+      vm7.invoke(WANTestBase.class, "waitForSenderRunningState",
+          new Object[] { "ln" });
+      // ------------------------------------------------------------------------------------
+
+      vm4.invoke(WANTestBase.class, "doNextPuts", new Object[] {
+          testName + "_RR", 1000, 2000 });
+
+      // verify all buckets drained on all sender nodes.
+      vm4.invoke(WANTestBase.class,
+          "validateParallelSenderQueueAllBucketsDrained", new Object[] { "ln" });
+      vm5.invoke(WANTestBase.class,
+          "validateParallelSenderQueueAllBucketsDrained", new Object[] { "ln" });
+      vm6.invoke(WANTestBase.class,
+          "validateParallelSenderQueueAllBucketsDrained", new Object[] { "ln" });
+      vm7.invoke(WANTestBase.class,
+          "validateParallelSenderQueueAllBucketsDrained", new Object[] { "ln" });
+
+/*      exp1 = addExpectedException(CacheClosedException.class.getName());
+      try {*/
+        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+            testName + "_RR", 2000 });
+        vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+            testName + "_RR", 2000 });
+/*      }
+      finally {
+        exp1.remove();
+      }*/
+    }
+    catch (Exception e) {
+      fail("Unexpected exception", e);
+    }
+
+  }
+  
+  /**Below test is disabled intentionally
+  1> In this release 8.0, for rolling upgrade support queue name is changed to old style
+  2>Comman parallel sender for different non colocated regions is not supported in 8.0 so no need to bother about 
+      ParallelGatewaySenderQueue#convertPathToName
+  3> We have to enabled it in next release
+  4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 
+     and version prior to 8.0*/
+  public void DISABLED_test_DR_NO_ACK_PGS_2Nodes_Put_ValidateQueue_Receiver() throws Exception {
+    try {
+      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+          "createFirstLocatorWithDSId", new Object[] { 1 });
+      Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+          "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+      vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+      vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+      
+      vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      
+      vm4.invoke(WANTestBase.class,
+          "createReplicatedRegion", new Object[] { testName + "_RR", "ln1",
+              Scope.DISTRIBUTED_NO_ACK, DataPolicy.REPLICATE, isOffHeap()  });
+      vm5.invoke(WANTestBase.class,
+          "createReplicatedRegion", new Object[] { testName + "_RR", "ln1",
+              Scope.DISTRIBUTED_NO_ACK, DataPolicy.REPLICATE, isOffHeap()   });
+      
+      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+        true, 10, 100, false, false, null, true});
+      vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+      true, 10, 100, false, false, null, true});
+
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln1"});
+      vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln1"});
+      
+      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+     
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName + "_RR",
+        1000 });
+      vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName + "_RR",
+        1000 });
+      
+      vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln1",
+        0 });
+      vm5.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln1",
+        0 });
+      
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    }
+    catch (Exception e) {
+      fail("Unexpected exception", e);
+    }
+  }
+  
+  /**Below test is disabled intentionally
+  1> In this release 8.0, for rolling upgrade support queue name is changed to old style
+  2>Comman parallel sender for different non colocated regions is not supported in 8.0 so no need to bother about 
+      ParallelGatewaySenderQueue#convertPathToName
+  3> We have to enabled it in next release
+  4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 
+     and version prior to 8.0*/
+  public void DISABLED_test_DR_PGS_2NODES_1NODESDOWN_Validate_Receiver() throws Exception {
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true,
+        100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true,
+        100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState",
+        new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState",
+        new Object[] { "ln" });
+
+    pauseWaitCriteria(60000);
+    
+/*    ExpectedException exp1 = addExpectedException(CacheClosedException.class
+        .getName());
+    try {*/
+      AsyncInvocation inv1 = vm4.invokeAsync(
+          ReplicatedRegion_ParallelWANPropogationDUnitTest.class, "doPuts0", new Object[] {
+              testName + "_RR", 1000 });
+      pause(1000);
+      AsyncInvocation inv2 = vm5.invokeAsync(WANTestBase.class, "killSender");
+      try {
+        inv1.join();
+        inv2.join();
+      }
+      catch (Exception e) {
+        fail("UnExpected Exception", e);
+      }
+/*    }
+    finally {
+      exp1.remove();
+    }*/
+
+    Integer size = (Integer)vm4.invoke(WANTestBase.class,
+        "getQueueContentSize", new Object[] { "ln" });
+    getLogWriter().info("The size of the queue is in vm4 " + size);
+    
+
+    vm4.invoke(WANTestBase.class,
+        "validateParallelSenderQueueAllBucketsDrained", new Object[] { "ln" });
+    
+    size = (Integer)vm4.invoke(WANTestBase.class,
+        "getQueueContentSize", new Object[] { "ln" });
+    getLogWriter().info("The size of the queue is in vm4 " + size);
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+  }
+  
+  /**Below test is disabled intentionally
+  1> In this release 8.0, for rolling upgrade support queue name is changed to old style
+  2>Comman parallel sender for different non colocated regions is not supported in 8.0 so no need to bother about 
+      ParallelGatewaySenderQueue#convertPathToName
+  3> We have to enabled it in next release
+  4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 
+     and version prior to 8.0*/
+  public void DISABLED_test_DR_PGS_4NODES_2NODESDOWN_Validate_Receiver() throws Exception {
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true,
+        100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true,
+        100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true,
+        100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true,
+        100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState",
+        new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState",
+        new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState",
+        new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState",
+        new Object[] { "ln" });
+
+    pauseWaitCriteria(60000);
+/*    ExpectedException exp1 = addExpectedException(CacheClosedException.class
+        .getName());
+    try */{
+      AsyncInvocation inv1 = vm7.invokeAsync(
+          ReplicatedRegion_ParallelWANPropogationDUnitTest.class, "doPuts0", new Object[] {
+              testName + "_RR", 10000 });
+      pauseWaitCriteria(1000);
+      AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "killSender");
+      pauseWaitCriteria(2000);
+      AsyncInvocation inv3 = vm6.invokeAsync(
+          ReplicatedRegion_ParallelWANPropogationDUnitTest.class, "doPuts1", new Object[] {
+              testName + "_RR", 10000 });
+      pauseWaitCriteria(1500);
+      AsyncInvocation inv4 = vm5.invokeAsync(WANTestBase.class, "killSender");
+      try {
+        inv1.join();
+        inv2.join();
+        inv3.join();
+        inv4.join();
+      }
+      catch (Exception e) {
+        fail("UnExpected Exception", e);
+      }
+    }/*
+    finally {
+      exp1.remove();
+    }*/
+
+    vm6.invoke(WANTestBase.class,
+        "validateParallelSenderQueueAllBucketsDrained", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class,
+        "validateParallelSenderQueueAllBucketsDrained", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 10000 });
+    
+  }
+  
+  public static void doPuts0(String regionName, int numPuts) {
+    ExpectedException exp = addExpectedException(ForceReattemptException.class
+        .getName());
+    ExpectedException exp1 = addExpectedException(CacheClosedException.class
+        .getName());
+    try {
+
+      Region r = cache.getRegion(Region.SEPARATOR + regionName);
+      assertNotNull(r);
+      for (long i = 0; i < numPuts; i++) {
+        getLogWriter().info("Put : key : " + i);
+        r.put(i, "0_" + i);
+      }
+    } finally {
+      exp.remove();
+      exp1.remove();
+    }
+  }
+  
+  public static void doPuts1(String regionName, int numPuts){
+    ExpectedException exp = addExpectedException(ForceReattemptException.class
+        .getName());
+    ExpectedException exp1 = addExpectedException(CacheClosedException.class
+        .getName());
+    try {
+
+      Region r = cache.getRegion(Region.SEPARATOR + regionName);
+      assertNotNull(r);
+      for (long i = 0; i < numPuts; i++) {
+        getLogWriter().info("Put : key : " + i);
+        r.put(i, "1_" + i);
+      }
+    } finally {
+      exp.remove();
+      exp1.remove();
+    }
+  }
+  
+  public static void doPuts2(String regionName, int numPuts){
+    ExpectedException exp = addExpectedException(ForceReattemptException.class
+        .getName());
+    ExpectedException exp1 = addExpectedException(CacheClosedException.class
+        .getName());
+    try {
+      Region r = cache.getRegion(Region.SEPARATOR + regionName);
+      assertNotNull(r);
+      for (long i = 0; i < numPuts; i++) {
+        getLogWriter().info("Put : key : " + i);
+        r.put(i, "2_" + i);
+      }
+    } finally {
+      exp.remove();
+      exp1.remove();
+    }
+  }
+    
+  /**
+   * Test to validate that put on DR with no ack on multiple nodes are propogated to parallelqueue on multiple nodes 
+   */
+  
+  /**
+   * Test to validate that the single put in DR is propoagted to remote site through paralleHatewaySender
+   */
+  
+  
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
new file mode 100644
index 0000000..4e15ab7
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
@@ -0,0 +1,266 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.wan.misc;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.Properties;
+import java.util.zip.Adler32;
+import java.util.zip.CheckedInputStream;
+import java.util.zip.CheckedOutputStream;
+
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.DiskStore;
+import com.gemstone.gemfire.cache.DiskStoreFactory;
+import com.gemstone.gemfire.cache.wan.GatewayReceiver;
+import com.gemstone.gemfire.cache.wan.GatewayReceiverFactory;
+import com.gemstone.gemfire.cache.wan.GatewaySenderFactory;
+import com.gemstone.gemfire.cache.wan.GatewayTransportFilter;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.internal.AvailablePortHelper;
+import com.gemstone.gemfire.internal.cache.wan.CompressionInputStream;
+import com.gemstone.gemfire.internal.cache.wan.CompressionOutputStream;
+import com.gemstone.gemfire.internal.cache.wan.InternalGatewaySenderFactory;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase.MyLocatorCallback;
+
+import dunit.VM;
+
+public class SenderWithTransportFilterDUnitTest extends WANTestBase {
+
+  private static final long serialVersionUID = 1L;
+
+  public SenderWithTransportFilterDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+  }
+
+  public void testSerialSenderWithTansportFilter() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(SenderWithTransportFilterDUnitTest.class,
+        "createReceiverWithTransportFilters", new Object[] { nyPort });
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm3.invoke(SenderWithTransportFilterDUnitTest.class,
+        "createSenderWithTransportFilter", new Object[] { "ln", 2, false, 100,
+            1, false, false, true });
+
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm3.invoke(WANTestBase.class, "doPuts",
+        new Object[] { testName + "_RR", 100 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 100 });
+  }
+
+  public void testParallelSenderWithTansportFilter() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(SenderWithTransportFilterDUnitTest.class,
+        "createReceiverWithTransportFilters", new Object[] { nyPort });
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 0, 10, isOffHeap() });
+
+    vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm3.invoke(SenderWithTransportFilterDUnitTest.class,
+        "createSenderWithTransportFilter", new Object[] { "ln", 2, true, 100,
+            1, false, false, true });
+
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 0, 10, isOffHeap() });
+
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm3.invoke(WANTestBase.class, "doPuts",
+        new Object[] { testName + "_PR", 100 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 100 });
+  }
+  
+  public static int createReceiverWithTransportFilters(int locPort) {
+    WANTestBase test = new WANTestBase(testName);
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort
+        + "]");
+
+    InternalDistributedSystem ds = test.getSystem(props);
+    cache = CacheFactory.create(ds);
+    GatewayReceiverFactory fact = cache.createGatewayReceiverFactory();
+    int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    fact.setStartPort(port);
+    fact.setEndPort(port);
+    ArrayList<GatewayTransportFilter> transportFilters = new ArrayList<GatewayTransportFilter>();
+    transportFilters.add(new CheckSumTranportFilter("CheckSumTranportFilter"));
+    transportFilters.add(new CompressionTranportFilter("CompressionTranportFilter"));
+    if (!transportFilters.isEmpty()) {
+      for (GatewayTransportFilter filter : transportFilters) {
+        fact.addGatewayTransportFilter(filter);
+      }
+    }
+    GatewayReceiver receiver = fact.create();
+    try {
+      receiver.start();
+    }
+    catch (IOException e) {
+      e.printStackTrace();
+      fail("Test " + test.getName()
+          + " failed to start GatewayRecevier on port " + port);
+    }
+    return port;
+  }
+
+  public static void createSenderWithTransportFilter(String dsName,
+      int remoteDsId, boolean isParallel, Integer maxMemory, Integer batchSize,
+      boolean isConflation, boolean isPersistent, boolean isManulaStart) {
+    File persistentDirectory = new File(dsName + "_disk_"
+        + System.currentTimeMillis() + "_" + VM.getCurrentVMNum());
+    persistentDirectory.mkdir();
+    DiskStoreFactory dsf = cache.createDiskStoreFactory();
+    File[] dirs1 = new File[] { persistentDirectory };
+
+    if (isParallel) {
+      GatewaySenderFactory gateway = cache
+          .createGatewaySenderFactory();
+      gateway.setParallel(true);
+      gateway.setMaximumQueueMemory(maxMemory);
+      gateway.setBatchSize(batchSize);
+      ((InternalGatewaySenderFactory)gateway).setLocatorDiscoveryCallback(new MyLocatorCallback());
+      ArrayList<GatewayTransportFilter> transportFilters = new ArrayList<GatewayTransportFilter>();
+      transportFilters.add(new CompressionTranportFilter("CompressionTranportFilter"));
+      transportFilters.add(new CheckSumTranportFilter("CheckSumTranportFilter"));
+      if (!transportFilters.isEmpty()) {
+        for (GatewayTransportFilter filter : transportFilters) {
+          gateway.addGatewayTransportFilter(filter);
+        }
+      }
+      if (isPersistent) {
+        gateway.setPersistenceEnabled(true);
+        gateway.setDiskStoreName(dsf.setDiskDirs(dirs1).create(dsName)
+            .getName());
+      }
+      else {
+        DiskStore store = dsf.setDiskDirs(dirs1).create(dsName);
+        gateway.setDiskStoreName(store.getName());
+      }
+      gateway.setBatchConflationEnabled(isConflation);
+      gateway.create(dsName, remoteDsId);
+
+    }
+    else {
+      GatewaySenderFactory gateway = cache
+          .createGatewaySenderFactory();
+      gateway.setMaximumQueueMemory(maxMemory);
+      gateway.setBatchSize(batchSize);
+      gateway.setManualStart(isManulaStart);
+      ((InternalGatewaySenderFactory)gateway)
+          .setLocatorDiscoveryCallback(new MyLocatorCallback());
+      ArrayList<GatewayTransportFilter> transportFilters = new ArrayList<GatewayTransportFilter>();
+      transportFilters.add(new CompressionTranportFilter("CompressionTranportFilter"));
+      transportFilters.add(new CheckSumTranportFilter("CheckSumTranportFilter"));
+      if (!transportFilters.isEmpty()) {
+        for (GatewayTransportFilter filter : transportFilters) {
+          gateway.addGatewayTransportFilter(filter);
+        }
+      }
+      gateway.setBatchConflationEnabled(isConflation);
+      if (isPersistent) {
+        gateway.setPersistenceEnabled(true);
+        gateway.setDiskStoreName(dsf.setDiskDirs(dirs1).create(dsName)
+            .getName());
+      }
+      else {
+        DiskStore store = dsf.setDiskDirs(dirs1).create(dsName);
+        gateway.setDiskStoreName(store.getName());
+      }
+      gateway.create(dsName, remoteDsId);
+    }
+  }
+
+  static class CompressionTranportFilter implements GatewayTransportFilter {
+
+    private String name;
+    
+    public CompressionTranportFilter(String name){
+      this.name = name;
+    }
+    
+    public String toString(){
+      return this.name;
+    }
+    public InputStream getInputStream(InputStream stream) {
+      return new CompressionInputStream(stream);
+      // return new ZipInputStream(stream);
+    }
+
+    public OutputStream getOutputStream(OutputStream stream) {
+      return new CompressionOutputStream(stream);
+      // return new ZipOutputStream(stream);
+    }
+
+    public void close() {
+      // TODO Auto-generated method stub
+    }
+
+  }
+  
+  static class CheckSumTranportFilter implements GatewayTransportFilter {
+
+    Adler32 checker = new Adler32();
+    
+    private String name;
+    
+    public CheckSumTranportFilter(String name){
+      this.name = name;
+    }
+    
+    public String toString(){
+      return this.name;
+    }
+    public InputStream getInputStream(InputStream stream) {
+      return new CheckedInputStream(stream, checker);
+      // return new ZipInputStream(stream);
+    }
+
+    public OutputStream getOutputStream(OutputStream stream) {
+      return new CheckedOutputStream(stream, checker);
+      // return new ZipOutputStream(stream);
+    }
+
+    public void close() {
+      // TODO Auto-generated method stub
+    }
+
+  }
+  
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
new file mode 100644
index 0000000..211f726
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
@@ -0,0 +1,197 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.wan.misc;
+
+import java.util.Set;
+
+import com.gemstone.gemfire.admin.AdminDistributedSystemFactory;
+import com.gemstone.gemfire.admin.AdminException;
+import com.gemstone.gemfire.admin.DistributedSystemConfig;
+import com.gemstone.gemfire.admin.internal.AdminDistributedSystemImpl;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.internal.cache.CacheObserverAdapter;
+import com.gemstone.gemfire.internal.cache.CacheObserverHolder;
+import com.gemstone.gemfire.internal.cache.LocalRegion;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+
+import dunit.AsyncInvocation;
+import dunit.DistributedTestCase;
+import dunit.SerializableRunnable;
+import dunit.VM;
+
+public class ShutdownAllPersistentGatewaySenderDUnitTest extends WANTestBase {
+  private static final long MAX_WAIT = 70000;
+
+  private static final int NUM_KEYS = 1000;
+
+  public ShutdownAllPersistentGatewaySenderDUnitTest(String name) {
+    super(name);
+  }
+  
+  @Override
+  public void setUp() throws Exception {
+    super.setUp();
+    addExpectedException("Cache is being closed by ShutdownAll");
+  }
+
+  private static final long serialVersionUID = 1L;
+
+  public void testGatewaySender() throws Exception {
+    addExpectedException("Cache is shutting down");
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+    vm2.invoke(WANTestBase.class, "createReceiverAfterCache",
+        new Object[] { nyPort });
+
+    vm2.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
+        new Object[] { testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
+        new Object[] { testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 400, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
+        new Object[] { testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    // set the CacheObserver to block the ShutdownAll
+    SerializableRunnable waitAtShutdownAll = new SerializableRunnable() {
+      @Override
+      public void run() {
+        LocalRegion.ISSUE_CALLBACKS_TO_CACHE_OBSERVER = true;
+        CacheObserverHolder.setInstance(new CacheObserverAdapter() {
+          @Override
+          public void beforeShutdownAll() {
+            final Region region = cache.getRegion(testName + "_PR");
+            waitForCriterion(new WaitCriterion() {
+              @Override
+              public boolean done() {
+                return region.size() >= 2;
+              }
+
+              @Override
+              public String description() {
+                return "Wait for wan to have processed several events";
+              }
+            }, 30000, 100, true);
+          }
+        });
+      }
+    };
+    vm2.invoke(waitAtShutdownAll);
+    vm3.invoke(waitAtShutdownAll);
+    
+    AsyncInvocation vm4_future = vm4.invokeAsync(WANTestBase.class, "doPuts",
+        new Object[] { testName + "_PR", NUM_KEYS });
+
+    // ShutdownAll will be suspended at observer, so puts will continue
+    AsyncInvocation future = shutDownAllMembers(vm2, 2, MAX_WAIT);
+    future.join(MAX_WAIT);
+
+    // now restart vm1 with gatewayHub
+    getLogWriter().info("restart in VM2");
+    vm2.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+    AsyncInvocation vm3_future = vm3.invokeAsync(WANTestBase.class,
+        "createPersistentPartitionedRegion", new Object[] { testName + "_PR",
+            "ln", 1, 100, isOffHeap() });
+    vm2.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
+        new Object[] { testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm3_future.join(MAX_WAIT);
+
+    vm3.invoke(new SerializableRunnable() {
+      public void run() {
+        final Region region = cache.getRegion(testName + "_PR");
+        cache.getLogger().info(
+            "vm1's region size before restart gatewayhub is " + region.size());
+      }
+    });
+    vm2.invoke(WANTestBase.class, "createReceiverAfterCache",
+        new Object[] { nyPort });
+
+    // wait for vm0 to finish its work
+    vm4_future.join(MAX_WAIT);
+    vm4.invoke(new SerializableRunnable() {
+      public void run() {
+        Region region = cache.getRegion(testName + "_PR");
+        assertEquals(NUM_KEYS, region.size());
+      }
+    });
+
+    // verify the other side (vm1)'s entries received from gateway
+    vm2.invoke(new SerializableRunnable() {
+      public void run() {
+        final Region region = cache.getRegion(testName + "_PR");
+
+        cache.getLogger().info(
+            "vm1's region size after restart gatewayhub is " + region.size());
+        waitForCriterion(new WaitCriterion() {
+          public boolean done() {
+            Object lastvalue = region.get(NUM_KEYS - 1);
+            if (lastvalue != null && lastvalue.equals(NUM_KEYS - 1)) {
+              region.getCache().getLogger().info(
+                  "Last key has arrived, its value is " + lastvalue
+                      + ", end of wait.");
+              return true;
+            }
+            else
+              return (region.size() == NUM_KEYS);
+          }
+
+          public String description() {
+            return "Waiting for destination region to reach size: " + NUM_KEYS
+                + ", current is " + region.size();
+          }
+        }, MAX_WAIT, 100, true);
+        assertEquals(NUM_KEYS, region.size());
+      }
+    });
+
+  }
+
+  private AsyncInvocation shutDownAllMembers(VM vm, final int expnum, final long timeout) {
+      AsyncInvocation future = vm.invokeAsync(new SerializableRunnable("Shutdown all the members") {
+
+      public void run() {
+        DistributedSystemConfig config;
+        AdminDistributedSystemImpl adminDS = null;
+        try {
+          config = AdminDistributedSystemFactory.defineDistributedSystem(cache
+              .getDistributedSystem(), "");
+          adminDS = (AdminDistributedSystemImpl)AdminDistributedSystemFactory
+              .getDistributedSystem(config);
+          adminDS.connect();
+          Set members = adminDS.shutDownAllMembers(timeout);
+          int num = members == null ? 0 : members.size();
+          assertEquals(expnum, num);
+        }
+        catch (AdminException e) {
+          throw new RuntimeException(e);
+        }
+        finally {
+          if (adminDS != null) {
+            adminDS.disconnect();
+          }
+        }
+      }
+    });
+    return future;
+  }
+
+}


[08/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java
new file mode 100644
index 0000000..228cdad
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java
@@ -0,0 +1,109 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+/**
+ * 
+ */
+package com.gemstone.gemfire.internal.cache.wan.parallel;
+
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+
+import dunit.AsyncInvocation;
+
+/**
+ * @author skumar
+ * 
+ */
+public class ParallelWANPropagationClientServerDUnitTest extends WANTestBase {
+  private static final long serialVersionUID = 1L;
+
+  public ParallelWANPropagationClientServerDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+  }
+
+  /**
+   * Normal happy scenario test case.
+   * 
+   * @throws Exception
+   */
+  public void testParallelPropagationWithClientServer() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiverAndServer", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiverAndServer", new Object[] { nyPort });
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createClientWithLocator", new Object[] {
+        nyPort, "localhost", testName + "_PR" });
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+      100 });
+
+    vm5.invoke(WANTestBase.class, "createServer", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createServer", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true,
+         100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true,
+         100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    vm7.invoke(WANTestBase.class, "createClientWithLocator", new Object[] {
+      lnPort, "localhost", testName + "_PR" });
+    
+    AsyncInvocation inv1 = vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    AsyncInvocation inv2 = vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    inv1.join();
+    inv2.join();
+    // before doing any puts, let the senders be running in order to ensure that
+    // not a single event will be lost
+    
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState",
+        new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState",
+        new Object[] { "ln" });
+    
+    vm7.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+        10000 });
+
+    
+    // verify all buckets drained on all sender nodes.
+    vm5.invoke(WANTestBase.class,
+        "validateParallelSenderQueueAllBucketsDrained", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class,
+        "validateParallelSenderQueueAllBucketsDrained", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 10000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 10000 });
+
+    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 10000 });
+    vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 10000 });
+
+    vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 10000 });
+    
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 10000 });
+
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
new file mode 100644
index 0000000..8eae664
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
@@ -0,0 +1,282 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.wan.parallel;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+
+import dunit.AsyncInvocation;
+
+public class ParallelWANPropagationConcurrentOpsDUnitTest extends WANTestBase {
+
+  private static final long serialVersionUID = 1L;
+  
+  public ParallelWANPropagationConcurrentOpsDUnitTest(String name) {
+    super(name);
+  }
+  
+  public void setUp() throws Exception {
+    super.setUp();
+  }
+  
+  /**
+   * Normal propagation scenario test case for a PR with only one bucket.
+   * This has been added for bug# 44284.
+   * @throws Exception
+   */
+  public void testParallelPropagationWithSingleBucketPR() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+ 
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+ 
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 1, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 1, isOffHeap() });
+ 
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+ 
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 1, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 1, isOffHeap() });
+
+    //before doing any puts, let the senders be running in order to ensure that
+    //not a single event will be lost
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    //pause the senders
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    
+    pause(5000);
+    
+    AsyncInvocation async1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 700 });
+    AsyncInvocation async2 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+    AsyncInvocation async3 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 800 });
+    AsyncInvocation async4 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+    
+    async1.join();
+    async2.join();
+    async3.join();
+    async4.join();
+    
+    int queueSize = (Integer) vm4.invoke(WANTestBase.class, "getQueueContentSize", new Object[] { "ln" });
+    assertEquals("Actual queue size is not matching with the expected", 3500, queueSize);
+    
+    //resume the senders now
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 1000 });
+  }
+
+  /**
+   * Normal propagation scenario test case for a PR with less number of buckets.
+   * Buckets have been kept to 10 for this test.
+   * This has been added for bug# 44287.
+   * @throws Exception
+   */
+  public void testParallelPropagationWithLowNumberofBuckets() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+ 
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+ 
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 10, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 10, isOffHeap() });
+ 
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+ 
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 10, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 10, isOffHeap() });
+
+    //before doing any puts, let the senders be running in order to ensure that
+    //not a single event will be lost
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    AsyncInvocation async1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 700 });
+    AsyncInvocation async2 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+    AsyncInvocation async3 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 800 });
+    AsyncInvocation async4 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+    
+    async1.join();
+    async2.join();
+    async3.join();
+    async4.join();
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 1000 });
+  }
+
+  public void testParalleQueueDrainInOrder_PR() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 3, 4, isOffHeap() });
+  
+    vm2.invoke(WANTestBase.class, "addListenerOnRegion", new Object[] {testName + "_PR"});
+  
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 3, 4, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 3, 4, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 3, 4, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 3, 4, isOffHeap() });
+    
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ln", true});
+    vm5.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ln", true});
+    vm6.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ln", true});
+    vm7.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ln", true});
+
+    pause(2000);
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln"});
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln"});
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln"});
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln"});
+    
+    pause(2000);
+    
+    vm6.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+      4 });
+    vm4.invoke(WANTestBase.class, "addListenerOnBucketRegion", new Object[] {testName + "_PR", 4});
+    vm5.invoke(WANTestBase.class, "addListenerOnBucketRegion", new Object[] {testName + "_PR", 4});
+    vm6.invoke(WANTestBase.class, "addListenerOnBucketRegion", new Object[] {testName + "_PR", 4 });
+    vm7.invoke(WANTestBase.class, "addListenerOnBucketRegion", new Object[] {testName + "_PR", 4});
+    
+    vm4.invoke(WANTestBase.class, "addListenerOnQueueBucketRegion", new Object[] { "ln" , 4});
+    vm5.invoke(WANTestBase.class, "addListenerOnQueueBucketRegion", new Object[] { "ln" , 4});
+    vm6.invoke(WANTestBase.class, "addListenerOnQueueBucketRegion", new Object[] { "ln" , 4 });
+    vm7.invoke(WANTestBase.class, "addListenerOnQueueBucketRegion", new Object[] { "ln" , 4});
+    
+    vm6.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+      1000 });
+    
+    vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 1000 });
+    
+    HashMap vm4BRUpdates = (HashMap)vm4.invoke(WANTestBase.class, "checkBR", new Object[] {testName + "_PR", 4});
+    HashMap vm5BRUpdates = (HashMap)vm5.invoke(WANTestBase.class, "checkBR", new Object[] {testName + "_PR", 4});
+    HashMap vm6BRUpdates = (HashMap)vm6.invoke(WANTestBase.class, "checkBR", new Object[] {testName + "_PR", 4});
+    HashMap vm7BRUpdates = (HashMap)vm7.invoke(WANTestBase.class, "checkBR", new Object[] {testName + "_PR", 4});
+    
+    List b0SenderUpdates = (List)vm4BRUpdates.get("Create0");
+    List b1SenderUpdates = (List)vm4BRUpdates.get("Create1");
+    List b2SenderUpdates = (List)vm4BRUpdates.get("Create2");
+    List b3SenderUpdates = (List)vm4BRUpdates.get("Create3");
+    
+    HashMap vm4QueueBRUpdates = (HashMap)vm4.invoke(WANTestBase.class, "checkQueue_BR", new Object[] {"ln", 4});
+    HashMap vm5QueueBRUpdates = (HashMap)vm5.invoke(WANTestBase.class, "checkQueue_BR", new Object[] {"ln", 4});
+    HashMap vm6QueueBRUpdates = (HashMap)vm6.invoke(WANTestBase.class, "checkQueue_BR", new Object[] {"ln", 4});
+    HashMap vm7QueueBRUpdates = (HashMap)vm7.invoke(WANTestBase.class, "checkQueue_BR", new Object[] {"ln", 4});
+    
+    assertEquals(vm4QueueBRUpdates, vm5QueueBRUpdates);
+    assertEquals(vm4QueueBRUpdates, vm6QueueBRUpdates);
+    assertEquals(vm4QueueBRUpdates, vm7QueueBRUpdates);
+    
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln"});
+    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln"});
+    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln"});
+    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln"});
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 1000 });
+    HashMap receiverUpdates = (HashMap)vm2.invoke(WANTestBase.class, "checkPR", new Object[] {
+      testName + "_PR"});
+    List<Long> createList = (List)receiverUpdates.get("Create");
+    ArrayList<Long> b0ReceiverUpdates = new ArrayList<Long>();
+    ArrayList<Long> b1ReceiverUpdates = new ArrayList<Long>();
+    ArrayList<Long> b2ReceiverUpdates = new ArrayList<Long>();
+    ArrayList<Long> b3ReceiverUpdates = new ArrayList<Long>();
+    for (Long key : createList) {
+      long mod = key % 4;
+      if (mod == 0) {
+        b0ReceiverUpdates.add(key);
+      }
+      else if (mod == 1) {
+        b1ReceiverUpdates.add(key);
+      }
+      else if (mod == 2) {
+        b2ReceiverUpdates.add(key);
+      }
+      else if (mod == 3) {
+        b3ReceiverUpdates.add(key);
+      }
+    }
+    b0ReceiverUpdates.remove(0);
+    b1ReceiverUpdates.remove(0);
+    b2ReceiverUpdates.remove(0);
+    b3ReceiverUpdates.remove(0);
+    
+    assertEquals(b0SenderUpdates, b0ReceiverUpdates);
+    assertEquals(b1SenderUpdates, b1ReceiverUpdates);
+    assertEquals(b2SenderUpdates, b2ReceiverUpdates);
+    assertEquals(b3SenderUpdates, b3ReceiverUpdates);
+  }
+
+}


[13/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
new file mode 100644
index 0000000..8995dae
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
@@ -0,0 +1,1669 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.wan.misc;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+import com.gemstone.gemfire.cache.client.ServerOperationException;
+import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
+import com.gemstone.gemfire.cache.wan.GatewayEventFilter;
+import com.gemstone.gemfire.cache.wan.GatewayTransportFilter;
+import com.gemstone.gemfire.cache30.MyGatewayTransportFilter1;
+import com.gemstone.gemfire.cache30.MyGatewayTransportFilter2;
+import com.gemstone.gemfire.internal.cache.wan.Filter70;
+import com.gemstone.gemfire.internal.cache.wan.GatewaySenderConfigurationException;
+import com.gemstone.gemfire.internal.cache.wan.GatewaySenderException;
+import com.gemstone.gemfire.internal.cache.wan.MyGatewayTransportFilter3;
+import com.gemstone.gemfire.internal.cache.wan.MyGatewayTransportFilter4;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+
+public class WanValidationsDUnitTest extends WANTestBase {
+
+  public WanValidationsDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+  }
+
+  /**
+   * Test to make sure that serial sender Ids configured in Distributed Region
+   * is same across all DR nodes TODO : Should this validation hold tru now.
+   * Discuss. If I have 2 members on Which DR is defined. But sender is defined
+   * on only one member. How can I add the instance on the sender in Region
+   * which does not have a sender. I can bypass the existing validation for the
+   * DR with SerialGatewaySender. But for PR with SerialGatewaySender, we need
+   * to send the adjunct message. Find out the way to send the adjunct message
+   * to the member on which serialGatewaySender is available.
+   */
+  
+  public void testSameSerialGatewaySenderIdAcrossSameDistributedRegion()
+      throws Exception {
+    addExpectedException("another cache has the same region defined");
+    try {
+      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, "createFirstLocatorWithDSId",
+          new Object[] {1});
+      Integer nyPort = (Integer)vm1.invoke(WANTestBase.class, "createFirstRemoteLocator",
+          new Object[] {2, lnPort});
+      
+      vm4.invoke(WANTestBase.class, "createCache",
+          new Object[] {lnPort });
+      vm5.invoke(WANTestBase.class, "createCache",
+          new Object[] {lnPort });
+
+      vm4.invoke(WANTestBase.class, "createSender",
+          new Object[] {"ln1", 2, false, 10, 100, false, false, null, true});
+      vm4.invoke(WANTestBase.class, "createSender",
+          new Object[] {"ln2", 2, false, 10, 100, false, false, null, true});
+      
+      vm5.invoke(WANTestBase.class, "createSender",
+          new Object[] {"ln2", 2, false, 10, 100, false, false, null, true});
+      vm5.invoke(WANTestBase.class, "createSender",
+          new Object[] {"ln3", 2, false, 10, 100, false, false, null, true});
+      
+     vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln1,ln2", isOffHeap() });
+      
+      vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln2,ln3", isOffHeap() });
+      fail("Expected IllegalStateException with incompatible gateway sender ids message");
+    }
+    catch (Exception e) {
+      if (!(e.getCause() instanceof IllegalStateException)
+          || !(e.getCause().getMessage().contains("Cannot create Region"))) {
+        fail(
+            "Expected IllegalStateException with incompatible gateway sender ids message",
+            e);
+      }
+    }
+  }
+
+  /**
+   * Validate that ParallelGatewaySender can be added to Distributed region
+   * 
+   * @throws Exception
+   * 
+   * 
+   * Below test is disabled intentionally Replicated region with Parallel Async
+   * Event queue is not supported. Test is added for the same
+   * ReplicatedRegion_ParallelWANPropogationDUnitTest#test_DR_PGS_1Nodes_Put_Receiver
+   * 
+   * We are gone support this configuration in upcoming releases
+   */
+
+  public void DISABLED_DUETO_BUG51491_testParallelGatewaySenderForDistributedRegion() throws Exception {
+    try {
+      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+          "createFirstLocatorWithDSId", new Object[] { 1 });
+      Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+          "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+      vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+          true, 10, 100, false, false, null, false });
+
+      vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln2", 2,
+          true, 10, 100, false, false, null, false });
+
+      vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", "ln1", isOffHeap()  });
+
+      vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", "ln1", isOffHeap()  });
+
+    }
+    catch (Exception e) {
+      fail("Caught Exception", e);
+    }
+  }
+  
+  /**
+   * Test to make sure that serial sender Ids configured in partitioned regions
+   * should be same across all PR members
+   */
+  public void testSameSerialGatewaySenderIdAcrossSamePartitionedRegion()
+      throws Exception {
+    addExpectedException("another cache has the same region defined");
+    try {
+      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, "createFirstLocatorWithDSId",
+          new Object[] {1});
+
+      vm4.invoke(WANTestBase.class, "createCache",
+          new Object[] {lnPort });
+      vm5.invoke(WANTestBase.class, "createCache",
+          new Object[] {lnPort });
+      
+      vm4.invoke(WANTestBase.class, "createSender",
+          new Object[] {"ln1", 2, false, 10, 100, false, false, null, true});
+      vm4.invoke(WANTestBase.class, "createSender",
+          new Object[] {"ln2", 2, false, 10, 100, false, false, null, true});
+      
+      vm5.invoke(WANTestBase.class, "createSender",
+          new Object[] {"ln2", 2, false, 10, 100, false, false, null, true});
+      vm5.invoke(WANTestBase.class, "createSender",
+          new Object[] {"ln3", 2, false, 10, 100, false, false, null, true});
+      
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln1,ln2", 1, 100, isOffHeap()  });
+      vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln2,ln3", 1, 100, isOffHeap()  });
+      fail("Expected IllegalStateException with incompatible gateway sender ids message");
+    }
+    catch (Exception e) {
+      if (!(e.getCause() instanceof IllegalStateException)
+          || !(e.getCause().getMessage().contains("Cannot create Region"))) {
+        fail(
+            "Expected IllegalStateException with incompatible gateway sender ids message",
+            e);
+      }
+    }
+  }
+  
+  
+  public void testReplicatedSerialAsyncEventQueueWithPeristenceEnabled() {
+    addExpectedException("another cache has the same region defined");
+    try {
+      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+          "createFirstLocatorWithDSId", new Object[] { 1 });
+
+      vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+      vm4.invoke(WANTestBase.class,
+          "createReplicatedRegionWithAsyncEventQueue", new Object[] {
+              testName + "_RR", "ln1", isOffHeap()  });
+      vm5.invoke(WANTestBase.class,
+          "createReplicatedRegionWithAsyncEventQueue", new Object[] {
+              testName + "_RR", "ln2", isOffHeap()  });
+      fail("Expected IllegalStateException with incompatible gateway sender ids message");
+    }
+    catch (Exception e) {
+      if (!(e.getCause() instanceof IllegalStateException)
+          || !(e.getCause().getMessage().contains("Cannot create Region"))) {
+        fail(
+            "Expected IllegalStateException with incompatible gateway sender ids message",
+            e);
+      }
+    }
+  }
+  
+  /**
+   * Test to make sure that parallel sender Ids configured in partitioned
+   * regions should be same across all PR members
+   */
+  public void testSameParallelGatewaySenderIdAcrossSamePartitionedRegion()
+      throws Exception {
+    addExpectedException("another cache has the same region defined");
+    try {
+      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, "createFirstLocatorWithDSId",
+          new Object[] {1});
+
+      vm4.invoke(WANTestBase.class, "createCache",
+          new Object[] {lnPort });
+      vm5.invoke(WANTestBase.class, "createCache",
+          new Object[] {lnPort });
+      
+      vm4.invoke(WANTestBase.class, "createSender",
+          new Object[] {"ln1", 2, true, 10, 100, false, false, null, true});
+      vm4.invoke(WANTestBase.class, "createSender",
+          new Object[] {"ln2", 2, true, 10, 100, false, false, null, true});
+      
+      vm5.invoke(WANTestBase.class, "createSender",
+          new Object[] {"ln2", 2, true, 10, 100, false, false, null, true});
+      vm5.invoke(WANTestBase.class, "createSender",
+          new Object[] {"ln3", 2, true, 10, 100, false, false, null, true});
+
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln1,ln2", 1, 100, isOffHeap()  });
+      vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln2,ln3", 1, 100, isOffHeap()  });
+      
+      fail("Expected IllegalStateException with incompatible gateway sender ids message");
+    }
+    catch (Exception e) {
+      if (!(e.getCause() instanceof IllegalStateException)
+          || !(e.getCause().getMessage().contains("Cannot create Region"))) {
+        fail(
+            "Expected IllegalStateException with incompatible gateway sender ids message",
+            e);
+      }
+    }
+  }
+
+  /**
+   * Test to make sure that same parallel gateway sender id can be used by 2
+   * different PRs
+   * 
+   * @throws Exception
+   */
+  public void ___testSameParallelGatewaySenderIdAcrossDifferentPartitionedRegion()
+      throws Exception {
+    try {
+      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+          "createFirstLocatorWithDSId", new Object[] { 1 });
+
+      vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      
+      vm1.invoke(WANTestBase.class, "createSender",
+          new Object[] {"ln1_Parallel", 2, true, 10, 100, false, false, null, true});
+      vm1.invoke(WANTestBase.class, "createSender",
+          new Object[] {"ln2_Parallel", 2, true, 10, 100, false, false, null, true});
+      
+      vm1.invoke(WANTestBase.class,
+          "createPartitionedRegionWithSerialParallelSenderIds", new Object[] {
+              testName + "_PR1", null, "ln1_Parallel,ln2_Parallel", null, isOffHeap()  });
+      vm1.invoke(WANTestBase.class,
+          "createPartitionedRegionWithSerialParallelSenderIds", new Object[] {
+              testName + "_PR2", null, "ln1_Parallel,ln2_Parallel", null, isOffHeap()  });
+
+    }
+    catch (Exception e) {
+      if (!(e.getCause() instanceof IllegalStateException)
+          || !(e.getCause().getMessage()
+              .contains("cannot have the same parallel gateway sender id"))) {
+        fail("Expected IllegalStateException", e);
+      }
+    }
+  }
+
+  public void testSameParallelGatewaySenderIdAcrossColocatedPartitionedRegion()
+      throws Exception {
+    addExpectedException("another cache has the same region defined");
+    try {
+      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+          "createFirstLocatorWithDSId", new Object[] { 1 });
+
+      vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      
+      vm1.invoke(WANTestBase.class, "createSender",
+          new Object[] {"ln1_Parallel", 2, true, 10, 100, false, false, null, true});
+      vm1.invoke(WANTestBase.class, "createSender",
+          new Object[] {"ln2_Parallel", 2, true, 10, 100, false, false, null, true});
+      
+      vm1.invoke(WANTestBase.class,
+          "createPartitionedRegionWithSerialParallelSenderIds", new Object[] {
+              testName + "_PR1", null, "ln1_Parallel", null, isOffHeap()  });
+      vm1.invoke(WANTestBase.class,
+          "createPartitionedRegionWithSerialParallelSenderIds", new Object[] {
+              testName + "_PR2", null, "ln1_Parallel,ln2_Parallel", testName + "_PR1", isOffHeap()  });
+      //now we support this
+      //fail("Expected IllegalStateException with incompatible gateway sender ids in colocated regions");
+    }
+    catch (Exception e) {
+      if (!(e.getCause() instanceof IllegalStateException)
+          || !(e.getCause().getMessage()
+              .contains("should have same parallel gateway sender ids"))) {
+        fail(
+            "Expected IllegalStateException with incompatible gateway sender ids in colocated regions",
+            e);
+      }
+    }
+  }
+  
+  /**
+   * Validate that if Colocated partitioned region doesn't want to add a PGS even if its 
+   * parent has one then it is fine
+   * @throws Exception
+   */
+  
+  public void testSameParallelGatewaySenderIdAcrossColocatedPartitionedRegion2()
+      throws Exception {
+    try {
+      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+          "createFirstLocatorWithDSId", new Object[] { 1 });
+
+      vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+      
+      vm1.invoke(WANTestBase.class, "createSender",
+          new Object[] {"ln1_Parallel", 2, true, 10, 100, false, false, null, true});
+      vm1.invoke(WANTestBase.class, "createSender",
+          new Object[] {"ln2_Parallel", 2, true, 10, 100, false, false, null, true});
+      
+      vm1.invoke(WANTestBase.class,
+          "createPartitionedRegionWithSerialParallelSenderIds", new Object[] {
+              testName + "_PR1", null, "ln1_Parallel", null, isOffHeap()  });
+      vm1.invoke(WANTestBase.class,
+          "createPartitionedRegionWithSerialParallelSenderIds", new Object[] {
+              testName + "_PR2", null, null, testName + "_PR1", isOffHeap()  });
+      
+    }
+    catch (Exception e) {
+      fail("The tests caught Exception.", e);
+    }
+  }
+  
+  /**
+   * Validate that if Colocated partitioned region has a subset of PGS
+   * then it is fine. 
+   * @throws Exception
+   */
+  
+  public void testSameParallelGatewaySenderIdAcrossColocatedPartitionedRegion3()
+      throws Exception {
+    try {
+      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+          "createFirstLocatorWithDSId", new Object[] { 1 });
+
+      vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+      vm1.invoke(WANTestBase.class, "createSender", new Object[] {
+          "ln1_Parallel", 2, true, 10, 100, false, false, null, true });
+      vm1.invoke(WANTestBase.class, "createSender", new Object[] {
+          "ln2_Parallel", 2, true, 10, 100, false, false, null, true });
+
+      vm1.invoke(WANTestBase.class,
+          "createPartitionedRegionWithSerialParallelSenderIds", new Object[] {
+              testName + "_PR1", null, "ln1_Parallel,ln2_Parallel", null, isOffHeap()  });
+      vm1.invoke(WANTestBase.class,
+          "createPartitionedRegionWithSerialParallelSenderIds", new Object[] {
+              testName + "_PR2", null, "ln1_Parallel", testName + "_PR1", isOffHeap()  });
+
+    } catch (Exception e) {
+      fail("The tests caught Exception.", e);
+    }
+  }
+  
+  /**
+   * Validate that if Colocated partitioned region has a superset of PGS
+   * then Exception is thrown. 
+   * @throws Exception
+   */
+  
+  public void testSameParallelGatewaySenderIdAcrossColocatedPartitionedRegion4()
+      throws Exception {
+    try {
+      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+          "createFirstLocatorWithDSId", new Object[] { 1 });
+
+      vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+      vm1.invoke(WANTestBase.class, "createSender",
+          new Object[] {"ln1_Parallel", 2, true, 10, 100, false, false, null, true});
+      vm1.invoke(WANTestBase.class, "createSender",
+          new Object[] {"ln2_Parallel", 2, true, 10, 100, false, false, null, true});
+      vm1.invoke(WANTestBase.class, "createSender",
+          new Object[] {"ln3_Parallel", 2, true, 10, 100, false, false, null, true});
+
+      vm1.invoke(WANTestBase.class,
+          "createPartitionedRegionWithSerialParallelSenderIds", new Object[] {
+              testName + "_PR1", null, "ln1_Parallel,ln2_Parallel", null, isOffHeap()  });
+      vm1.invoke(WANTestBase.class,
+          "createPartitionedRegionWithSerialParallelSenderIds", new Object[] {
+              testName + "_PR2", null, "ln1_Parallel,ln2_Parallel,ln3_Parallel", testName + "_PR1", isOffHeap()  });
+      //now we support this
+      //fail("Expected IllegalStateException with incompatible gateway sender ids in colocated regions");
+    } catch (Exception e) {
+      if (!(e.getCause() instanceof IllegalStateException)
+          || !(e.getCause().getMessage()
+              .contains("should have same parallel gateway sender ids"))) {
+        fail(
+            "Expected IllegalStateException with incompatible gateway sender ids in colocated regions",
+            e);
+      }
+    }
+  }
+  
+  /**
+   * SerialGatewaySender and ParallelGatewaySender with same name is allowed
+   */
+  public void testSerialGatewaySenderAndParallelGatewaySenderWithSameName() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm1.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
+        "ln", 2, false, 100, false, false, null, null, true, false });
+    try {
+      vm1.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
+          "ln", 2, true, 100, false, false, null, null, true, false });
+      fail("Expected IllegateStateException : Sender names should be different.");
+    } catch (Exception e) {
+      if (!(e.getCause() instanceof IllegalStateException)
+          || !(e.getCause().getMessage()
+              .contains("is already defined in this cache"))) {
+        fail("Expected IllegalStateException", e);
+      }
+    }
+  }
+  
+  //remote ds ids should be same
+  public void testSameRemoteDSAcrossSameSender() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm1.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
+        "ln", 2, false, 100, false, false, null, null,
+        true, false  });
+
+    try {
+      vm2.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
+          "ln", 3, false, 100, false, false, null, null,
+          true, false  });
+      fail("Expected IllegateStateException : Remote Ds Ids should match");
+    }
+    catch (Exception e) {
+      if (!(e.getCause() instanceof IllegalStateException)
+          || !(e.getCause().getMessage()
+              .contains("because another cache has the same Gateway Sender defined with remote ds id"))) {
+        fail("Expected IllegalStateException", e);
+      }
+    }
+  }
+  
+  // sender with same name should be either serial or parallel but not both.
+  public void testSerialSenderOnBothCache() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm1.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
+        "ln", 2, false, 100, false, false, null, null,
+        true, false  });
+
+    try {
+      vm2.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
+          "ln", 2, true, 100, false, false, null, null, true, false  });
+      fail("Expected IllegateStateException : is not serial Gateway Sender");
+    }
+    catch (Exception e) {
+      if (!(e.getCause() instanceof IllegalStateException)
+          || !(e.getCause().getMessage()
+              .contains("because another cache has the same sender as serial gateway sender"))) {
+        fail("Expected IllegalStateException", e);
+      }
+    }
+  }
+  
+  // sender with same name should be either serial or parallel but not both.
+  public void testParallelSenderOnBothCache(){
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, "createFirstLocatorWithDSId",
+        new Object[] {1});
+
+    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm1.invoke(WANTestBase.class, "createSenderForValidations", new Object[] { "ln", 2,
+        true, 100,false, false,
+        null, null, true, false  });
+    
+    try {
+      vm2
+          .invoke(WANTestBase.class, "createSenderForValidations", new Object[] { "ln", 2,
+              false, 100, false, false,null, null,
+              true, false  });
+      fail("Expected IllegateStateException : is not parallel Gateway Sender");
+    }
+    catch (Exception e) {
+      if (!(e.getCause() instanceof IllegalStateException)
+          || !(e.getCause().getMessage().contains("because another cache has the same sender as parallel gateway sender"))) {
+        fail("Expected IllegalStateException", e);
+      }
+    }
+  }
+  
+  // isBatchConflation should be same across the same sender
+  public void testBatchConflation() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm1.invoke(WANTestBase.class, "createSenderForValidations", new Object[] { "ln", 2,
+        false, 100, false, false,
+        null, null, true, false  });
+
+    // isBatchConflation
+    try {
+      vm2.invoke(WANTestBase.class, "createSenderForValidations", new Object[] { "ln", 2,
+          false, 100,true, false,
+          null, null, true, false  });
+      fail("Expected IllegateStateException : isBatchConflation Should match");
+    }
+    catch (Exception e) {
+      if (!(e.getCause() instanceof IllegalStateException)
+          || !(e.getCause().getMessage().contains("another cache has the same Gateway Sender defined with isBatchConfaltionEnabled"))) {
+        fail("Expected IllegalStateException", e);
+      }
+    }
+  }
+  
+  //isPersistentEnabled should be same across the same sender
+  public void testisPersistentEnabled() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm1.invoke(WANTestBase.class, "createSenderForValidations", new Object[] { "ln", 2,
+        false, 100, false, false,
+        null, null, true, false  });
+    try {
+      vm2.invoke(WANTestBase.class, "createSenderForValidations", new Object[] { "ln", 2,
+        false, 100,false, true, null, null, true, false  });
+      fail("Expected IllegateStateException : isPersistentEnabled Should match");
+    }
+    catch (Exception e) {
+      if (!(e.getCause() instanceof IllegalStateException)
+          || !(e.getCause().getMessage().contains("because another cache has the same Gateway Sender defined with isPersistentEnabled"))) {
+        fail("Expected IllegalStateException", e);
+      }
+    }
+  }
+  
+  public void testAlertThreshold() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm1.invoke(WANTestBase.class, "createSenderForValidations", new Object[] { "ln", 2,
+        false, 100, false, false,
+        null, null, true, false });
+    try {
+      vm2.invoke(WANTestBase.class, "createSenderForValidations", new Object[] { "ln", 2,
+        false, 50, false, false, null, null, true, false  });
+      fail("Expected IllegateStateException : alertThreshold Should match");
+    }
+    catch (Exception e) {
+      if (!(e.getCause() instanceof IllegalStateException)
+          || !(e.getCause().getMessage().contains("because another cache has the same Gateway Sender defined with alertThreshold"))) {
+        fail("Expected IllegalStateException", e);
+      }
+    }
+  }
+  
+  public void testManualStart() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm1.invoke(WANTestBase.class, "createSenderForValidations", new Object[] { "ln", 2,
+        false, 100, false, false,
+        null, null, true, false  });
+    try {
+      vm2.invoke(WANTestBase.class, "createSenderForValidations", new Object[] { "ln", 2,
+        false, 100, false, false, null, null, false, false  });
+      fail("Expected IllegateStateException : manualStart Should match");
+    }
+    catch (Exception e) {
+      if (!(e.getCause() instanceof IllegalStateException)
+          || !(e.getCause().getMessage().contains("because another cache has the same Gateway Sender defined with manual start"))) {
+        fail("Expected IllegalStateException", e);
+      }
+    }
+  }
+  
+  public void testGatewayEventFilters() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    ArrayList<GatewayEventFilter> eventFiletrs = new ArrayList<GatewayEventFilter>();
+    eventFiletrs.add(new MyGatewayEventFilter());
+    vm1.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
+        "ln", 2, false, 100, false, false, eventFiletrs,
+        null, true, false  });
+    try {
+      eventFiletrs = new ArrayList<GatewayEventFilter>();
+      eventFiletrs.add(new Filter70());
+      vm2.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
+          "ln", 2, false, 100, false, false,
+          eventFiletrs, null, true, false  });
+      fail("Expected IllegateStateException : GatewayEventFileters Should match");
+    }
+    catch (Exception e) {
+      if (!(e.getCause() instanceof IllegalStateException)
+          || !(e.getCause().getMessage()
+              .contains("because another cache has the same Gateway Sender defined with GatewayEventFilters"))) {
+        fail("Expected IllegalStateException", e);
+      }
+    }
+  }
+  
+  public void testGatewayEventFilters2() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    ArrayList<GatewayEventFilter> eventFiletrs = new ArrayList<GatewayEventFilter>();
+    eventFiletrs.add(new MyGatewayEventFilter());
+    vm1.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
+        "ln", 2, false, 100, false, false, eventFiletrs,
+        null, true, false  });
+    try {
+      eventFiletrs = new ArrayList<GatewayEventFilter>();
+      eventFiletrs.add(new MyGatewayEventFilter());
+      eventFiletrs.add(new Filter70());
+      vm2.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
+          "ln", 2, false, 100, false, false,
+          eventFiletrs, null, true, false  });
+      fail("Expected IllegateStateException : GatewayEventFileters Should match");
+    }
+    catch (Exception e) {
+      if (!(e.getCause() instanceof IllegalStateException)
+          || !(e.getCause().getMessage()
+              .contains("because another cache has the same Gateway Sender defined with GatewayEventFilters"))) {
+        fail("Expected IllegalStateException", e);
+      }
+    }
+  }
+  
+  public void testGatewayTransportFilters() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    ArrayList<GatewayTransportFilter> transportFiletrs = new ArrayList<GatewayTransportFilter>();
+    transportFiletrs.add(new MyGatewayTransportFilter1());
+    transportFiletrs.add(new MyGatewayTransportFilter2());
+    vm1.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
+        "ln", 2, false, 100, false, false, null,
+        transportFiletrs, true, false  });
+   try {
+      transportFiletrs = new ArrayList<GatewayTransportFilter>();
+      transportFiletrs.add(new MyGatewayTransportFilter3());
+      transportFiletrs.add(new MyGatewayTransportFilter4());
+      vm2.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
+          "ln", 2, false, 100, false, false,
+          null, transportFiletrs, true, false  });
+      fail("Expected IllegateStateException : GatewayEventFileters Should match");
+    }
+    catch (Exception e) {
+      if (!(e.getCause() instanceof IllegalStateException)
+          || !(e.getCause().getMessage()
+              .contains("because another cache has the same Gateway Sender defined with GatewayTransportFilters"))) {
+        fail("Expected IllegalStateException", e);
+      }
+    }
+  }
+
+  public void testGatewayTransportFiltersOrder() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    ArrayList<GatewayTransportFilter> transportFiletrs = new ArrayList<GatewayTransportFilter>();
+    transportFiletrs.add(new MyGatewayTransportFilter1());
+    transportFiletrs.add(new MyGatewayTransportFilter2());
+    vm1.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
+        "ln", 2, false, 100, false, false, null,
+        transportFiletrs, true, false  });
+   try {
+      transportFiletrs = new ArrayList<GatewayTransportFilter>();
+      transportFiletrs.add(new MyGatewayTransportFilter2());
+      transportFiletrs.add(new MyGatewayTransportFilter1());
+      vm2.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
+          "ln", 2, false, 100, false, false,
+          null, transportFiletrs, true, false });
+      fail("Expected IllegateStateException : GatewayEventFileters Should match");
+    }
+    catch (Exception e) {
+      if (!(e.getCause() instanceof IllegalStateException)
+          || !(e.getCause().getMessage()
+              .contains("because another cache has the same Gateway Sender defined with GatewayTransportFilters"))) {
+        fail("Expected IllegalStateException", e);
+      }
+    }
+  }
+  
+//  public void ___testGatewaySenderListener() {
+//    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+//        "createFirstLocatorWithDSId", new Object[] { 1 });
+//
+//    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+//    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+//
+//    vm1.invoke(WANTestBase.class, "createSenderWithListener", new Object[] {
+//        "ln", 2, false, 100, 10, false, false, null,
+//        true, true });
+//    
+//   try {
+//      vm2.invoke(WANTestBase.class, "createSenderWithListener", new Object[] {
+//        "ln", 2, false, 100, 10, false, false, null,
+//        false, true });
+//      fail("Expected IllegateStateException : GatewayEventFileters Should match");
+//    }
+//    catch (Exception e) {
+//      if (!(e.getCause() instanceof IllegalStateException)
+//          || !(e.getCause().getMessage()
+//              .contains("because another cache has the same Gateway Sender defined with GatewaySenderEventListener"))) {
+//        fail("Expected IllegalStateException", e);
+//      }
+//    }
+//  }
+  
+  public void testIsDiskSynchronous() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm1.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
+        "ln", 2, false, 100, false, false, null,
+        null, true, false });
+    
+   try {
+      vm2.invoke(WANTestBase.class, "createSenderForValidations", new Object[] {
+        "ln", 2, false, 100, false, false, null,
+        null, true, true });
+      fail("Expected IllegateStateException : isDiskSynchronous Should match");
+    }
+    catch (Exception e) {
+      if (!(e.getCause() instanceof IllegalStateException)
+          || !(e.getCause().getMessage()
+              .contains("because another cache has the same Gateway Sender defined with isDiskSynchronous"))) {
+        fail("Expected IllegalStateException", e);
+      }
+    }
+  }
+  
+  /**
+   * This test has been added for the defect # 44372.
+   * A single VM hosts a bridge server as well as a Receiver.
+   * Expected: Cache.getCacheServer should return only the Bridge server and not the Receiver
+   */
+  public void test_GetCacheServersDoesNotReturnReceivers() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    
+    vm4.invoke(WANTestBase.class, "createReceiver", new Object[] { lnPort });
+    
+    vm4.invoke(WANTestBase.class, "createCacheServer", new Object[] { });
+    
+    Map cacheServers = (Map) vm4.invoke(WANTestBase.class, "getCacheServers", new Object[] { });
+    
+    assertEquals("Cache.getCacheServers returned incorrect BridgeServers: ", 1, cacheServers.get("BridgeServer"));
+    assertEquals("Cache.getCacheServers returned incorrect ReceiverServers: ", 0, cacheServers.get("ReceiverServer"));
+  }
+  
+  /**
+   * Added for the defect # 44372.
+   * Two VMs are part of the DS. 
+   * One VM hosts a Bridge server while the other hosts a Receiver.
+   * Expected: Cache.getCacheServers should only return the bridge server and not the Receiver.
+   */
+  public void test_GetCacheServersDoesNotReturnReceivers_Scenario2() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    
+    vm4.invoke(WANTestBase.class, "createReceiver", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    
+    vm5.invoke(WANTestBase.class, "createCacheServer", new Object[] { });
+    
+    Map cacheServers_vm4 = (Map) vm4.invoke(WANTestBase.class, "getCacheServers", new Object[] { });
+    Map cacheServers_vm5 = (Map) vm5.invoke(WANTestBase.class, "getCacheServers", new Object[] { });
+    
+    assertEquals("Cache.getCacheServers on vm4 returned incorrect BridgeServers: ", 0, cacheServers_vm4.get("BridgeServer"));
+    assertEquals("Cache.getCacheServers on vm4 returned incorrect ReceiverServers: ", 0, cacheServers_vm4.get("ReceiverServer"));
+    
+    assertEquals("Cache.getCacheServers on vm5 returned incorrect BridgeServers: ", 1, cacheServers_vm5.get("BridgeServer"));
+    assertEquals("Cache.getCacheServers on vm5 returned incorrect ReceiverServers: ", 0, cacheServers_vm5.get("ReceiverServer"));
+
+  }
+  
+  
+  // dispatcher threads are same across all the nodes for ParallelGatewaySender
+  /*
+   * We are allowing number of dispatcher threads for parallel sender to differ
+   * on number of machines
+   */ 
+  public void DISABLED_testDispatcherThreadsForParallelGatewaySender() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm1.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+
+    // dispatcher threads
+    try {
+      vm2.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
+      fail("Expected IllegateStateException : dispatcher threads Should match");
+    }
+    catch (Exception e) {
+      if (!(e.getCause() instanceof IllegalStateException)
+          || !(e.getCause().getMessage().contains("because another cache has the same Gateway Sender defined with dispatcherThread"))) {
+        fail("Expected IllegalStateException", e);
+      }
+    }
+  }
+  
+  
+  // dispatcher threads are same across all the nodes for ParallelGatewaySender
+  /*
+   * For Parallel sender, thread policy is not supported whcih is checked at the
+   * time of sender creation. policy KEY and Partition are same for PGS. Hence
+   * disabling the tests
+   */
+  public void DISABLED_testOrderPolicyForParallelGatewaySender() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    vm1.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm1.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+
+    // dispatcher threads
+    try {
+      vm2.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION });
+      fail("Expected IllegateStateException : order policy Should match");
+    }
+    catch (Exception e) {
+      if (!(e.getCause() instanceof IllegalStateException)
+          || !(e.getCause().getMessage().contains("because another cache has the same Gateway Sender defined with orderPolicy"))) {
+        fail("Expected IllegalStateException", e);
+      }
+    }
+  }
+
+  public void testBug50434_RR_Serial() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", null, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", null, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
+      testName + "_RR", "ln"});
+    
+    vm5.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
+      testName + "_RR", "ln"});
+
+    try {
+      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+          10 });
+      fail("Expected GatewaySenderConfigurationException : Sender Ids should match");
+    }
+    catch (Exception e) {
+      if (!(e.getCause() instanceof GatewaySenderConfigurationException)
+          || !(e.getCause().getMessage()
+              .contains("For region across all members, gateway sender ids should be same."))) {
+        fail("Expected GatewaySenderConfigurationException", e);
+      }
+    }
+  }
+  
+  public void testBug50434_RR_SerialAsyncEventQueue() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
+        false, 100, 100, false, false, null, false });
+    vm5.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
+        false, 100, 100, false, false, null, false });
+    vm6.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
+        false, 100, 100, false, false, null, false });
+    vm7.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
+        false, 100, 100, false, false, null, false });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
+        new Object[] { testName + "_RR", "ln" });
+
+    vm5.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
+        new Object[] { testName + "_RR", "ln" });
+
+    try {
+      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+      fail("Expected GatewaySenderConfigurationException : AsyncEvent queue IDs should match");
+    }
+    catch (Exception e) {
+      if (!(e.getCause() instanceof GatewaySenderConfigurationException)
+          || !(e.getCause().getMessage()
+              .contains("For region across all members, AsyncEvent queue IDs should be same."))) {
+        fail("Expected GatewaySenderConfigurationException", e);
+      }
+    }
+  }
+  
+  public void testBug50434_RR_Serial_Pass() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", null, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", null, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
+      testName + "_RR", "ln"});
+    
+    vm5.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
+      testName + "_RR", "ln"});
+    
+    vm6.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
+      testName + "_RR", "ln"});
+    
+    vm7.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
+      testName + "_RR", "ln"});
+    
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        10});
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 10});
+  }
+  
+  public void testBug50434_RR_SerialAsyncEventQueue_Pass() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
+        false, 100, 100, false, false, null, false });
+    vm5.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
+        false, 100, 100, false, false, null, false });
+    vm6.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
+        false, 100, 100, false, false, null, false });
+    vm7.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
+        false, 100, 100, false, false, null, false });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
+        new Object[] { testName + "_RR", "ln" });
+    vm5.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
+        new Object[] { testName + "_RR", "ln" });
+    vm6.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
+        new Object[] { testName + "_RR", "ln" });
+    vm7.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
+        new Object[] { testName + "_RR", "ln" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+
+    vm4.invoke(WANTestBase.class, "validateAsyncEventListener", new Object[] {
+        "ln", 1000 });// primary sender
+    vm5.invoke(WANTestBase.class, "validateAsyncEventListener", new Object[] {
+        "ln", 0 });// secondary
+    vm6.invoke(WANTestBase.class, "validateAsyncEventListener", new Object[] {
+        "ln", 0 });// secondary
+    vm7.invoke(WANTestBase.class, "validateAsyncEventListener", new Object[] {
+        "ln", 0 });// secondary
+  }
+  
+  public void testBug50434_PR_Serial() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_RR", null, 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      false, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      false, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      false, 100, 10, false, false, null, true });
+    
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
+      testName + "_PR", "ln"});
+    
+    vm5.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
+      testName + "_PR", "ln"});
+    
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+
+    try {
+      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+        10});
+      fail("Expected GatewaySenderConfigurationException : Sender Ids should match");
+    }
+    catch (Exception e) {
+      if (!(e.getCause() instanceof GatewaySenderConfigurationException)
+          || !(e.getCause().getMessage()
+              .contains("For region across all members, gateway sender ids should be same."))) {
+        fail("Expected GatewaySenderConfigurationException", e);
+      }
+    }
+  }
+  
+  public void testBug50434_PR_SerialAsyncEventQueue() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
+        false, 100, 100, false, false, null, false });
+    vm5.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
+        false, 100, 100, false, false, null, false });
+    vm6.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
+        false, 100, 100, false, false, null, false });
+    vm7.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
+        false, 100, 100, false, false, null, false });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
+        new Object[] { testName + "_PR", "ln" });
+    vm5.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
+        new Object[] { testName + "_PR", "ln" });
+
+    try {
+      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+        1000 });
+      fail("Expected GatewaySenderConfigurationException : AsyncEvent queue IDs should match");
+    }
+    catch (Exception e) {
+      if (!(e.getCause() instanceof GatewaySenderConfigurationException)
+          || !(e.getCause().getMessage()
+              .contains("For region across all members, AsyncEvent queue IDs should be same."))) {
+        fail("Expected GatewaySenderConfigurationException", e);
+      }
+    }
+  }
+  
+  public void testBug50434_PR_Serial_Pass() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      false, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      false, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      false, 100, 10, false, false, null, true });
+    
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
+      testName + "_PR", "ln"});
+    vm5.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
+      testName + "_PR", "ln"});
+    vm6.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
+      testName + "_PR", "ln"});
+    vm7.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
+      testName + "_PR", "ln"});
+    
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+        10});
+
+    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
+      0});
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 10});
+  }
+  
+  public void testBug50434_PR_SerialAsyncEventQueue_Pass() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
+        false, 100, 100, false, false, null, false });
+    vm5.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
+        false, 100, 100, false, false, null, false });
+    vm6.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
+        false, 100, 100, false, false, null, false });
+    vm7.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
+        false, 100, 100, false, false, null, false });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
+        new Object[] { testName + "_PR", "ln" });
+    vm5.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
+        new Object[] { testName + "_PR", "ln" });
+    vm6.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
+        new Object[] { testName + "_PR", "ln" });
+    vm7.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
+        new Object[] { testName + "_PR", "ln" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+        1000 });
+
+    vm4.invoke(WANTestBase.class, "validateAsyncEventListener", new Object[] {
+        "ln", 1000 });// primary sender
+    vm5.invoke(WANTestBase.class, "validateAsyncEventListener", new Object[] {
+        "ln", 0 });// secondary
+    vm6.invoke(WANTestBase.class, "validateAsyncEventListener", new Object[] {
+        "ln", 0 });// secondary
+    vm7.invoke(WANTestBase.class, "validateAsyncEventListener", new Object[] {
+        "ln", 0 });// secondary
+  }
+  
+  public void testBug50434_PR_Parallel() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 1, 10, isOffHeap()});
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true });
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 10, isOffHeap()});
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 1, 10, isOffHeap()});
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 1, 10, isOffHeap()});
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 1, 10, isOffHeap()});
+
+    vm4.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
+      testName + "_PR", "ln"});
+    vm5.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
+      testName + "_PR", "ln"});
+    
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    try {
+      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+        10});
+      fail("Expected GatewaySenderConfigurationException : Sender Ids should match");
+    }
+    catch (Exception e) {
+      if (!(e.getCause() instanceof GatewaySenderConfigurationException)
+          || !(e.getCause().getMessage()
+              .contains("For region across all members, gateway sender ids should be same."))) {
+        fail("Expected GatewaySenderConfigurationException", e);
+      }
+    }
+  }
+  
+  public void testBug50434_PR_ParallelAsyncEventQueue() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
+        true, 100, 100, false, false, null, false });
+    vm5.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
+        true, 100, 100, false, false, null, false });
+    vm6.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
+        true, 100, 100, false, false, null, false });
+    vm7.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
+        true, 100, 100, false, false, null, false });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 10, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 10, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 10, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 10, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
+        new Object[] { testName + "_PR", "ln" });
+    vm5.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
+        new Object[] { testName + "_PR", "ln" });
+    
+    try {
+      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+        10});
+      fail("Expected GatewaySenderConfigurationException : AsyncEvent queue IDs should match");
+    }
+    catch (Exception e) {
+      if (!(e.getCause() instanceof GatewaySenderConfigurationException)
+          || !(e.getCause().getMessage()
+              .contains("For region across all members, AsyncEvent queue IDs should be same."))) {
+        fail("Expected GatewaySenderConfigurationException", e);
+      }
+    }
+  }
+  
+  public void testBug50434_PR_Parallel_pass() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 1, 10, isOffHeap()});
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 10, isOffHeap()});
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 1, 10, isOffHeap()});
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 1, 10, isOffHeap()});
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 1, 10, isOffHeap()});
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
+      testName + "_PR", "ln"});
+    vm5.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
+      testName + "_PR", "ln"});
+    vm6.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
+      testName + "_PR", "ln"});
+    vm7.invoke(WANTestBase.class, "addSenderThroughAttributesMutator", new Object[] {
+      testName + "_PR", "ln"});
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+        10});
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 10});
+  }
+  
+  public void testBug50434_PR_ParallelAsyncEventQueue_Pass() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
+        true, 100, 100, false, false, null, false });
+    vm5.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
+        true, 100, 100, false, false, null, false });
+    vm6.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
+        true, 100, 100, false, false, null, false });
+    vm7.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] { "ln",
+        true, 100, 100, false, false, null, false });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 10, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 10, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 10, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 10, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
+        new Object[] { testName + "_PR", "ln" });
+    vm5.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
+        new Object[] { testName + "_PR", "ln" });
+    vm6.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
+        new Object[] { testName + "_PR", "ln" });
+    vm7.invoke(WANTestBase.class, "addAsyncEventQueueThroughAttributesMutator",
+        new Object[] { testName + "_PR", "ln" });
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+        256 });
+    
+    vm4.invoke(WANTestBase.class, "waitForAsyncQueueToGetEmpty",
+        new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForAsyncQueueToGetEmpty",
+        new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForAsyncQueueToGetEmpty",
+        new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForAsyncQueueToGetEmpty",
+        new Object[] { "ln" });
+    
+    int vm4size = (Integer)vm4.invoke(WANTestBase.class, "getAsyncEventListenerMapSize",
+        new Object[] { "ln"});
+    int vm5size = (Integer)vm5.invoke(WANTestBase.class, "getAsyncEventListenerMapSize",
+        new Object[] { "ln"});
+    int vm6size = (Integer)vm6.invoke(WANTestBase.class, "getAsyncEventListenerMapSize",
+        new Object[] { "ln"});
+    int vm7size = (Integer)vm7.invoke(WANTestBase.class, "getAsyncEventListenerMapSize",
+        new Object[] { "ln"});
+    
+    assertEquals(vm4size + vm5size + vm6size + vm7size, 256);
+  }
+  
+  public void testBug51367_WrongBindAddressOnGatewayReceiver() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    vm2.invoke(WANTestBase.class, "createReceiverWithBindAddress", new Object[] { lnPort });
+  }
+  
+  
+  public void testBug50247_NonPersistentSenderWithPersistentRegion()
+      throws Exception {
+    addExpectedException("could not get remote locator information");
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    
+    try {
+      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+          true, 10, 100, false, false, null, false });
+      vm4.invoke(WANTestBase.class, "createPartitionedRegionWithPersistence",
+          new Object[] { testName + "_PR", "ln1", 1, 100 });
+      fail("Expected GatewaySenderException with incompatible gateway sender ids and region");
+    }
+    catch (Exception e) {
+      if (!(e.getCause() instanceof GatewaySenderException)
+          || !(e.getCause().getMessage()
+              .contains("can not be attached to persistent region "))) {
+        fail(
+            "Expected GatewaySenderException with incompatible gateway sender ids and region",
+            e);
+      }
+    }
+
+    try {
+      vm5.invoke(WANTestBase.class, "createPartitionedRegionWithPersistence",
+          new Object[] { testName + "_PR", "ln1", 1, 100 });
+      vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+          true, 10, 100, false, false, null, false });
+      fail("Expected GatewaySenderException with incompatible gateway sender ids and region");
+    }
+    catch (Exception e) {
+      if (!(e.getCause() instanceof GatewaySenderException)
+          || !(e.getCause().getMessage()
+              .contains("can not be attached to persistent region "))) {
+        fail(
+            "Expected GatewaySenderException with incompatible gateway sender ids and region",
+            e);
+      }
+    }
+  }
+  
+  /**
+   * Test configuration::
+   * 
+   * Region: Replicated WAN: Serial Number of WAN sites: 2 Region persistence
+   * enabled: false Async channel persistence enabled: false
+   */
+  public void testReplicatedSerialAsyncEventQueueWith2WANSites() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    // ------------ START - CREATE CACHE, REGION ON LOCAL SITE ------------//
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] {
+        "lnAsync", false, 100, 100, false, false, null, false });
+    vm5.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] {
+        "lnAsync", false, 100, 100, false, false, null, false });
+    vm6.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] {
+        "lnAsync", false, 100, 100, false, false, null, false });
+    vm7.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] {
+        "lnAsync", false, 100, 100, false, false, null, false });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class,
+        "createReplicatedRegionWithSenderAndAsyncEventQueue", new Object[] {
+            testName + "_RR", "ln", "lnAsync", isOffHeap() });
+    vm5.invoke(WANTestBase.class,
+        "createReplicatedRegionWithSenderAndAsyncEventQueue", new Object[] {
+            testName + "_RR", "ln", "lnAsync", isOffHeap() });
+    vm6.invoke(WANTestBase.class,
+        "createReplicatedRegionWithSenderAndAsyncEventQueue", new Object[] {
+            testName + "_RR", "ln", "lnAsync", isOffHeap() });
+    vm7.invoke(WANTestBase.class,
+        "createReplicatedRegionWithSenderAndAsyncEventQueue", new Object[] {
+            testName + "_RR", "ln", "lnAsync", isOffHeap() });
+    // ------------- END - CREATE CACHE, REGION ON LOCAL SITE -------------//
+
+    // ------------- START - CREATE CACHE ON REMOTE SITE ---------------//
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm2.invoke(WANTestBase.class, "createSender", new Object[] { "ny", 1,
+        false, 100, 10, false, false, null, true });
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ny", 1,
+        false, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] {
+        "nyAsync", false, 100, 100, false, false, null, false });
+    vm3.invoke(WANTestBase.class, "createAsyncEventQueue", new Object[] {
+        "nyAsync", false, 100, 100, false, false, null, false });
+
+    vm2.invoke(WANTestBase.class, "startSender", new Object[] { "ny" });
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ny" });
+
+    vm2.invoke(WANTestBase.class,
+        "createReplicatedRegionWithSenderAndAsyncEventQueue", new Object[] {
+            testName + "_RR", "ny", "nyAsync", isOffHeap() });
+    vm3.invoke(WANTestBase.class,
+        "createReplicatedRegionWithSenderAndAsyncEventQueue", new Object[] {
+            testName + "_RR", "ny", "nyAsync", isOffHeap() });
+
+    // ------------- END - CREATE CACHE, REGION ON REMOTE SITE -------------//
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+
+    // validate AsyncEventListener on local site
+    vm4.invoke(WANTestBase.class, "validateAsyncEventListener",
+        new Object[] { "lnAsync", 1000 });// primary sender
+    vm5.invoke(WANTestBase.class, "validateAsyncEventListener",
+        new Object[] { "lnAsync", 0 });// secondary
+    vm6.invoke(WANTestBase.class, "validateAsyncEventListener",
+        new Object[] { "lnAsync", 0 });// secondary
+    vm7.invoke(WANTestBase.class, "validateAsyncEventListener",
+        new Object[] { "lnAsync", 0 });// secondary
+
+    // validate region size on remote site
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+
+    // validate AsyncEventListener on remote site
+    vm2.invoke(WANTestBase.class, "validateAsyncEventListener",
+        new Object[] { "nyAsync", 1000 });// primary sender
+    vm3.invoke(WANTestBase.class, "validateAsyncEventListener",
+        new Object[] { "nyAsync", 0 });// secondary
+
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDUnitTest.java
new file mode 100644
index 0000000..8d0cd74
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDUnitTest.java
@@ -0,0 +1,18 @@
+package com.gemstone.gemfire.internal.cache.wan.offheap;
+
+import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelGatewaySenderOperationsDUnitTest;
+
+@SuppressWarnings("serial")
+public class ParallelGatewaySenderOperationsOffHeapDUnitTest extends
+    ParallelGatewaySenderOperationsDUnitTest {
+
+  public ParallelGatewaySenderOperationsOffHeapDUnitTest(String name) {
+    super(name);
+  }
+
+  @Override
+  public boolean isOffHeap() {
+    return true;
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderQueueOverflowOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderQueueOverflowOffHeapDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderQueueOverflowOffHeapDUnitTest.java
new file mode 100644
index 0000000..b39357e
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderQueueOverflowOffHeapDUnitTest.java
@@ -0,0 +1,18 @@
+package com.gemstone.gemfire.internal.cache.wan.offheap;
+
+import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelGatewaySenderQueueOverflowDUnitTest;
+
+@SuppressWarnings("serial")
+public class ParallelGatewaySenderQueueOverflowOffHeapDUnitTest extends
+    ParallelGatewaySenderQueueOverflowDUnitTest {
+
+  public ParallelGatewaySenderQueueOverflowOffHeapDUnitTest(String name) {
+    super(name);
+  }
+
+  @Override
+  public boolean isOffHeap() {
+    return true;
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANConflationOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANConflationOffHeapDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANConflationOffHeapDUnitTest.java
new file mode 100644
index 0000000..cb47727
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANConflationOffHeapDUnitTest.java
@@ -0,0 +1,18 @@
+package com.gemstone.gemfire.internal.cache.wan.offheap;
+
+import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelWANConflationDUnitTest;
+
+@SuppressWarnings("serial")
+public class ParallelWANConflationOffHeapDUnitTest extends
+    ParallelWANConflationDUnitTest {
+
+  public ParallelWANConflationOffHeapDUnitTest(String name) {
+    super(name);
+  }
+
+  @Override
+  public boolean isOffHeap() {
+    return true;
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
new file mode 100644
index 0000000..eab2949
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
@@ -0,0 +1,18 @@
+package com.gemstone.gemfire.internal.cache.wan.offheap;
+
+import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelWANPersistenceEnabledGatewaySenderDUnitTest;
+
+@SuppressWarnings("serial")
+public class ParallelWANPersistenceEnabledGatewaySenderOffHeapDUnitTest extends
+    ParallelWANPersistenceEnabledGatewaySenderDUnitTest {
+
+  public ParallelWANPersistenceEnabledGatewaySenderOffHeapDUnitTest(String name) {
+    super(name);
+  }
+
+  @Override
+  public boolean isOffHeap() {
+    return true;
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANPropogationConcurrentOpsOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANPropogationConcurrentOpsOffHeapDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANPropogationConcurrentOpsOffHeapDUnitTest.java
new file mode 100644
index 0000000..5ef5671
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANPropogationConcurrentOpsOffHeapDUnitTest.java
@@ -0,0 +1,18 @@
+package com.gemstone.gemfire.internal.cache.wan.offheap;
+
+import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelWANPropagationConcurrentOpsDUnitTest;
+
+@SuppressWarnings("serial")
+public class ParallelWANPropogationConcurrentOpsOffHeapDUnitTest extends
+    ParallelWANPropagationConcurrentOpsDUnitTest {
+
+  public ParallelWANPropogationConcurrentOpsOffHeapDUnitTest(String name) {
+    super(name);
+  }
+
+  @Override
+  public boolean isOffHeap() {
+    return true;
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANPropogationOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANPropogationOffHeapDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANPropogationOffHeapDUnitTest.java
new file mode 100644
index 0000000..71ef229
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANPropogationOffHeapDUnitTest.java
@@ -0,0 +1,18 @@
+package com.gemstone.gemfire.internal.cache.wan.offheap;
+
+import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelWANPropagationDUnitTest;
+
+@SuppressWarnings("serial")
+public class ParallelWANPropogationOffHeapDUnitTest extends
+    ParallelWANPropagationDUnitTest {
+
+  public ParallelWANPropogationOffHeapDUnitTest(String name) {
+    super(name);
+  }
+
+  @Override
+  public boolean isOffHeap() {
+    return true;
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialGatewaySenderQueueOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialGatewaySenderQueueOffHeapDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialGatewaySenderQueueOffHeapDUnitTest.java
new file mode 100644
index 0000000..13fbf03
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialGatewaySenderQueueOffHeapDUnitTest.java
@@ -0,0 +1,18 @@
+package com.gemstone.gemfire.internal.cache.wan.offheap;
+
+import com.gemstone.gemfire.internal.cache.wan.serial.SerialGatewaySenderQueueDUnitTest;
+
+@SuppressWarnings("serial")
+public class SerialGatewaySenderQueueOffHeapDUnitTest extends
+    SerialGatewaySenderQueueDUnitTest {
+
+  public SerialGatewaySenderQueueOffHeapDUnitTest(String name) {
+    super(name);
+  }
+
+  @Override
+  public boolean isOffHeap() {
+    return true;
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
new file mode 100644
index 0000000..cec3fa3
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
@@ -0,0 +1,18 @@
+package com.gemstone.gemfire.internal.cache.wan.offheap;
+
+import com.gemstone.gemfire.internal.cache.wan.serial.SerialWANPersistenceEnabledGatewaySenderDUnitTest;
+
+@SuppressWarnings("serial")
+public class SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest extends
+    SerialWANPersistenceEnabledGatewaySenderDUnitTest {
+
+  public SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest(String name) {
+    super(name);
+  }
+
+  @Override
+  public boolean isOffHeap() {
+    return true;
+  }
+
+}



[38/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
new file mode 100644
index 0000000..14c4f9d
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
@@ -0,0 +1,2021 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.query.cq.dunit;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.PartitionAttributes;
+import com.gemstone.gemfire.cache.PartitionAttributesFactory;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.client.PoolFactory;
+import com.gemstone.gemfire.cache.client.PoolManager;
+import com.gemstone.gemfire.cache.query.CqAttributes;
+import com.gemstone.gemfire.cache.query.CqAttributesFactory;
+import com.gemstone.gemfire.cache.query.CqListener;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.cache.query.SelectResults;
+import com.gemstone.gemfire.cache.query.Struct;
+import com.gemstone.gemfire.cache.query.data.Portfolio;
+import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.cache30.CacheTestCase;
+
+import dunit.Host;
+import dunit.SerializableRunnable;
+import dunit.VM;
+/**
+ * Test class for Partitioned Region and CQs
+ * 
+ * @author rdubey
+ * @since 5.5
+ */
+public class PrCqUsingPoolDUnitTest extends CacheTestCase {
+
+  
+  public PrCqUsingPoolDUnitTest(String name) {
+    super(name);
+  }
+  
+  static public final String[] regions = new String[] {
+      "regionA",
+      "regionB"
+  };
+  
+  static public final String KEY = "key-";
+  
+  private final CqQueryUsingPoolDUnitTest cqHelper = new CqQueryUsingPoolDUnitTest("HelperPartitonedRegionCqTest");
+  
+  private final CqStatsDUnitTest cqStatsHelper = new CqStatsDUnitTest("HelperPrCqUsingPool");
+
+  public final String[] cqs = new String [] {
+      //0 - Test for ">" 
+      "SELECT ALL * FROM /root/" + regions[0] + " p where p.ID > 0",
+      
+      //1 -  Test for "=" and "and".
+      "SELECT ALL * FROM /root/" + regions[0] + " p where p.ID = 2 and p.status='active'",
+      
+      //2 -  Test for "<" and "and".
+      "SELECT ALL * FROM /root/" + regions[1] + " p where p.ID < 5 and p.status='active'",
+      
+      // FOLLOWING CQS ARE NOT TESTED WITH VALUES; THEY ARE USED TO TEST PARSING LOGIC WITHIN CQ.
+      //3
+      "SELECT * FROM /root/" + regions[0] + " ;",
+      //4
+      "SELECT ALL * FROM /root/" + regions[0],
+      //5
+      "import com.gemstone.gemfire.cache.\"query\".data.Portfolio; " +
+      "SELECT ALL * FROM /root/" + regions[0] +  " TYPE Portfolio",
+      //6
+      "import com.gemstone.gemfire.cache.\"query\".data.Portfolio; " +
+      "SELECT ALL * FROM /root/" + regions[0] +  " p TYPE Portfolio",
+      //7
+      "SELECT ALL * FROM /root/" + regions[1] + " p where p.ID < 5 and p.status='active';",
+      //8
+      "SELECT ALL * FROM /root/" + regions[0] + "  ;",
+      //9
+      "SELECT ALL * FROM /root/" + regions[0] +" p where p.description = NULL",
+      
+      // 10
+      "SELECT ALL * FROM /root/" + regions[1] +" p where p.ID > 0",
+  };
+  
+  private static int bridgeServerPort;
+  
+  public void testCQAndPartitionedRegion() throws Exception {
+    // creating servers.
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+    
+    createServer(server1);
+    
+    createServer(server2);
+    
+    // create client 
+    
+    final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+    
+    //createClient(client, port, host0);
+    String poolName = "testCQAndPartitionedRegion";
+    createPool(client, poolName, host0, port);
+    
+    // register cq.
+    createCQ(client, poolName, "testCQEvents_0", cqs[0]);
+    cqHelper.executeCQ(client, "testCQEvents_0", false, null);
+    
+    
+    // create values
+    int size = 40;
+    createValues(server1, regions[0], size);
+    
+    // wait for last creates...
+    
+    cqHelper.waitForCreated(client, "testCQEvents_0", KEY+size);
+    
+    // validate cq..
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    //size = 2;
+    
+    // do updates
+    createValues(server1, regions[0], size);
+    
+    cqHelper.waitForUpdated(client, "testCQEvents_0", KEY+size);
+    
+    // validate cqs again
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ (size+size));
+    
+    
+    // destroy all the values.
+    int numDestroys = size;
+    cqHelper.deleteValues(server2,regions[0], numDestroys);
+    
+    cqHelper.waitForDestroyed(client, "testCQEvents_0", KEY+numDestroys);
+    
+    // validate cqs after destroyes on server2.
+ 
+        
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ numDestroys,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ numDestroys,
+        /* totalEvents: */ (size+size+numDestroys));
+    
+    // invalidate some entries.
+    /*final int numInvalidates = 5;
+    
+    server2.invoke(new CacheSerializableRunnable("Invalidate values") {
+      public void run2() throws CacheException {
+        Region region1 = getRootRegion().getSubregion(regions[0]);
+        for (int i = numInvalidates; i <= (numInvalidates+4); i++) {
+          region1.invalidate(KEY+i);
+        }
+      }
+    });
+     
+    cqHelper.waitForInvalidated(client, "testCQEvents_0", KEY+(numInvalidates+4));
+    */
+   // cqHelper.validateCQ(client, "testCQEvents_0",
+    //    /* resultSize: */ cqHelper.noTest,
+    //    /* creates: */ size,
+    //    /* updates: */ size,
+    //    /* deletes; */ (numDestroys+numInvalidates),
+    //    /* queryInserts: */ size,
+     //   /* queryUpdates: */ size,
+     //   /* queryDeletes: */ (numDestroys+numInvalidates),
+    //    /* totalEvents: */ (size+size+numDestroys + numInvalidates));
+    
+    cqHelper.closeClient(client);
+    cqHelper.closeServer(server2);
+    cqHelper.closeServer(server1);
+  }
+  
+  /**
+   * test for registering cqs on a bridge server with local max memory zero.
+   */
+  public void testPartitionedCqOnAccessorBridgeServer() throws Exception {
+ // creating servers.
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+    
+    // creating an accessor vm with Bridge Server installed.
+    createServer(server1,true);
+    
+    createServer(server2);
+    
+    // create client 
+    
+    final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+    
+    String poolName = "testPartitionedCqOnAccessorBridgeServer";
+    createPool(client, poolName, host0, port);
+
+    //createClient(client, port, host0);
+    
+    // register cq.
+    createCQ(client, poolName, "testCQEvents_0", cqs[0]);
+    cqHelper.executeCQ(client, "testCQEvents_0", false, null);
+    
+    
+    // create values
+    final int size = 1000;
+    createValues(server1, regions[0], size);
+    
+    // wait for last creates...
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForCreated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cq..
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    //size = 2;
+    
+    // do updates
+    createValues(server1, regions[0], size);
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForUpdated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cqs again.
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ (size+size));
+    
+    
+    // destroy all the values.
+    int numDestroys = size;
+    cqHelper.deleteValues(server2,regions[0], numDestroys);
+    
+    for (int i=1; i <= numDestroys; i++){
+      cqHelper.waitForDestroyed(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cqs after destroyes on server2.
+ 
+        
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ numDestroys,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ numDestroys,
+        /* totalEvents: */ (size+size+numDestroys));
+    
+    cqHelper.closeClient(client);
+    cqHelper.closeServer(server2);
+    cqHelper.closeServer(server1);
+  }
+  
+  /**
+   * test for registering cqs on single Bridge server hosting all the data. This
+   * will generate all the events locally and should always have the old value 
+   * and should not sent the profile update on wire.
+   */
+  public void testPartitionedCqOnSingleBridgeServer() throws Exception { 
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+//    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+    
+    // creating an accessor vm with Bridge Server installed.
+    createServer(server1);
+    final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+    
+    String poolName = "testPartitionedCqOnSingleBridgeServer";
+    createPool(client, poolName, host0, port);
+
+    //createClient(client, port, host0);
+    
+    // register cq.
+    createCQ(client, poolName, "testCQEvents_0", cqs[0]);
+    cqHelper.executeCQ(client, "testCQEvents_0", false, null);
+    
+    
+    // create values
+    final int size = 400;
+    createValues(server1, regions[0], size);
+    
+    // wait for last creates...
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForCreated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cq..
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    //size = 2;
+    
+    // do updates
+    createValues(server1, regions[0], size);
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForUpdated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cqs again.
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ (size+size));
+    
+    
+    // destroy all the values.
+    int numDestroys = size;
+    cqHelper.deleteValues(server1,regions[0], numDestroys);
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForDestroyed(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cqs after destroyes on server2.
+ 
+        
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ numDestroys,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ numDestroys,
+        /* totalEvents: */ (size+size+numDestroys));
+    
+    cqHelper.closeClient(client);
+    cqHelper.closeServer(server1);
+  }
+  
+  /**
+   * test for registering cqs on single Bridge server hosting all the data. This
+   * will generate all the events locally but the puts, updates and destroys originate
+   * at an accessor vm.
+   */
+  public void testPRCqOnSingleBridgeServerUpdatesOriginatingAtAccessor() throws Exception { 
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+    
+    // creating an accessor vm with Bridge Server installed.
+    createServer(server1,true);
+    
+    assertLocalMaxMemory(server1);
+    
+    createServer(server2);
+    
+    // create client 
+    
+    final int port = server2.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server2.getHost());
+    
+    String poolName = "testPRCqOnSingleBridgeServerUpdatesOriginatingAtAccessor";
+    createPool(client, poolName, host0, port);
+
+    //createClient(client, port, host0);
+    
+    // register cq.
+    createCQ(client, poolName, "testCQEvents_0", cqs[0]);
+    cqHelper.executeCQ(client, "testCQEvents_0", false, null);
+    
+    
+    // create values
+    final int size = 400;
+    createValues(server1, regions[0], size);
+    
+    // wait for last creates...
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForCreated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cq..
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    //size = 2;
+    
+    // do updates
+    createValues(server1, regions[0], size);
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForUpdated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cqs again.
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ (size+size));
+    
+    
+    // destroy all the values.
+    int numDestroys = size;
+    cqHelper.deleteValues(server1,regions[0], numDestroys);
+    
+    for (int i=1; i <= numDestroys; i++){
+      cqHelper.waitForDestroyed(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cqs after destroyes on server2.
+ 
+        
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ numDestroys,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ numDestroys,
+        /* totalEvents: */ (size+size+numDestroys));
+    
+    cqHelper.closeClient(client);
+    cqHelper.closeServer(server2);
+    cqHelper.closeServer(server1);
+  }
+  
+  /**
+   * test to check invalidates on bridge server hosting datastores as well.
+   */
+  public void testPRCqWithInvalidatesOnBridgeServer()  {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+    
+    // creating Bridge Server with data store. clients will connect to this 
+    // bridge server.
+    createServer(server1);
+     
+    // create another server with data store.
+    createServer(server2);
+    
+    
+    final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+
+    String poolName = "testPRCqWithInvalidatesOnBridgeServer";
+    createPool(client, poolName, host0, port);
+
+    //createClient(client, port, host0);
+    
+    // register cq.
+    createCQ(client, poolName, "testCQEvents_0", cqs[0]);
+    cqHelper.executeCQ(client, "testCQEvents_0", false, null);
+    
+    
+    // create values
+    final int size = 400;
+    createValues(server1, regions[0], size);
+    
+    // wait for last creates...
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForCreated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cq..
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    //size = 2;
+    
+    // do updates
+    createValues(server1, regions[0], size);
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForUpdated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cqs again.
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ (size+size));
+    
+    
+    // invalidate all the values.
+    int numInvalidates = size;
+    cqHelper.invalidateValues(server2,regions[0], numInvalidates);
+    
+    for (int i=1; i <= numInvalidates; i++){
+      cqHelper.waitForInvalidated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cqs after invalidates on server2.
+         
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ numInvalidates,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ numInvalidates,
+        /* totalEvents: */ (size+size+numInvalidates));
+    
+    cqHelper.closeClient(client);
+    cqHelper.closeServer(server2);
+    cqHelper.closeServer(server1);
+    
+  }
+  
+  /**
+   * test cqs with invalidates on bridge server not hosting datastores.
+   * 
+   */
+  public void testPRCqWithInvalidatesOnAccessorBridgeServer() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+    
+    // creating Bridge Server with data store. clients will connect to this 
+    // bridge server.
+    createServer(server1, true);
+     
+    // create another server with data store.
+    createServer(server2);
+    
+    
+    final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+    
+    String poolName = "testPRCqWithInvalidatesOnAccessorBridgeServer";
+    createPool(client, poolName, host0, port);
+
+    //createClient(client, port, host0);
+    
+    // register cq.
+    createCQ(client, poolName, "testCQEvents_0", cqs[0]);
+    cqHelper.executeCQ(client, "testCQEvents_0", false, null);
+    
+    
+    // create values
+    final int size = 400;
+    createValues(server1, regions[0], size);
+    
+    // wait for last creates...
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForCreated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cq..
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    //size = 2;
+    
+    // do updates
+    createValues(server1, regions[0], size);
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForUpdated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cqs again.
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ (size+size));
+    
+    
+    // invalidate all the values.
+    int numInvalidates = size;
+    cqHelper.invalidateValues(server1,regions[0], numInvalidates);
+    
+    for (int i=1; i <= numInvalidates; i++){
+      cqHelper.waitForInvalidated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cqs after invalidates on server2.
+         
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ numInvalidates,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ numInvalidates,
+        /* totalEvents: */ (size+size+numInvalidates));
+    
+    cqHelper.closeClient(client);
+    cqHelper.closeServer(server2);
+    cqHelper.closeServer(server1); 
+  
+  }
+  
+  /**
+   * test cqs with create updates and destroys from client on bridge server
+   * hosting datastores.
+   */
+  public void testPRCqWithUpdatesFromClients() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+    VM client2 = host.getVM(3);
+    
+    // creating Bridge Server with data store. clients will connect to this 
+    // bridge server.
+    createServer(server1, false, 1);
+     
+    // create another server with data store.
+    createServer(server2, false , 1);
+    
+    
+    final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+    
+    String poolName1 = "testPRCqWithUpdatesFromClients1";
+    createPool(client, poolName1, host0, port);
+    
+    String poolName2 = "testPRCqWithUpdatesFromClients2";
+    createPool(client2, poolName2, host0, port);
+    
+    //createClient(client, port, host0);
+    createClient(client2, port, host0);
+    
+    // register cq.
+    createCQ(client, poolName1, "testCQEvents_0", cqs[0]);
+    cqHelper.executeCQ(client, "testCQEvents_0", false, null);
+    
+    
+    // create values
+    final int size = 400;
+    
+    createValues(client2, regions[0], size);
+
+    // wait for last creates...
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForCreated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cq..
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    //size = 2;
+    
+    // do updates
+    createValues(client2, regions[0], size);
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForUpdated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cqs again.
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ (size+size));
+    
+    
+    // invalidate all the values.
+    int numDelets = size;
+    
+    cqHelper.deleteValues(client2,regions[0], numDelets);
+    
+    for (int i=1; i <= numDelets; i++){
+      cqHelper.waitForDestroyed(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cqs after invalidates on server2.
+         
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ numDelets,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ numDelets,
+        /* totalEvents: */ (size+size+numDelets));
+    
+    cqHelper.closeClient(client);
+    cqHelper.closeClient(client2);
+    cqHelper.closeServer(server2);
+    cqHelper.closeServer(server1);
+  
+  }
+  
+  /**
+   * test cqs on multiple partitioned region hosted by bridge servers.
+   * 
+   */
+  public void testPRCqWithMultipleRegionsOnServer() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+    VM client2 = host.getVM(3);
+    
+    // creating Bridge Server with data store. clients will connect to this 
+    // bridge server.
+    createServer(server1, false, 1);
+     
+    // create another server with data store.
+    createServer(server2, false , 1);
+
+    // Wait for server to initialize.
+    pause(2000);
+    
+    final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+
+    String poolName1 = "testPRCqWithMultipleRegionsOnServer1";
+    createPool(client, poolName1, host0, port);
+    
+    String poolName2 = "testPRCqWithMultipleRegionsOnServer2";
+    createPool(client2, poolName2, host0, port);
+    
+    //createClient(client, port, host0);
+    createClient(client2, port, host0);
+    
+    // register cq.
+    createCQ(client, poolName1, "testCQEvents_0", cqs[0]);
+    createCQ(client, poolName1, "testCQEvents_1", cqs[10]);
+    cqHelper.executeCQ(client, "testCQEvents_0", false, null);
+    cqHelper.executeCQ(client, "testCQEvents_1", false, null);
+    
+    // create values
+    final int size = 400;
+    createValues(client2, regions[0], size);
+    createValues(client2, regions[1], size);
+    
+    // wait for last creates...
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForCreated(client, "testCQEvents_0", KEY+i);
+      cqHelper.waitForCreated(client, "testCQEvents_1", KEY+i);
+    }
+    
+    // validate cq..
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    cqHelper.validateCQ(client, "testCQEvents_1",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    
+    //size = 2;
+    
+    // do updates
+    createValues(client2, regions[0], size);
+    createValues(client2, regions[1], size);
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForUpdated(client, "testCQEvents_0", KEY+i);
+      cqHelper.waitForUpdated(client, "testCQEvents_1", KEY+i);
+    }
+    
+    // validate cqs again.
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ (size+size));
+    
+    cqHelper.validateCQ(client, "testCQEvents_1",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ (size+size));
+    
+    // invalidate all the values.
+    int numInvalidates = size;
+    //cqHelper.invalidateValues(server1,regions[0], numInvalidates);
+    cqHelper.deleteValues(client2,regions[0], numInvalidates);
+    cqHelper.deleteValues(client2,regions[1], numInvalidates);
+    
+    for (int i=1; i <= numInvalidates; i++){
+      cqHelper.waitForDestroyed(client, "testCQEvents_0", KEY+i);
+      cqHelper.waitForDestroyed(client, "testCQEvents_1", KEY+i);
+    }
+    
+    
+    // validate cqs after invalidates on server2.
+         
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ numInvalidates,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ numInvalidates,
+        /* totalEvents: */ (size+size+numInvalidates));
+    
+    
+    cqHelper.validateCQ(client, "testCQEvents_1",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ numInvalidates,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ numInvalidates,
+        /* totalEvents: */ (size+size+numInvalidates));
+    
+    cqHelper.closeClient(client);
+    cqHelper.closeClient(client2);
+    cqHelper.closeServer(server2);
+    cqHelper.closeServer(server1);
+  }
+  
+  /**
+   * tests multiple cqs on partitioned region on bridge servers with profile update 
+   * for not requiring old values.
+   * 
+   */
+  public void testPRWithCQsAndProfileUpdates() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+    VM client2 = host.getVM(3);
+    
+    // creating Bridge Server with data store. clients will connect to this 
+    // bridge server.
+    createServer(server1, false, 1);
+     
+    // create another server with data store.
+    createServer(server2, false , 1);
+
+    // Wait for server to initialize.
+    pause(2000);
+    
+    final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+    
+    String poolName1 = "testPRWithCQsAndProfileUpdates1";
+    createPool(client, poolName1, host0, port);
+    
+    String poolName2 = "testPRWithCQsAndProfileUpdates2";
+    createPool(client2, poolName2, host0, port);
+    
+    
+    //createClient(client, port, host0);
+    createClient(client2, port, host0);
+    
+    // register cq.
+    createCQ(client, poolName1, "testPRWithCQsAndProfileUpdates_0", cqs[0]); // SAME CQ REGISTERED TWICE.
+    createCQ(client, poolName1,  "testPRWithCQsAndProfileUpdates_1", cqs[0]); 
+    cqHelper.executeCQ(client, "testPRWithCQsAndProfileUpdates_0", false, null);
+    cqHelper.executeCQ(client, "testPRWithCQsAndProfileUpdates_1", false, null);
+    
+    // create values
+    final int size = 400;
+    createValues(client2, regions[0], size);
+    createValues(client2, regions[1], size);
+    
+    // wait for last creates...
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForCreated(client, "testPRWithCQsAndProfileUpdates_0", KEY+i);
+      cqHelper.waitForCreated(client, "testPRWithCQsAndProfileUpdates_1", KEY+i);
+    }
+    
+    // validate cq..
+    cqHelper.validateCQ(client, "testPRWithCQsAndProfileUpdates_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    cqHelper.validateCQ(client, "testPRWithCQsAndProfileUpdates_1",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    
+    //size = 2;
+    
+    // do updates
+    createValues(client2, regions[0], size);
+    createValues(client2, regions[1], size);
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForUpdated(client, "testPRWithCQsAndProfileUpdates_0", KEY+i);
+      cqHelper.waitForUpdated(client, "testPRWithCQsAndProfileUpdates_1", KEY+i);
+    }
+    
+    // validate cqs again.
+    cqHelper.validateCQ(client, "testPRWithCQsAndProfileUpdates_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ (size+size));
+    
+    cqHelper.validateCQ(client, "testPRWithCQsAndProfileUpdates_1",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ (size+size));
+    
+    // invalidate all the values.
+    int numInvalidates = size;
+    //cqHelper.invalidateValues(server1,regions[0], numInvalidates);
+    cqHelper.deleteValues(client2,regions[0], numInvalidates);
+    cqHelper.deleteValues(client2,regions[1], numInvalidates);
+    
+    for (int i=1; i <= numInvalidates; i++){
+      cqHelper.waitForDestroyed(client, "testPRWithCQsAndProfileUpdates_0", KEY+i);
+      cqHelper.waitForDestroyed(client, "testPRWithCQsAndProfileUpdates_1", KEY+i);
+    }
+    
+    
+    // validate cqs after invalidates on server2.
+         
+    cqHelper.validateCQ(client, "testPRWithCQsAndProfileUpdates_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ numInvalidates,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ numInvalidates,
+        /* totalEvents: */ (size+size+numInvalidates));
+    
+    
+    cqHelper.validateCQ(client, "testPRWithCQsAndProfileUpdates_1",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ numInvalidates,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ numInvalidates,
+        /* totalEvents: */ (size+size+numInvalidates));
+    
+    // check for requries old value set.
+    /*
+    server1.invoke(new CacheSerializableRunnable("Check requires old value") {
+      public void run2()
+      {
+        Cache cc = getCache();
+        PartitionedRegion region1 = (PartitionedRegion)cc
+            .getRegion("/root/regionA");
+        Set requiresOldValue = region1.getRegionAdvisor()
+            .adviseRequiresOldValue();
+        getLogWriter().info(
+            "ize of requires old value at server1 before closing cqs : "
+                + requiresOldValue.size());
+        assertTrue("The size of requiresOldValue shoule be zero on server1",
+            (0 == requiresOldValue.size()));
+      }
+    });
+
+    server2.invoke(new CacheSerializableRunnable("Check requires old value") {
+      public void run2()
+      {
+        Cache cc = getCache();
+        PartitionedRegion region1 = (PartitionedRegion)cc
+            .getRegion("/root/regionA");
+        Set requiresOldValue = region1.getRegionAdvisor()
+            .adviseRequiresOldValue();
+        getLogWriter().info(
+            "size of requires old value at server2 before closing cqs :"
+                + requiresOldValue.size());
+        assertTrue("The size of requiresOldValue should be one on server2 ",
+            (1 == requiresOldValue.size()));
+      }
+    });
+    */
+    cqHelper.closeCQ(client, "testPRWithCQsAndProfileUpdates_0");
+    cqHelper.closeCQ(client, "testPRWithCQsAndProfileUpdates_1");
+    
+    
+    // check for requires old value set after closing all the cqs.
+    /*
+    server1.invoke(new CacheSerializableRunnable("Check requires old value") {
+      public void run2()
+      {
+        Cache cc = getCache();
+        PartitionedRegion region1 = (PartitionedRegion)cc
+            .getRegion("/root/regionA");
+        Set requiresOldValue = region1.getRegionAdvisor()
+            .adviseRequiresOldValue();
+        getLogWriter().info(
+            "size of requires old value set at the end server1 : "
+                + requiresOldValue.size());
+        assertTrue("The size of requiresOldValue shoule be zero on server1",
+            (0 == requiresOldValue.size()));
+      }
+    });
+    
+    
+    server2.invoke(new CacheSerializableRunnable("Check requires old value") {
+      public void run2()
+      {
+        Cache cc = getCache();
+        PartitionedRegion region1 = (PartitionedRegion)cc
+            .getRegion("/root/regionA");
+        Set requiresOldValue = region1.getRegionAdvisor()
+            .adviseRequiresOldValue();
+        getLogWriter().info(
+            " size of requires old value set at the end server2 : "
+                + requiresOldValue.size());
+        assertTrue(
+            "The size of requiresOldValue shoule be zero on server2 as well after closing all the cqs",
+            (0 == requiresOldValue.size()));
+      }
+    });
+    */
+    cqHelper.closeClient(client);
+    cqHelper.closeClient(client2);
+    cqHelper.closeServer(server2);
+    cqHelper.closeServer(server1);
+     
+  }
+  
+  /**
+   * Test for events created during the CQ query execution.
+   * When CQs are executed using executeWithInitialResults 
+   * there may be possibility that the region changes during
+   * that time may not be reflected in the query result set
+   * thus making the query data and region data inconsistent.
+   * @throws Exception
+   */
+  public void testEventsDuringQueryExecution() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+    
+    final String cqName = "testEventsDuringQueryExecution_0";
+    
+    // Server.
+    createServer(server1);
+    createServer(server2);
+    
+    final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+    
+    String poolName1 = "testEventsDuringQueryExecution";
+    createPool(client, poolName1, host0, port);
+            
+    // create CQ.
+    createCQ(client, poolName1, cqName, cqs[0]);
+    
+    final int numObjects = 200;
+    final int totalObjects = 500;
+    
+    // initialize Region.
+    server1.invoke(new CacheSerializableRunnable("Update Region"){
+      public void run2()throws CacheException {
+        Region region = getCache().getRegion("/root/" + regions[0]);
+        for (int i = 1; i <= numObjects; i++) {
+          Portfolio p = new Portfolio(i);
+          region.put(""+i, p);
+        }
+      }
+    });
+      
+    // Keep updating region (async invocation).
+    server1.invokeAsync(new CacheSerializableRunnable("Update Region"){
+      public void run2()throws CacheException {
+        Region region = getCache().getRegion("/root/" + regions[0]);
+        for (int i = numObjects + 1; i <= totalObjects; i++) {
+          Portfolio p = new Portfolio(i);
+          region.put(""+i, p);
+        }
+      }
+    });
+    
+    // Execute CQ while update is in progress.
+    client.invoke(new CacheSerializableRunnable("Execute CQ") {
+      public void run2()throws CacheException {
+        QueryService cqService = getCache().getQueryService();
+        // Get CqQuery object.
+        CqQuery cq1 = cqService.getCq(cqName);
+        if (cq1 == null) {
+          fail("Failed to get CQ " + cqName);
+        }
+        
+        SelectResults cqResults = null;
+
+        try {
+          cqResults = cq1.executeWithInitialResults();
+        } catch (Exception ex){
+          AssertionError err = new AssertionError("Failed to execute  CQ " + cqName);
+          err.initCause(ex);
+          throw err;
+        }
+        
+        //getLogWriter().info("initial result size = " + cqResults.size());
+        
+        CqQueryTestListener cqListener = (CqQueryTestListener)cq1.getCqAttributes().getCqListener();
+        // Wait for the last key to arrive.
+        for (int i=0; i < 4; i++) {
+          try {
+            cqListener.waitForCreated("" + totalObjects);
+            // Found skip from the loop.
+            break;
+          } catch (CacheException ex) {
+            if (i == 3) {
+              throw ex;
+            }
+          }
+        }
+        
+        // Check if the events from CqListener are in order.
+        int oldId = 0;
+        for (Object cqEvent : cqListener.events.toArray()) { 
+          int newId = new Integer(cqEvent.toString()).intValue();
+          if (oldId > newId){
+            fail("Queued events for CQ Listener during execution with " + 
+                "Initial results is not in the order in which they are created.");
+          }
+          oldId = newId;
+        }
+        
+        // Check if all the IDs are present as part of Select Results and CQ Events.
+        HashSet ids = new HashSet(cqListener.events);
+        for (Object o : cqResults.asList()) {
+          Struct s = (Struct)o;
+          ids.add(s.get("key"));
+        }
+        //Iterator iter = cqResults.asSet().iterator();
+        //while (iter.hasNext()) {
+        //  Portfolio p = (Portfolio)iter.next();
+        //  ids.add(p.getPk());
+        //  //getLogWriter().info("Result set value : " + p.getPk());
+        //}
+        
+        HashSet missingIds = new HashSet();
+        String key = "";
+        for (int i = 1; i <= totalObjects; i++) {
+          key = "" + i;
+          if (!(ids.contains(key))){
+            missingIds.add(key);
+          }
+        }
+        
+        if (!missingIds.isEmpty()) {
+          fail("Missing Keys in either ResultSet or the Cq Event list. " +
+              " Missing keys : [size : " + missingIds.size() + "]" + missingIds +
+              " Ids in ResultSet and CQ Events :" + ids);
+        }
+        
+      } 
+    });
+   
+    cqHelper.closeClient(client);
+    cqHelper.closeServer(server2);
+    cqHelper.closeServer(server1);
+
+  }
+
+  public void testCQsWithPutalls() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+    
+    // creating Bridge Server with data store. clients will connect to this 
+    // bridge server.
+    createServer(server1, false, 1);
+     
+    // create another server with data store.
+    createServer(server2, false, 1);
+    
+    // create values
+    final int size = 100;
+
+    final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+
+    String poolName = "testCQsWithPutalls";
+    createPool(client, poolName, new String[]{host0}, new int[]{port});
+    createClient(client, new int[] {port}, host0, null);
+    
+    // register cq.
+    createCQ(client, poolName, "testCQEvents_0", cqs[0]);
+    cqHelper.executeCQ(client, "testCQEvents_0", false, null);
+    
+    cqHelper.registerInterestListCQ(client, regions[0], size, true);
+   
+    createValuesPutall(server1, regions[0], size);
+
+    // wait for last creates...
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForCreated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cq..
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    //size = 2;
+    
+    // do updates
+    createValues(server1, regions[0], size);
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForUpdated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cqs again.
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ (size+size));
+    
+    
+    // invalidate all the values.
+    int numInvalidates = size;
+    cqHelper.invalidateValues(server2,regions[0], numInvalidates);
+    
+    for (int i=1; i <= numInvalidates; i++){
+      cqHelper.waitForInvalidated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cqs after invalidates on server2.
+         
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ numInvalidates,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ numInvalidates,
+        /* totalEvents: */ (size+size+numInvalidates));
+    
+    cqHelper.closeClient(client);
+    cqHelper.closeServer(server2);
+    cqHelper.closeServer(server1);   
+  }
+  
+  public void testCQsWithPutallsValidateStats() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+    
+    // creating Bridge Server with data store. clients will connect to this 
+    // bridge server.
+    createServer(server1, false, 1);
+     
+    // create another server with data store.
+    createServer(server2, false, 1);
+    
+    // create values
+    final int size = 100;
+
+    final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+
+    String poolName = "testCQsWithPutalls";
+    createPool(client, poolName, new String[]{host0}, new int[]{port});
+    createClient(client, new int[] {port}, host0, null);
+    
+    // register cq.
+    createCQ(client, poolName, "testCQEvents_0", cqs[0]);
+    cqHelper.executeCQ(client, "testCQEvents_0", false, null);
+    
+    cqStatsHelper.validateCQStats(client, "testCQEvents_0", 0, 0, 0, 0, 0);
+    
+    cqHelper.registerInterestListCQ(client, regions[0], size, true);
+   
+    createValuesPutall(server1, regions[0], size);
+
+    // wait for last creates...
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForCreated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    cqStatsHelper.validateCQStats(client, "testCQEvents_0", size, 0, 0, size, size);
+    
+    // validate cq..
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    //size = 2;
+    
+    // do updates
+    createValuesPutall(server1, regions[0], size);
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForUpdated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    cqStatsHelper.validateCQStats(client, "testCQEvents_0", size, size, 0, size+size, size+size);
+    
+    // validate cqs again.
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ (size+size));
+    
+    
+    // invalidate all the values.
+    int numInvalidates = size;
+    cqHelper.invalidateValues(server2,regions[0], numInvalidates);
+    
+    for (int i=1; i <= numInvalidates; i++){
+      cqHelper.waitForInvalidated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    cqStatsHelper.validateCQStats(client, "testCQEvents_0", size, size, numInvalidates, size+size+numInvalidates, size+size+numInvalidates);
+    
+    // validate cqs after invalidates on server2.
+         
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ numInvalidates,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ numInvalidates,
+        /* totalEvents: */ (size+size+numInvalidates));
+    
+    cqHelper.closeClient(client);
+    cqHelper.closeServer(server2);
+    cqHelper.closeServer(server1);   
+  }
+  
+  public void testCQsWithPutallsWithTx() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+    
+    // creating Bridge Server with data store. clients will connect to this 
+    // bridge server.
+    createServer(server1, false, 1);
+     
+    // create another server with data store.
+    createServer(server2, true, 1);
+    
+    // create values
+    final int size = 100;
+
+    final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+
+    String poolName = "testCQsWithPutallsTx";
+    createPool(client, poolName, new String[]{host0}, new int[]{port});
+    createClient(client, new int[] {port}, host0, null);
+    
+    // register cq.
+    String cqQueryString = "SELECT ALL * FROM /root/" + regions[0] + " p where p.ID < 101";
+    createCQ(client, poolName, "testCQEvents_0", cqQueryString);
+    cqHelper.executeCQ(client, "testCQEvents_0", false, null);
+    
+    cqHelper.registerInterestListCQ(client, regions[0], size, true);
+   
+    server1.invoke(new CacheSerializableRunnable("begin transaction") {
+      public void run2() throws CacheException {
+        getCache().getCacheTransactionManager().begin();
+      }
+    });
+
+    createValuesPutall(server1, regions[0], size);
+
+    server1.invoke(new CacheSerializableRunnable("commit transaction") {
+      public void run2() throws CacheException {
+        getCache().getCacheTransactionManager().commit();
+      }
+    });
+
+     // wait for last creates...
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForCreated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cq..
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    //size = 2;
+    
+    // do updates
+    createValuesPutall(server1, regions[0], size);
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForUpdated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cqs again.
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ (size+size));
+    
+    
+    // destroy all the values.
+    int numInvalidates = size;
+    server1.invoke(new CacheSerializableRunnable("begin transaction") {
+      public void run2() throws CacheException {
+        getCache().getCacheTransactionManager().begin();
+      }
+    });
+
+    cqHelper.deleteValues(server1,regions[0], numInvalidates);
+    
+    server1.invoke(new CacheSerializableRunnable("commit transaction") {
+      public void run2() throws CacheException {
+        getCache().getCacheTransactionManager().commit();
+      }
+    });
+    
+
+    for (int i=1; i <= numInvalidates; i++){
+      cqHelper.waitForDestroyed(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cqs after destroy.
+         
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ numInvalidates,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ numInvalidates,
+        /* totalEvents: */ (size+size+numInvalidates));
+    
+    cqHelper.closeClient(client);
+    cqHelper.closeServer(server2);
+    cqHelper.closeServer(server1);
+    
+  
+  }
+  
+  public void testCQsWithPutallsWithTxValidateStats() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+    
+    // creating Bridge Server with data store. clients will connect to this 
+    // bridge server.
+    createServer(server1, false, 1);
+     
+    // create another server with data store.
+    createServer(server2, true, 1);
+    
+    // create values
+    final int size = 100;
+
+    final int port = server1.invokeInt(PrCqUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+
+    String poolName = "testCQsWithPutallsTx";
+    createPool(client, poolName, new String[]{host0}, new int[]{port});
+    createClient(client, new int[] {port}, host0, null);
+    
+    // register cq.
+    String cqQueryString = "SELECT ALL * FROM /root/" + regions[0] + " p where p.ID < 101";
+    createCQ(client, poolName, "testCQEvents_0", cqQueryString);
+    cqHelper.executeCQ(client, "testCQEvents_0", false, null);
+    
+    cqStatsHelper.validateCQStats(client, "testCQEvents_0", 0, 0, 0, 0, 0);
+
+    cqHelper.registerInterestListCQ(client, regions[0], size, true);
+   
+    server1.invoke(new CacheSerializableRunnable("begin transaction") {
+      public void run2() throws CacheException {
+        getCache().getCacheTransactionManager().begin();
+      }
+    });
+
+    createValuesPutall(server1, regions[0], size);
+
+    server1.invoke(new CacheSerializableRunnable("commit transaction") {
+      public void run2() throws CacheException {
+        getCache().getCacheTransactionManager().commit();
+      }
+    });
+
+     // wait for last creates...
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForCreated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    cqStatsHelper.validateCQStats(client, "testCQEvents_0", size, 0, 0, size, size);
+
+    // validate cq..
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    //size = 2;
+    
+    // do updates
+    createValuesPutall(server1, regions[0], size);
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForUpdated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    cqStatsHelper.validateCQStats(client, "testCQEvents_0", size, size, 0, size+size, size+size);
+    
+    // validate cqs again.
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ (size+size));
+    
+    
+    // destroy all the values.
+    int numInvalidates = size;
+    server1.invoke(new CacheSerializableRunnable("begin transaction") {
+      public void run2() throws CacheException {
+        getCache().getCacheTransactionManager().begin();
+      }
+    });
+
+    cqHelper.deleteValues(server1,regions[0], numInvalidates);
+    
+    server1.invoke(new CacheSerializableRunnable("commit transaction") {
+      public void run2() throws CacheException {
+        getCache().getCacheTransactionManager().commit();
+      }
+    });
+    
+
+    for (int i=1; i <= numInvalidates; i++){
+      cqHelper.waitForDestroyed(client, "testCQEvents_0", KEY+i);
+    }
+    
+    cqStatsHelper.validateCQStats(client, "testCQEvents_0", size, size, numInvalidates, size+size+numInvalidates, size+size+numInvalidates);
+
+    // validate cqs after destroy.
+         
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ numInvalidates,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ numInvalidates,
+        /* totalEvents: */ (size+size+numInvalidates));
+    
+    cqHelper.closeClient(client);
+    cqHelper.closeServer(server2);
+    cqHelper.closeServer(server1);
+    
+  
+  }
+  // helper methods.
+  
+  /**
+   * create bridge server with default attributes for partitioned region.
+   */
+  public void createServer(VM server) {
+    createServer(server, 0, false, 0);
+  }
+  
+  /**
+   * create accessor vm if the given accessor parameter variable is true.
+   * @param server VM to create bridge server.
+   * @param accessor boolean if true creates an accessor bridge server.
+   */
+  public void createServer(VM server, boolean accessor){
+    createServer(server, 0, accessor, 0);
+  }
+  
+  /**
+   * create server with partitioned region with redundant copies.
+   * @param server VM where to create the bridge server.
+   * @param accessor boolean if true create partitioned region with local max memory zero.
+   * @param redundantCopies number of redundant copies for a partitioned region.
+   */
+  public void createServer(VM server, boolean accessor, int redundantCopies){
+    createServer(server, 0, accessor, redundantCopies);
+  }
+  
+  /**
+   * Create a bridge server with partitioned region.
+   * @param server VM where to create the bridge server.
+   * @param port bridge server port.
+   * @param isAccessor if true the under lying partitioned region will not host data on this vm.
+   * @param redundantCopies number of redundant copies for the primary bucket.
+   */
+  public void createServer(VM server, final int port,final boolean isAccessor, final int redundantCopies)
+  {
+    SerializableRunnable createServer = new CacheSerializableRunnable(
+        "Create Cache Server") {
+      public void run2() throws CacheException
+      {
+          getLogWriter().info("### Create Cache Server. ###");
+          //AttributesFactory factory = new AttributesFactory();
+          //factory.setScope(Scope.DISTRIBUTED_ACK);
+          //factory.setMirrorType(MirrorType.KEYS_VALUES);
+          
+          //int maxMem = 0;
+          AttributesFactory attr = new AttributesFactory();
+          //attr.setValueConstraint(valueConstraint);
+          PartitionAttributesFactory paf = new PartitionAttributesFactory();
+          if (isAccessor){
+            paf.setLocalMaxMemory(0);
+          }
+          PartitionAttributes prAttr = paf.setTotalNumBuckets(197).setRedundantCopies(redundantCopies).create();
+          attr.setPartitionAttributes(prAttr);
+          
+          assertFalse(getSystem().isLoner());
+          //assertTrue(getSystem().getDistributionManager().getOtherDistributionManagerIds().size() > 0);
+          for (int i = 0; i < regions.length; i++) {
+            Region r = createRegion(regions[i], attr.create());
+            getLogWriter().info("Server created the region: "+r);
+          }
+//          pause(2000);
+          try {
+            startBridgeServer(port, true);
+          }
+          catch (Exception ex) {
+            fail("While starting CacheServer", ex);
+          }
+//          pause(2000);
+       
+      }
+    };
+
+    server.invoke(createServer);
+  }
+  
+  /**
+   * Starts a bridge server on the given port, using the given
+   * deserializeValues and notifyBySubscription to serve up the
+   * given region.
+   *
+   * @since 5.5
+   */
+  protected void startBridgeServer(int port, boolean notifyBySubscription)
+  throws IOException {
+    
+    Cache cache = getCache();
+    CacheServer bridge = cache.addCacheServer();
+    bridge.setPort(port);
+    bridge.setNotifyBySubscription(notifyBySubscription);
+    bridge.start();
+    bridgeServerPort = bridge.getPort();
+  }
+  
+  public void createPool(VM vm, String poolName, String server, int port) {
+    createPool(vm, poolName, new String[]{server}, new int[]{port});  
+  }
+
+  public void createPool(VM vm, final String poolName, final String[] servers, final int[] ports) {
+    createPool(vm, poolName, servers, ports, null);
+  }
+  
+  public void createPool(VM vm, final String poolName, final String[] servers, final int[] ports, final String redundancyLevel) {
+    vm.invoke(new CacheSerializableRunnable("createPool :" + poolName) {
+      public void run2() throws CacheException {
+        // Create Cache.
+        getCache();
+        
+        PoolFactory cpf = PoolManager.createFactory();
+        cpf.setSubscriptionEnabled(true);
+
+        if (redundancyLevel != null){
+          int redundancy = Integer.parseInt(redundancyLevel);
+          cpf.setSubscriptionRedundancy(redundancy);
+        } 
+        
+        for (int i=0; i < servers.length; i++){
+          getLogWriter().info("### Adding to Pool. ### Server : " + servers[i] + " Port : " + ports[i]);
+          cpf.addServer(servers[i], ports[i]);
+        }
+        
+        cpf.create(poolName);
+      }
+    });   
+  }
+
+  /* Create Client */
+  public void createClient(VM client, final int serverPort, final String serverHost) {
+    int[] serverPorts = new int[] {serverPort};
+    createClient(client, serverPorts, serverHost, null); 
+  }
+  
+  
+  /* Create Client */
+  public void createClient(VM client, final int[] serverPorts, final String serverHost, final String redundancyLevel) {
+    SerializableRunnable createQService =
+      new CacheSerializableRunnable("Create Client") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Create Client. ###");
+        getLogWriter().info(
+            "Will connect to server at por: " + serverPorts[0] + " and at host : "
+             + serverHost);
+        //Region region1 = null;
+        // Initialize CQ Service.
+        try {
+          getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+        
+        AttributesFactory regionFactory = new AttributesFactory();
+        regionFactory.setScope(Scope.LOCAL);
+        
+        if (redundancyLevel != null){
+          ClientServerTestCase.configureConnectionPool(regionFactory, serverHost, serverPorts[0],-1, true, Integer.parseInt(redundancyLevel), -1, null);
+        } else {
+          ClientServerTestCase.configureConnectionPool(regionFactory, serverHost, serverPorts[0], -1, true, -1, -1, null);
+        }
+        
+        for (int i=0; i < regions.length; i++) {        
+          Region clientRegion = createRegion(regions[i], regionFactory.createRegionAttributes());
+          getLogWriter().info("### Successfully Created Region on Client :" + clientRegion);
+          //region1.getAttributesMutator().setCacheListener(new CqListener());
+        }
+      }
+    };
+    
+    client.invoke(createQService);
+  }
+  
+  public void createCQ(VM vm, final String poolName, final String cqName, final String queryStr) {
+    vm.invoke(new CacheSerializableRunnable("Create CQ :" + cqName) {
+      public void run2() throws CacheException {
+        //pause(60 * 1000);
+        //getLogWriter().info("### DEBUG CREATE CQ START ####");
+        //pause(20 * 1000);
+        
+        getLogWriter().info("### Create CQ. ###" + cqName);
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {
+          cqService = (PoolManager.find(poolName)).getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+        // Create CQ Attributes.
+        CqAttributesFactory cqf = new CqAttributesFactory();
+        CqListener[] cqListeners = {new CqQueryTestListener(getLogWriter())};
+        ((CqQueryTestListener)cqListeners[0]).cqName = cqName;
+        
+        cqf.initCqListeners(cqListeners);
+        CqAttributes cqa = cqf.create();
+        
+        // Create CQ.
+        try {
+          CqQuery cq1 = cqService.newCq(cqName, queryStr, cqa);
+          assertTrue("newCq() state mismatch", cq1.getState().isStopped());
+          getLogWriter().info("Created a new CqQuery : "+cq1);
+        } catch (Exception ex){
+          AssertionError err = new AssertionError("Failed to create CQ " + cqName + " . ");
+          err.initCause(ex);
+          getLogWriter().info("CqService is :" + cqService, err);
+          throw err;
+        }
+      }
+    });   
+  } 
+  
+  /* Returs Cache Server Port */
+  private static int getCacheServerPort() {
+    return bridgeServerPort;
+  }
+  
+  /* Create/Init values */
+  public void createValues(VM vm, final String regionName, final int size) {
+    vm.invoke(new CacheSerializableRunnable("Create values for region : "+regionName) {
+      public void run2() throws CacheException {
+        Region region1 = getRootRegion().getSubregion(regionName);
+        for (int i = 1; i <= size; i++) {
+          region1.put(KEY+i, new Portfolio(i));
+        }
+        getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
+      }
+    });
+  }
+ 
+  public void createValuesPutall(VM vm, final String regionName, final int size) {
+    vm.invoke(new CacheSerializableRunnable("Create values for region : "+regionName) {
+      public void run2() throws CacheException {
+        Region region1 = getRootRegion().getSubregion(regionName);
+        Map m = new HashMap();
+        for (int i = 1; i <= size; i++) {
+          m.put(KEY+i, new Portfolio(i));
+        }
+        region1.putAll(m);
+        getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
+      }
+    });
+  }
+  
+  private void assertLocalMaxMemory (VM vm){
+    vm.invoke(new CacheSerializableRunnable("Create values") {
+      public void run2() throws CacheException {
+        for (int i = 0; i< regions.length ; i++) {
+          Region region = getRootRegion().getSubregion(regions[i]);
+          assertEquals("The region should be configure with local max memory zero : "
+                  + region, region.getAttributes().getPartitionAttributes()
+                  .getLocalMaxMemory(), 0);
+        }
+        
+      }
+    });
+  }
+  
+  
+  
+  
+  
+}
+
+

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
new file mode 100644
index 0000000..1e165c9
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
@@ -0,0 +1,42 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.query.cq.dunit;
+
+import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
+
+import dunit.SerializableRunnable;
+
+/**
+ * Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
+ *
+ */
+public class PrCqUsingPoolOptimizedExecuteDUnitTest extends PrCqUsingPoolDUnitTest{
+
+  public PrCqUsingPoolOptimizedExecuteDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+    invokeInEveryVM(new SerializableRunnable("getSystem") {
+      public void run() {
+        CqServiceImpl.EXECUTE_QUERY_DURING_INIT = false;
+      }
+    });
+  }
+  
+  @Override
+  public void tearDown2() throws Exception {
+    invokeInEveryVM(new SerializableRunnable("getSystem") {
+      public void run() {
+        CqServiceImpl.EXECUTE_QUERY_DURING_INIT = true;
+      }
+    });
+    super.tearDown2();
+  }
+}


[58/70] incubator-geode git commit: GEODE-803: Updating headers on WAN and CQ code

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java
index 4755767..13afbf2 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java
index cabee47..4dd41b8 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
index 03e5bcb..7771e67 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
index ec621de..98e0624 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
index 28139ed..bc9c6a9 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
@@ -1,10 +1,18 @@
 /*
- *  =========================================================================
- *  Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- *  ========================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.management;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
index 54d634e..5908c5f 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
@@ -1,10 +1,18 @@
 /*
- * =========================================================================
- *  Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
- *  This product is protected by U.S. and international copyright
- *  and intellectual property laws. Pivotal products are covered by
- *  more patents listed at http://www.pivotal.io/patents.
- * ========================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.management.internal.cli.commands;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
index 95b5301..6010f38 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.management.internal.cli.commands;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java
index d855b16..0497305 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java
@@ -1,10 +1,18 @@
 /*
- *  =========================================================================
- *  Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- *  ========================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.management.internal.pulse;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java
index cb473df..9fff40d 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java
@@ -1,10 +1,18 @@
 /*
- *  =========================================================================
- *  Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- *  ========================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.management.internal.pulse;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java
index 6b8d21b..d53e085 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java
@@ -1,10 +1,18 @@
 /*
- *  =========================================================================
- *  Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- *  ========================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.management.internal.pulse;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java
index 4596381..bd6529a 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.security;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
index c3adb3f..3fe7652 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.security;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java
index 0155613..6115f17 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.security;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
index 91df070..4ae7430 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.security;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java
index 9c5d18a..57f649e 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.security;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java
index 99c55b1..c44683f 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java
@@ -1,12 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-/**
- * 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.security;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/resources/.keepme
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/resources/.keepme b/gemfire-cq/src/test/resources/.keepme
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/resources/com/gemstone/gemfire/internal/cache/tier/sockets/durablecq-client-cache.xml
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/resources/com/gemstone/gemfire/internal/cache/tier/sockets/durablecq-client-cache.xml b/gemfire-cq/src/test/resources/com/gemstone/gemfire/internal/cache/tier/sockets/durablecq-client-cache.xml
index afde78f..e382a3d 100644
--- a/gemfire-cq/src/test/resources/com/gemstone/gemfire/internal/cache/tier/sockets/durablecq-client-cache.xml
+++ b/gemfire-cq/src/test/resources/com/gemstone/gemfire/internal/cache/tier/sockets/durablecq-client-cache.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
  <!DOCTYPE client-cache PUBLIC
     "-//GemStone Systems, Inc.//GemFire Declarative Caching 6.6//EN"
     "http://www.gemstone.com/dtd/cache6_6.dtd">

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/resources/com/gemstone/gemfire/internal/cache/tier/sockets/durablecq-server-cache.xml
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/resources/com/gemstone/gemfire/internal/cache/tier/sockets/durablecq-server-cache.xml b/gemfire-cq/src/test/resources/com/gemstone/gemfire/internal/cache/tier/sockets/durablecq-server-cache.xml
index 2d58506..0f21721 100644
--- a/gemfire-cq/src/test/resources/com/gemstone/gemfire/internal/cache/tier/sockets/durablecq-server-cache.xml
+++ b/gemfire-cq/src/test/resources/com/gemstone/gemfire/internal/cache/tier/sockets/durablecq-server-cache.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <!DOCTYPE cache PUBLIC
     "-//GemStone Systems, Inc.//GemFire Declarative Caching 6.6//EN"
     "http://www.gemstone.com/dtd/cache6_6.dtd">

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/resources/cq/statistics/cqStats.bt
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/resources/cq/statistics/cqStats.bt b/gemfire-cq/src/test/resources/cq/statistics/cqStats.bt
deleted file mode 100644
index ea6685c..0000000
--- a/gemfire-cq/src/test/resources/cq/statistics/cqStats.bt
+++ /dev/null
@@ -1,3 +0,0 @@
-cq/statistics/cqStatsHCT.conf
-edgeHosts =1 edgeVMsPerHost = 1 edgeThreadsPerVM = 1
-bridgeHosts =1 bridgeVMsPerHost = 1 bridgeThreadsPerVM = 1

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/resources/cq/statistics/cqStatsHCT.conf
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/resources/cq/statistics/cqStatsHCT.conf b/gemfire-cq/src/test/resources/cq/statistics/cqStatsHCT.conf
deleted file mode 100644
index 4623a5d..0000000
--- a/gemfire-cq/src/test/resources/cq/statistics/cqStatsHCT.conf
+++ /dev/null
@@ -1,100 +0,0 @@
-hydra.Prms-testRequirement = "Test CQ with a variety of operations with careful validation and serial execution in a bridge configuration";
-hydra.Prms-testDescription = "
-This test executes operations on entries on a region and carefully
-validates for correctness in the CQs. 
-The test uses serial round robin; the first thread
-in the round does a random operation, then all other threads in the round
-verify their view of the operation. After the last thread in the round verifies,
-it then becomes the first in the next round, thus the thread doing the random
-operation changes for each round. 
-";
-
-INCLUDE $JTESTS/hydraconfig/hydraparams1.inc;
-INCLUDE $JTESTS/hydraconfig/topology_hct.inc;
-
-hydra.VmPrms-extraClassPaths =
-   fcn "hydra.TestConfigFcns.duplicate(\"$GEMFIRE/lib/antlr.jar\", ${bridgeHosts})" ncf;
-
-THREADGROUP bridgeThreads
-  totalThreads = fcn
-                 ${bridgeHosts} * ${bridgeVMsPerHost} * ${bridgeThreadsPerVM}
-                 ncf
-  clientNames  = fcn "hydra.TestConfigFcns.generateNames
-                      (\"bridge\", ${bridgeHosts}, true)"
-                 ncf;
-THREADGROUP edgeThreads
-  totalThreads = fcn
-                 ${edgeHosts} * ${edgeVMsPerHost} * ${edgeThreadsPerVM}
-                 ncf
-  clientNames  = fcn "hydra.TestConfigFcns.generateNames
-                      (\"edge\", ${edgeHosts}, true)"
-                 ncf;         
-
-INITTASK     taskClass   = cq.statistics.CQStatisticsTest  taskMethod = HydraTask_initializeBridgeServer
-             threadGroups = bridgeThreads
-             runMode = always;
-
-INITTASK     taskClass   = cq.statistics.CQStatisticsTest  taskMethod = HydraTask_initializeClient
-             threadGroups = edgeThreads
-             runMode = always;
-
-INITTASK         taskClass   = cq.statistics.CQStatisticsTest  taskMethod = HydraTask_verifyCqStatistics
-             threadGroups = edgeThreads;
-
-hydra.GemFirePrms-stopSystemsAfterTest = true;
-
-hydra.Prms-totalTaskTimeSec = 1200;
-hydra.Prms-maxResultWaitSec = 600;
-hydra.Prms-serialExecution = true;
-hydra.Prms-roundRobin = true;
-
-INCLUDE $JTESTS/util/randomValues.inc;
-util.RandomValuesPrms-objectType = byte[];
-util.RandomValuesPrms-elementSize = 1000;
-util.RandomValuesPrms-borderCasePercentage = 0;
-util.ValueHolderPrms-useExtraObject = true;
-hydra.GemFirePrms-conserveSockets = ONEOF true false FOENO;
-
-hydra.CachePrms-names           = cache1;
-hydra.CachePrms-searchTimeout   = 600;
-
-hydra.Prms-useFixedRandomInMaster= true;
-hydra.RegionPrms-names          = clientRegion            serverRegion;
-hydra.RegionPrms-regionName     = testRegion              testRegion;
-hydra.RegionPrms-scope          = local                   ack;
-hydra.RegionPrms-poolName       = edgeDescript            none;
-hydra.RegionPrms-dataPolicy     = normal                  replicate;
-hydra.RegionPrms-cacheListeners = util.SilenceListener,   hct.BridgeEventListener;
-hydra.RegionPrms-partitionName  = none                    none;
-
-cq.CQUtilPrms-numOpsPerTask = 100;
-
-util.CachePrms-useDeclarativeXmlFile = ONEOF true false FOENO;
-util.TestHelperPrms-minTaskGranularitySec = 30;
-
-cq.CQUtilPrms-serverEntryOperations = ONEOF add add update invalidate get destroy FOENO; 
-cq.CQUtilPrms-clientEntryOperations = ONEOF add add update get destroy FOENO; 
-cq.CQUtilPrms-upperThreshold = 500;
-cq.CQUtilPrms-upperThresholdServerOperations = ONEOF destroy FOENO;
-cq.CQUtilPrms-upperThresholdClientOperations = ONEOF destroy FOENO;
-cq.CQUtilPrms-lowerThreshold = 0;
-cq.CQUtilPrms-lowerThresholdServerOperations = add;
-cq.CQUtilPrms-lowerThresholdClientOperations = add;
-cq.CQUtilPrms-queryDepth = 7;
-cq.CQUtilPrms-numQueriesPerClientVM = 100; 
-cq.CQUtilPrms-QueryServicePoolName = qservice;
-cq.CQUtilPrms-QueryServiceUsingPool = ONEOF true false FOENO;
-
-// define the edge clients
-hydra.PoolPrms-names                       = edgeDescript qservice;
-hydra.PoolPrms-minConnections        = 2;
-hydra.PoolPrms-subscriptionEnabled = true;
-hydra.PoolPrms-threadLocalConnections         = true;
-hydra.PoolPrms-readTimeout                 = 800000;
-hydra.PoolPrms-subscriptionRedundancy             = RANGE 0
-                                                   fcn ${bridgeHosts} * ${bridgeVMsPerHost} ncf
-                                             EGNAR;
-
-// define the bridge servers
-hydra.BridgePrms-names                = bridge;
-

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/build.gradle
----------------------------------------------------------------------
diff --git a/gemfire-wan/build.gradle b/gemfire-wan/build.gradle
index eba2539..35ee0fa 100644
--- a/gemfire-wan/build.gradle
+++ b/gemfire-wan/build.gradle
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 dependencies {
   provided project(':gemfire-core')
   provided project(path: ':gemfire-core', configuration: 'testOutput')

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/main/java/.keepme
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/.keepme b/gemfire-wan/src/main/java/.keepme
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/GatewaySenderBatchOp.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/GatewaySenderBatchOp.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/GatewaySenderBatchOp.java
index 15be615..2eb0896 100644
--- a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/GatewaySenderBatchOp.java
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/GatewaySenderBatchOp.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2002-2014, Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.client.internal;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/SenderProxy.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/SenderProxy.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/SenderProxy.java
index d2030b3..cf1d9fa 100644
--- a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/SenderProxy.java
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/SenderProxy.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.client.internal;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorDiscovery.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorDiscovery.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorDiscovery.java
index 04abc89..51468d3 100644
--- a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorDiscovery.java
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorDiscovery.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.client.internal.locator.wan;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorHelper.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorHelper.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorHelper.java
index a5b57c8..6233445 100644
--- a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorHelper.java
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorHelper.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.client.internal.locator.wan;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorJoinMessage.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorJoinMessage.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorJoinMessage.java
index 124ca2e..86ae0d6 100644
--- a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorJoinMessage.java
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorJoinMessage.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.client.internal.locator.wan;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorMembershipListenerImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorMembershipListenerImpl.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorMembershipListenerImpl.java
index 67049e6..83355f5 100644
--- a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorMembershipListenerImpl.java
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorMembershipListenerImpl.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.client.internal.locator.wan;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorJoinRequest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorJoinRequest.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorJoinRequest.java
index b31a6bd..5205f53 100644
--- a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorJoinRequest.java
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorJoinRequest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.client.internal.locator.wan;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorJoinResponse.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorJoinResponse.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorJoinResponse.java
index 4bd478d..5d563f7 100644
--- a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorJoinResponse.java
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorJoinResponse.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.client.internal.locator.wan;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorPingRequest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorPingRequest.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorPingRequest.java
index 937b676..c13bba9 100644
--- a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorPingRequest.java
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorPingRequest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.client.internal.locator.wan;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorPingResponse.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorPingResponse.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorPingResponse.java
index 3978e81..1e3b41b 100644
--- a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorPingResponse.java
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorPingResponse.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.client.internal.locator.wan;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorRequest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorRequest.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorRequest.java
index 8187531..3a4a276 100644
--- a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorRequest.java
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorRequest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.client.internal.locator.wan;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorResponse.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorResponse.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorResponse.java
index 5c61bdf..9792952 100644
--- a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorResponse.java
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorResponse.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.client.internal.locator.wan;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/WANFactoryImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/WANFactoryImpl.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/WANFactoryImpl.java
index a44a449..2844594 100644
--- a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/WANFactoryImpl.java
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/WANFactoryImpl.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.cache.client.internal.locator.wan;
 
 import com.gemstone.gemfire.cache.Cache;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/WanLocatorDiscovererImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/WanLocatorDiscovererImpl.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/WanLocatorDiscovererImpl.java
index e6ef6e0..23d21aa 100644
--- a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/WanLocatorDiscovererImpl.java
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/WanLocatorDiscovererImpl.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.client.internal.locator.wan;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractRemoteGatewaySender.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractRemoteGatewaySender.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractRemoteGatewaySender.java
index e9a0451..7e35df6 100644
--- a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractRemoteGatewaySender.java
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractRemoteGatewaySender.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.internal.cache.wan;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverFactoryImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverFactoryImpl.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverFactoryImpl.java
index f3e03a8..825d665 100644
--- a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverFactoryImpl.java
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverFactoryImpl.java
@@ -1,12 +1,19 @@
 /*
- * =========================================================================
- * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved. 
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- * ========================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package com.gemstone.gemfire.internal.cache.wan;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverImpl.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverImpl.java
index 0a14e2e..2b73809 100644
--- a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverImpl.java
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverImpl.java
@@ -1,10 +1,18 @@
 /*
- * =========================================================================
- * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved. 
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- * ========================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
index a41a246..9f0da9b 100644
--- a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2002-2014, Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderFactoryImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderFactoryImpl.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderFactoryImpl.java
index 33128c8..6afdafa 100644
--- a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderFactoryImpl.java
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderFactoryImpl.java
@@ -1,10 +1,18 @@
 /*
- * =========================================================================
- * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved. 
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- * ========================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
index 01c618c..2b48aa1 100644
--- a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
@@ -1,13 +1,19 @@
 /*
- * =========================================================================
- * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved. 
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- * ========================================================================
- * 
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package com.gemstone.gemfire.internal.cache.wan.parallel;
 import org.apache.logging.log4j.Logger;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/RemoteConcurrentParallelGatewaySenderEventProcessor.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/RemoteConcurrentParallelGatewaySenderEventProcessor.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/RemoteConcurrentParallelGatewaySenderEventProcessor.java
index db7c03c..64d2403 100644
--- a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/RemoteConcurrentParallelGatewaySenderEventProcessor.java
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/RemoteConcurrentParallelGatewaySenderEventProcessor.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.internal.cache.wan.parallel;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/RemoteParallelGatewaySenderEventProcessor.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/RemoteParallelGatewaySenderEventProcessor.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/RemoteParallelGatewaySenderEventProcessor.java
index f002eae..815932e 100644
--- a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/RemoteParallelGatewaySenderEventProcessor.java
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/RemoteParallelGatewaySenderEventProcessor.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.internal.cache.wan.parallel;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/RemoteConcurrentSerialGatewaySenderEventProcessor.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/RemoteConcurrentSerialGatewaySenderEventProcessor.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/RemoteConcurrentSerialGatewaySenderEventProcessor.java
index 440930d..8a25ab6 100644
--- a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/RemoteConcurrentSerialGatewaySenderEventProcessor.java
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/RemoteConcurrentSerialGatewaySenderEventProcessor.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.internal.cache.wan.serial;
 
 import org.apache.logging.log4j.Logger;


[70/70] incubator-geode git commit: Merge remote-tracking branch 'origin/develop' into develop

Posted by up...@apache.org.
Merge remote-tracking branch 'origin/develop' into develop


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/c194f766
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/c194f766
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/c194f766

Branch: refs/heads/develop
Commit: c194f76653cbeaa40f2efb42ace5511a0556d222
Parents: 46ae4ef 6df4b8f
Author: Dan Smith <up...@apache.org>
Authored: Thu Jan 28 10:12:27 2016 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Thu Jan 28 10:12:27 2016 -0800

----------------------------------------------------------------------
 gemfire-pulse/build.gradle | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------



[03/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java
new file mode 100644
index 0000000..e33c6a2
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java
@@ -0,0 +1,1594 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.wan.serial;
+
+import java.io.IOException;
+import java.util.Map;
+
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.EntryExistsException;
+import com.gemstone.gemfire.cache.client.ServerOperationException;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.internal.cache.wan.BatchException70;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+
+import dunit.AsyncInvocation;
+
+public class SerialWANPropogationDUnitTest extends WANTestBase {
+
+  private static final long serialVersionUID = 1L;
+
+  public SerialWANPropogationDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+    addExpectedException("Connection reset");
+    addExpectedException("Broken pipe");
+    addExpectedException("Connection refused");
+    addExpectedException("could not get remote locator information");
+    addExpectedException("Unexpected IOException");
+  }
+  
+  // this test is disabled due to a high rate of failure in unit test runs
+  // see ticket #52190
+  public void disabledtestReplicatedSerialPropagation_withoutRemoteLocator() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    //keep the batch size high enough to reduce the number of exceptions in the log
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 400, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 400, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()   });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()    });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+      1000 });
+
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+  
+    vm2.invoke(WANTestBase.class, "createReceiver2",
+        new Object[] {nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver2",
+        new Object[] {nyPort });
+    
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+  } 
+
+  
+  public void testReplicatedSerialPropagation_withoutRemoteSite() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    //keep the batch size high enough to reduce the number of exceptions in the log
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 400, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 400, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    
+    addExpectedException(BatchException70.class.getName());
+    addExpectedException(ServerOperationException.class.getName());
+
+    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] {
+      "ln", false });
+    vm5.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] {
+      "ln", false });
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+      1000 });
+    
+    vm2.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+  
+    vm2.invoke(WANTestBase.class, "createReceiver2",
+        new Object[] {nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver2",
+        new Object[] {nyPort });
+    
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+  }
+  
+  /**
+   * Added to reproduce the bug #46595
+   * 
+   * @throws Exception
+   */
+  public void testReplicatedSerialPropagationWithoutRemoteSite_defect46595()
+      throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    // reduce the batch-size so maximum number of batches will be sent
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 5, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 5, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+
+    addExpectedException(BatchException70.class.getName());
+    addExpectedException(ServerOperationException.class.getName());
+    addExpectedException(IOException.class.getName());
+    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] {
+      "ln", false });
+    vm5.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] {
+      "ln", false });
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        10000 });
+
+    // pause for some time before starting up the remote site
+    pause(10000);
+
+    vm2.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+    
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", null, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", null, isOffHeap()  });
+  
+    vm2.invoke(WANTestBase.class, "createReceiver2", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver2", new Object[] { nyPort });
+
+
+
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 10000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 10000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 10000 });
+
+  }
+
+  public void testReplicatedSerialPropagation() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()   });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()   });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+  }
+  
+  public void testReplicatedSerialPropagationWithLocalSiteClosedAndRebuilt() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()   });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()   });
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+    
+    //---------close local site and build again-----------------------------------------
+    vm4.invoke(WANTestBase.class, "killSender", new Object[] { });
+    vm5.invoke(WANTestBase.class, "killSender", new Object[] { });
+    vm6.invoke(WANTestBase.class, "killSender", new Object[] { });
+    vm7.invoke(WANTestBase.class, "killSender", new Object[] { });
+    
+    Integer regionSize = 
+      (Integer) vm2.invoke(WANTestBase.class, "getRegionSize", new Object[] {testName + "_RR" });
+    getLogWriter().info("Region size on remote is: " + regionSize);
+    
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      false, 100, 10, false, false, null, true });
+  
+    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
+    vm5.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
+    
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", isOffHeap()  });
+    
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    addExpectedException(EntryExistsException.class.getName());
+    addExpectedException(BatchException70.class.getName());
+    addExpectedException(ServerOperationException.class.getName());
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+      1000 });
+    //----------------------------------------------------------------------------------
+
+    //verify remote site receives all the events
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+  }
+
+  /**
+   * Two regions configured with the same sender and put is in progress 
+   * on both the regions.
+   * One of the two regions is destroyed in the middle.
+   * 
+   * @throws Exception
+   */
+  public void testReplicatedSerialPropagationWithLocalRegionDestroy() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    //these are part of remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    //these are part of local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    //senders are created on local site
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 20, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 20, false, false, null, true });
+
+    //create one RR (RR_1) on remote site
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", null, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", null, isOffHeap()  });
+
+    //create another RR (RR_2) on remote site
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", null, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", null, isOffHeap()  });
+    
+    //start the senders on local site
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    //create one RR (RR_1) on local site
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+
+    //create another RR (RR_2) on local site
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", "ln", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", "ln", isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", "ln", isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", "ln", isOffHeap()  });
+    
+    //start puts in RR_1 in another thread
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_RR_1", 1000 });
+    //do puts in RR_2 in main thread
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR_2", 500 });
+    //destroy RR_2 after above puts are complete
+    vm4.invoke(WANTestBase.class, "destroyRegion", new Object[] { testName + "_RR_2"});
+    
+    try {
+      inv1.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+    //sleep for some time to let all the events propagate to remote site
+    Thread.sleep(20);
+    //vm4.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ln", 0 });
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR_1", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR_2", 500 });
+  }
+
+  /**
+   * 1 region and sender configured on local site and 1 region and a 
+   * receiver configured on remote site. Puts to the local region are in progress.
+   * Remote region is destroyed in the middle.
+   * 
+   * @throws Exception
+   */
+  public void testReplicatedSerialPropagationWithRemoteRegionDestroy() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    //these are part of remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    //these are part of local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    //senders are created on local site
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 500, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 500, false, false, null, true });
+
+    //create one RR (RR_1) on remote site
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", null, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", null, isOffHeap()  });
+
+    //start the senders on local site
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    //create one RR (RR_1) on local site
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+
+    addExpectedException(BatchException70.class.getName());
+    addExpectedException(ServerOperationException.class.getName());
+    
+    //start puts in RR_1 in another thread
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_RR_1", 1000 });
+    //destroy RR_1 in remote site
+    vm2.invoke(WANTestBase.class, "destroyRegion", new Object[] { testName + "_RR_1"});
+    
+    try {
+      inv1.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+
+    //verify that all is well in local site. All the events should be present in local region
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR_1", 1000 });
+    //assuming some events might have been dispatched before the remote region was destroyed,
+    //sender's region queue will have events less than 1000 but the queue will not be empty.
+    //NOTE: this much verification might be sufficient in DUnit. Hydra will take care of 
+    //more in depth validations.
+    vm4.invoke(WANTestBase.class, "verifyRegionQueueNotEmpty", new Object[] {"ln" });
+  }
+  
+  /**
+   * Two regions configured in local with the same sender and put is in progress 
+   * on both the regions. Same two regions are configured on remote site as well.
+   * One of the two regions is destroyed in the middle on remote site.
+   * 
+   * @throws Exception
+   */
+  public void testReplicatedSerialPropagationWithRemoteRegionDestroy2() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    //these are part of remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    //these are part of local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    //senders are created on local site
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 200, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 200, false, false, null, true });
+
+    //create one RR (RR_1) on remote site
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", null, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", null, isOffHeap()  });
+
+    //create another RR (RR_2) on remote site
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", null, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", null, isOffHeap()  });
+    
+    //start the senders on local site
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    //create one RR (RR_1) on local site
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+
+    //create another RR (RR_2) on local site
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", "ln", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", "ln", isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", "ln", isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", "ln", isOffHeap()  });
+    //destroy RR_2 on remote site in the middle
+    vm2.invoke(WANTestBase.class, "destroyRegion", new Object[] { testName + "_RR_2"});
+    
+    //expected exceptions in the logs
+    addExpectedException(BatchException70.class.getName());
+    addExpectedException(ServerOperationException.class.getName());
+    
+    //start puts in RR_2 in another thread
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR_2", 1000 });
+    
+    //start puts in RR_1 in another thread
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_RR_1", 1000 });
+   
+    try {
+      inv1.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+    //though region RR_2 is destroyed, RR_1 should still get all the events put in it 
+    //in local site
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR_1", 1000 });
+
+  }
+  
+  /**
+   * In this test the system property gemfire.GatewaySender.REMOVE_FROM_QUEUE_ON_EXCEPTION is set to true.
+   * This will ensure that other events which did not cause BatchException can reach remote site.
+   */
+  public void testReplicatedSerialPropagationWithRemoteRegionDestroy3()
+      throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    // these are part of remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+
+    // these are part of local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    // senders are created on local site
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 200, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 200, false, false, null, true });
+
+    // create one RR (RR_1) on remote site
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", null, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", null, isOffHeap()  });
+
+    // create another RR (RR_2) on remote site
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", null, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", null, isOffHeap()  });
+    
+    // start the senders on local site
+    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
+    vm5.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
+    
+    // start the senders on local site
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    // create one RR (RR_1) on local site
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+
+    // create another RR (RR_2) on local site
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", "ln", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", "ln", isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", "ln", isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", "ln", isOffHeap()  });
+
+    addExpectedException(BatchException70.class.getName());
+    addExpectedException(ServerOperationException.class.getName());
+    
+    // start puts in RR_1 in another thread
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
+        new Object[] { testName + "_RR_1", 1000 });
+    // start puts in RR_2 in another thread
+    AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "doPuts",
+        new Object[] { testName + "_RR_2", 1000 });
+    // destroy RR_2 on remote site in the middle
+    vm2.invoke(WANTestBase.class, "destroyRegion", new Object[] { testName
+        + "_RR_2" });
+
+    try {
+      inv1.join();
+      inv2.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+    // though region RR_2 is destroyed, RR_1 should still get all the events put
+    // in it
+    // in local site
+    try {
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_RR_1", 1000 });
+    } finally {
+      System.setProperty(
+          "gemfire.GatewaySender.REMOVE_FROM_QUEUE_ON_EXCEPTION", "False");
+      vm4.invoke(new CacheSerializableRunnable("UnSetting system property ") {
+        public void run2() throws CacheException {
+          System.setProperty(
+              "gemfire.GatewaySender.REMOVE_FROM_QUEUE_ON_EXCEPTION", "False");
+        }
+      });
+
+      vm5.invoke(new CacheSerializableRunnable("UnSetting system property ") {
+        public void run2() throws CacheException {
+          System.setProperty(
+              "gemfire.GatewaySender.REMOVE_FROM_QUEUE_ON_EXCEPTION", "False");
+        }
+      });
+    }
+
+  }
+  
+  /**
+   * one region and sender configured on local site and the same region and a 
+   * receiver configured on remote site. Puts to the local region are in progress.
+   * Receiver on remote site is stopped in the middle by closing remote site cache.
+   * 
+   * @throws Exception
+   */
+  public void testReplicatedSerialPropagationWithRemoteReceiverStopped() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    //these are part of remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    //vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    //these are part of local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    //senders are created on local site. Batch size is kept to a high (170) so 
+    //there will be less number of exceptions (occur during dispatchBatch) in the log 
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 350, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 350, false, false, null, true });
+
+    //create one RR (RR_1) on remote site
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", null, isOffHeap()  });
+    //vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+    //    testName + "_RR_1", null, isOffHeap()  });
+
+    //start the senders on local site
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    //create one RR (RR_1) on local site
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+
+    //start puts in RR_1 in another thread
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_RR_1", 500 });
+    //close cache in remote site. This will automatically kill the remote receivers.
+    vm2.invoke(WANTestBase.class, "closeCache");
+    //vm3.invoke(WANTestBase.class, "closeCache");
+    
+    try {
+      inv1.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+
+    //verify that all is well in local site
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR_1", 500 });
+    vm4.invoke(WANTestBase.class, "verifyRegionQueueNotEmpty", new Object[] {"ln" });
+  }
+  
+  public void testReplicatedSerialPropagationWithRemoteReceiverRestarted()
+      throws Exception {
+    Integer lnPort = (Integer) vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer) vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    // these are part of remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    // these are part of local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    // senders are created on local site. Batch size is kept to a high (170) so
+    // there will be less number of exceptions (occur during dispatchBatch) in
+    // the log
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 350, false, false, null, true });
+
+    // create one RR (RR_1) on remote site
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", null, isOffHeap()  });
+
+    // start the senders on local site
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    // create one RR (RR_1) on local site
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] {
+      "ln", false });
+    
+    // start puts in RR_1 in another thread
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
+        new Object[] { testName + "_RR_1", 8000 });
+    // close cache in remote site. This will automatically kill the remote
+    // receivers.
+    pause(2000);
+    vm2.invoke(WANTestBase.class, "closeCache");
+    // vm3.invoke(WANTestBase.class, "closeCache");
+
+    try {
+      inv1.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+    
+    vm4.invoke(WANTestBase.class, "doPuts",
+        new Object[] { testName + "_RR_1", 1000 });
+
+    // verify that all is well in local site
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR_1", 8000 });
+
+//    vm4.invoke(WANTestBase.class, "verifyRegionQueueNotEmpty",
+//        new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", null, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
+        0 });
+
+    vm2.invoke(WANTestBase.class, "checkMinimumGatewayReceiverStats",
+        new Object[] { 1, 1 });
+  }
+
+  public void testReplicatedSerialPropagationWithRemoteReceiverRestarted_SenderReceiverPersistent()
+      throws Exception {
+    Integer lnPort = (Integer) vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer) vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    // these are part of remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    // these are part of local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    // senders are created on local site. Batch size is kept to a high (170) so
+    // there will be less number of exceptions (occur during dispatchBatch) in
+    // the log
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 350, false, true, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 350, false, true, null, true });
+
+    // create one RR (RR_1) on remote site
+    vm2.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
+        new Object[] { testName + "_RR_1", null, isOffHeap()  });
+
+    // start the senders on local site
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    // create one RR (RR_1) on local site
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] {
+      "ln", false });
+    
+    // start puts in RR_1 in another thread
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
+        new Object[] { testName + "_RR_1", 8000 });
+    // close cache in remote site. This will automatically kill the remote
+    // receivers.
+    pause(2000);
+    vm2.invoke(WANTestBase.class, "closeCache");
+    // vm3.invoke(WANTestBase.class, "closeCache");
+
+    try {
+      inv1.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+
+    // verify that all is well in local site
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR_1", 8000 });
+
+    vm4.invoke(WANTestBase.class, "verifyRegionQueueNotEmpty",
+        new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm2.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
+        new Object[] { testName + "_RR_1", null, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
+        0 });
+
+    vm2.invoke(WANTestBase.class, "checkMinimumGatewayReceiverStats",
+        new Object[] { 1, 1 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR_1", 8000 });
+  }
+
+  public void testReplicatedSerialPropagationWithRemoteSiteBouncedBack_ReceiverPersistent()
+      throws Exception {
+    Integer lnPort = (Integer) vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer) vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    // these are part of remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    // these are part of local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    // senders are created on local site. Batch size is kept to a high (170) so
+    // there will be less number of exceptions (occur during dispatchBatch) in
+    // the log
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 350, false, false, null, true });
+
+    // create one RR (RR_1) on remote site
+    vm2.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
+        testName + "_RR_1", null, isOffHeap()  });
+
+    // start the senders on local site
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    // create one RR (RR_1) on local site
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+    
+    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] {
+      "ln", false });
+    // start puts in RR_1 in another thread
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
+        new Object[] { testName + "_RR_1", 8000 });
+    // close cache in remote site. This will automatically kill the remote
+    // receivers.
+    pause(2000);
+    vm1.invoke(WANTestBase.class, "shutdownLocator");
+    vm2.invoke(WANTestBase.class, "closeCache");
+    // vm3.invoke(WANTestBase.class, "closeCache");
+
+    try {
+      inv1.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+    // Do some extra puts after cache close so that some events are in the queue.
+    vm4.invoke(WANTestBase.class, "doPuts",
+        new Object[] { testName + "_RR_1", 1000 });
+
+    // verify that all is well in local site
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR_1", 8000 });
+
+    vm4.invoke(WANTestBase.class, "verifyRegionQueueNotEmpty",
+        new Object[] { "ln" });
+
+    vm1.invoke(WANTestBase.class, "bringBackLocatorOnOldPort", new Object[] {
+        2, lnPort, nyPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm2.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
+        testName + "_RR_1", null, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
+        0 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR_1", 8000 });
+    
+    vm2.invoke(WANTestBase.class, "checkMinimumGatewayReceiverStats",
+        new Object[] { 1, 1 });
+  }
+
+  public void testReplicatedSerialPropagationWithRemoteSiteBouncedBackWithMultipleRemoteLocators()
+      throws Exception {
+    Integer lnPort = (Integer) vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort1 = (Integer) vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer nyPort2 = (Integer) vm3.invoke(WANTestBase.class,
+        "createSecondRemoteLocator", new Object[] { 2, nyPort1, lnPort });
+
+    // these are part of remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort1 });
+
+    // these are part of local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    // senders are created on local site. Batch size is kept to a high (170) so
+    // there will be less number of exceptions (occur during dispatchBatch) in
+    // the log
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 350, false, false, null, true });
+
+    // create one RR (RR_1) on remote site
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", null, isOffHeap()  });
+
+    // start the senders on local site
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    // create one RR (RR_1) on local site
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] {
+      "ln", false });
+    // start puts in RR_1 in another thread
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
+        new Object[] { testName + "_RR_1", 8000 });
+    // close cache in remote site. This will automatically kill the remote
+    // receivers.
+    pause(2000);
+    vm1.invoke(WANTestBase.class, "shutdownLocator");
+    vm2.invoke(WANTestBase.class, "closeCache");
+    // vm3.invoke(WANTestBase.class, "closeCache");
+
+    try {
+      inv1.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+    vm4.invoke(WANTestBase.class, "doPuts",
+        new Object[] { testName + "_RR_1", 1000 });
+    // verify that all is well in local site
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR_1", 8000 });
+
+    vm4.invoke(WANTestBase.class, "verifyRegionQueueNotEmpty",
+        new Object[] { "ln" });
+
+    vm6.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort2 });
+
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", null, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
+        0 });
+
+    vm6.invoke(WANTestBase.class, "checkMinimumGatewayReceiverStats",
+        new Object[] { 1, 1 });
+  }
+
+  public void testReplicatedSerialPropagationWithRemoteReceiverRestartedOnOtherNode()
+      throws Exception {
+    Integer lnPort = (Integer) vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer) vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    // these are part of remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+
+    // these are part of local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    // senders are created on local site. Batch size is kept to a high (170) so
+    // there will be less number of exceptions (occur during dispatchBatch) in
+    // the log
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 350, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 350, false, false, null, true });
+
+    // create one RR (RR_1) on remote site
+    vm2.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
+        testName + "_RR_1", null, isOffHeap()  });
+
+    vm3.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
+      testName + "_RR_1", null, isOffHeap()  });
+    
+    // start the senders on local site
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    // create one RR (RR_1) on local site
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+
+    // start puts in RR_1 in another thread
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
+        new Object[] { testName + "_RR_1", 8000 });
+    // close cache in remote site. This will automatically kill the remote
+    // receivers.
+    vm2.invoke(WANTestBase.class, "closeCache");
+    vm3.invoke(WANTestBase.class, "closeCache");
+    
+    try {
+      inv1.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+
+    // verify that all is well in local site
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR_1", 8000 });
+
+    vm4.invoke(WANTestBase.class, "verifyRegionQueueNotEmpty",
+        new Object[] { "ln" });
+
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
+      testName + "_RR_1", null, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
+        0 });
+
+    vm3.invoke(WANTestBase.class, "checkMinimumGatewayReceiverStats",
+        new Object[] { 1, 1 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR_1", 8000 });
+  }
+  
+  public void testReplicatedSerialPropagationToTwoWanSites() throws Exception {
+
+    Integer lnPort = createFirstLocatorWithDSId(1);
+    Integer nyPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer tkPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 3, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial1",
+        2, false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial1",
+        2, false, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial2",
+        3, false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial2",
+        3, false, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial1" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial1" });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial2" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial2" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "lnSerial1,lnSerial2", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "lnSerial1,lnSerial2", isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "lnSerial1,lnSerial2", isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "lnSerial1,lnSerial2", isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+  }
+
+  public void testReplicatedSerialPropagationHA() throws Exception {
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+
+    AsyncInvocation inv1 = vm5.invokeAsync(WANTestBase.class, "doPuts",
+        new Object[] { testName + "_RR", 10000 });
+    pause(2000);
+    AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "killSender");
+    
+    inv1.join();
+    inv2.join();
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 10000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 10000 });
+  }
+  
+  /**
+   * Local site:: vm4: Primary vm5: Secondary
+   * 
+   * Remote site:: vm2, vm3, vm6, vm7: All hosting receivers
+   * 
+   * vm4 is killed, so vm5 takes primary charge
+   * 
+   * @throws Exception
+   */
+  // commenting due to connection information not available in open source
+  // enable this once in closed source
+  public void SURtestReplicatedSerialPropagationHA_ReceiverAffinity()
+      throws Exception {
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm6.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm7.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    getLogWriter().info("Started receivers on remote site");
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    getLogWriter().info("Started senders on local site");
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+
+    AsyncInvocation inv1 = vm5.invokeAsync(WANTestBase.class, "doPuts",
+        new Object[] { testName + "_RR", 10000 });
+    getLogWriter().info("Started async puts on local site");
+    pause(1000);
+
+    Map oldConnectionInfo = (Map)vm4.invoke(WANTestBase.class,
+        "getSenderToReceiverConnectionInfo", new Object[] { "ln" });
+    assertNotNull(oldConnectionInfo);
+    String oldServerHost = (String)oldConnectionInfo.get("serverHost");
+    int oldServerPort = (Integer)oldConnectionInfo.get("serverPort");
+    getLogWriter().info("Got sender to receiver connection information");
+
+    AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "killSender");
+    inv2.join();
+    getLogWriter().info("Killed primary sender on local site");
+    pause(5000);// give some time for vm5 to take primary charge
+
+    Map newConnectionInfo = (Map)vm5.invoke(WANTestBase.class,
+        "getSenderToReceiverConnectionInfo", new Object[] { "ln" });
+    assertNotNull(newConnectionInfo);
+    String newServerHost = (String)newConnectionInfo.get("serverHost");
+    int newServerPort = (Integer)newConnectionInfo.get("serverPort");
+    getLogWriter().info("Got new sender to receiver connection information");
+    assertEquals(oldServerHost, newServerHost);
+    assertEquals(oldServerPort, newServerPort);
+
+    getLogWriter()
+        .info(
+            "Matched the new connection info with old connection info. Receiver affinity verified.");
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 10000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 10000 });
+  }
+
+  /**
+   * Local site:: vm4: Primary vm5: Secondary
+   * 
+   * Remote site:: vm2, vm3, vm6, vm7: All hosting receivers
+   * 
+   * vm4 is killed, so vm5 takes primary charge. vm4 brought up. vm5 is killed,
+   * so vm4 takes primary charge again.
+   * 
+   * @throws Exception
+   */
+  // commenting due to connection information not available in open source
+  // enable this once in closed source
+  public void SURtestReplicatedSerialPropagationHA_ReceiverAffinityScenario2()
+      throws Exception {
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm6.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm7.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    getLogWriter().info("Started receivers on remote site");
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    getLogWriter().info("Started senders on local site");
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+
+    AsyncInvocation inv1 = vm5.invokeAsync(WANTestBase.class, "doPuts",
+        new Object[] { testName + "_RR", 10000 });
+    getLogWriter().info("Started async puts on local site");
+    pause(1000);
+
+    Map oldConnectionInfo = (Map)vm4.invoke(WANTestBase.class,
+        "getSenderToReceiverConnectionInfo", new Object[] { "ln" });
+    assertNotNull(oldConnectionInfo);
+    String oldServerHost = (String)oldConnectionInfo.get("serverHost");
+    int oldServerPort = (Integer)oldConnectionInfo.get("serverPort");
+    getLogWriter().info("Got sender to receiver connection information");
+
+    // ---------------------------- KILL vm4
+    // --------------------------------------
+    AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "killSender");
+    inv2.join();
+    getLogWriter().info("Killed vm4 (primary sender) on local site");
+    // -----------------------------------------------------------------------------
+
+    vm5.invoke(WANTestBase.class, "waitForSenderToBecomePrimary",
+        new Object[] { "ln" });
+    getLogWriter().info("vm5 sender has now acquired primary status");
+    pause(5000);// give time to process unprocessedEventsMap
+
+    // ---------------------------REBUILD vm4
+    // --------------------------------------
+    getLogWriter().info("Rebuilding vm4....");
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    getLogWriter().info("Rebuilt vm4");
+    // -----------------------------------------------------------------------------
+
+    // --------------------------- KILL vm5
+    // ----------------------------------------
+    inv1.join();// once the puts are done, kill vm5
+    getLogWriter().info("puts in vm5 are done");
+
+    inv2 = vm5.invokeAsync(WANTestBase.class, "killSender");
+    inv2.join();
+    vm4.invoke(WANTestBase.class, "waitForSenderToBecomePrimary",
+        new Object[] { "ln" });
+    // -----------------------------------------------------------------------------
+
+    Map newConnectionInfo = (Map)vm4.invoke(WANTestBase.class,
+        "getSenderToReceiverConnectionInfo", new Object[] { "ln" });
+    assertNotNull(newConnectionInfo);
+    String newServerHost = (String)newConnectionInfo.get("serverHost");
+    int newServerPort = (Integer)newConnectionInfo.get("serverPort");
+    getLogWriter().info("Got new sender to receiver connection information");
+    assertEquals(oldServerHost, newServerHost);
+    assertEquals(oldServerPort, newServerPort);
+    getLogWriter()
+        .info(
+            "Matched the new connection info with old connection info. Receiver affinity verified.");
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 10000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 10000 });
+  }
+
+  public void testNormalRegionSerialPropagation() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    pause(500);
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createNormalRegion", new Object[] {
+        testName + "_RR", "ln" });
+    vm5.invoke(WANTestBase.class, "createNormalRegion", new Object[] {
+        testName + "_RR", "ln" });
+
+    vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+
+    vm4.invoke(WANTestBase.class, "checkQueueStats", new Object[] { "ln", 0,
+        0, 0, 0});
+
+    vm5.invoke(WANTestBase.class, "checkQueueStats", new Object[] { "ln", 0,
+        1000, 0, 0 });
+    
+    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", 1000});
+
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", 0});
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 0 });
+    
+    vm2.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {0, 0, 0});
+    
+  }
+  
+  /**
+   * Added for defect #48582 NPE when WAN sender configured but not started.
+   * All to all topology with 2 WAN sites:
+   * Site 1 (LN site): vm4, vm5, vm6, vm7
+   * Site 2 (NY site): vm2, vm3
+   */
+  public void testReplicatedSerialPropagationWithRemoteSenderConfiguredButNotStarted() {
+	Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+		"createFirstLocatorWithDSId", new Object[] { 1 });
+	Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+		"createFirstRemoteLocator", new Object[] { 2, lnPort });
+	
+	vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+	vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+	
+	vm4.invoke(WANTestBase.class, "createReceiver", new Object[] { lnPort });
+	vm5.invoke(WANTestBase.class, "createReceiver", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+    
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    
+    vm2.invoke(WANTestBase.class, "createSender", new Object[] { "ny", 1,
+        false, 100, 10, false, false, null, true });
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ny", 1,
+        false, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ny", isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ny", isOffHeap() });
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+    
+    vm2.invoke(WANTestBase.class, "startSender", new Object[] { "ny" });
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ny" });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+  }
+}


[24/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
new file mode 100644
index 0000000..4a4446c
--- /dev/null
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
@@ -0,0 +1,758 @@
+/*=========================================================================
+ * Copyright (c) 2002-2014, Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.wan;
+
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.locks.ReentrantReadWriteLock;
+
+import org.apache.logging.log4j.Logger;
+
+import com.gemstone.gemfire.CancelException;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.RegionDestroyedException;
+import com.gemstone.gemfire.cache.client.ServerConnectivityException;
+import com.gemstone.gemfire.cache.client.ServerOperationException;
+import com.gemstone.gemfire.cache.client.internal.Connection;
+import com.gemstone.gemfire.cache.client.internal.ServerProxy;
+import com.gemstone.gemfire.cache.client.internal.pooling.ConnectionDestroyedException;
+import com.gemstone.gemfire.cache.wan.GatewaySender;
+import com.gemstone.gemfire.distributed.internal.ServerLocation;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.cache.UpdateAttributesProcessor;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.internal.logging.LogService;
+import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
+import com.gemstone.gemfire.pdx.PdxRegistryMismatchException;
+import com.gemstone.gemfire.security.GemFireSecurityException;
+import com.gemstone.gemfire.cache.client.internal.SenderProxy;
+
+/**
+ * @author Suranjan Kumar
+ * @author Yogesh Mahajan
+ * @since 7.0
+ *
+ */
+public class GatewaySenderEventRemoteDispatcher implements
+    GatewaySenderEventDispatcher {
+
+  private static final Logger logger = LogService.getLogger();
+  
+  private final AbstractGatewaySenderEventProcessor processor;
+
+  private volatile Connection connection;
+
+  private final Set<String> notFoundRegions = new HashSet<String>();
+  
+  private final Object notFoundRegionsSync = new Object();
+  
+  private final AbstractGatewaySender sender;
+  
+  private AckReaderThread ackReaderThread;
+  
+  private ReentrantReadWriteLock connectionLifeCycleLock = new ReentrantReadWriteLock();
+  
+  /**
+   * This count is reset to 0 each time a successful connection is made.
+   */
+  private int failedConnectCount = 0;
+  
+  public GatewaySenderEventRemoteDispatcher(AbstractGatewaySenderEventProcessor eventProcessor) {
+    this.processor = eventProcessor;
+    this.sender = eventProcessor.getSender();
+//    this.ackReaderThread = new AckReaderThread(sender);
+    try {
+      initializeConnection();
+    }
+    catch (GatewaySenderException e) {
+      if (e.getCause() instanceof GemFireSecurityException) {
+        throw e;
+      }
+    }
+  }
+  
+  protected GatewayAck readAcknowledgement(int lastBatchIdRead) {
+    SenderProxy sp = new SenderProxy(this.processor.getSender().getProxy());
+    GatewayAck ack = null;
+    Exception ex;
+    try {
+      connection = getConnection(false);
+      if (logger.isDebugEnabled()) {
+        logger.debug(" Receiving ack on the thread {}", connection);
+      }
+      this.connectionLifeCycleLock.readLock().lock();
+      try {
+        if (connection != null) {
+          ack = (GatewayAck)sp.receiveAckFromReceiver(connection);
+        }
+      } finally {
+        this.connectionLifeCycleLock.readLock().unlock();
+      }
+
+    } catch (Exception e) {
+      Throwable t = e.getCause();
+      if (t instanceof BatchException70) {
+        // A BatchException has occurred.
+        // Do not process the connection as dead since it is not dead.
+        ex = (BatchException70)t;
+      } else if (e instanceof GatewaySenderException) { //This Exception is thrown from getConnection
+        ex = (Exception) e.getCause();
+      }else {
+        ex = e;
+        // keep using the connection if we had a batch exception. Else, destroy
+        // it
+        destroyConnection();
+      }
+      if (this.sender.getProxy() == null || this.sender.getProxy().isDestroyed()) {
+        // if our pool is shutdown then just be silent
+      } else if (ex instanceof IOException
+          || (ex instanceof ServerConnectivityException && !(ex.getCause() instanceof PdxRegistryMismatchException))
+          || ex instanceof ConnectionDestroyedException) {
+        // If the cause is an IOException or a ServerException, sleep and retry.
+        // Sleep for a bit and recheck.
+        try {
+          Thread.sleep(100);
+        } catch (InterruptedException ie) {
+          Thread.currentThread().interrupt();
+        }
+      } else {
+        if (!(ex instanceof CancelException)) {
+          logger.fatal(LocalizedMessage.create(
+                  LocalizedStrings.GatewayEventRemoteDispatcher_STOPPING_THE_PROCESSOR_BECAUSE_THE_FOLLOWING_EXCEPTION_OCCURRED_WHILE_PROCESSING_A_BATCH),
+                  ex);
+        }
+        this.processor.setIsStopped(true);
+      }
+    }
+    return ack;
+  }
+  
+  @Override
+  public boolean dispatchBatch(List events, boolean removeFromQueueOnException, boolean isRetry) {
+    GatewaySenderStats statistics = this.sender.getStatistics();
+    boolean success = false;
+    try {
+      long start = statistics.startTime();
+      success =_dispatchBatch(events, isRetry);
+      statistics.endBatch(start, events.size());
+    } catch (GatewaySenderException ge) {
+
+      Throwable t = ge.getCause();
+      if (this.sender.getProxy() == null || this.sender.getProxy().isDestroyed()) {
+        // if our pool is shutdown then just be silent
+      } else if (t instanceof IOException
+          || t instanceof ServerConnectivityException
+          || t instanceof ConnectionDestroyedException) {
+        this.processor.handleException();
+        // If the cause is an IOException or a ServerException, sleep and retry.
+        // Sleep for a bit and recheck.
+        try {
+          Thread.sleep(100);
+        } catch (InterruptedException ie) {
+          Thread.currentThread().interrupt();
+        }
+        if (logger.isDebugEnabled()) {
+          logger.debug("Because of IOException, failed to dispatch a batch with id : {}", this.processor.getBatchId());
+        }
+      }
+      else {
+        logger.fatal(LocalizedMessage.create(
+            LocalizedStrings.GatewayEventRemoteDispatcher_STOPPING_THE_PROCESSOR_BECAUSE_THE_FOLLOWING_EXCEPTION_OCCURRED_WHILE_PROCESSING_A_BATCH), ge);
+        this.processor.setIsStopped(true);
+      }
+    }
+    catch (CancelException e) {
+      if (logger.isDebugEnabled()) {
+        logger.debug("Stopping the processor because cancellation occurred while processing a batch");
+      }
+      this.processor.setIsStopped(true);
+      throw e;
+    } catch (Exception e) {
+      this.processor.setIsStopped(true);
+      logger.fatal(LocalizedMessage.create(
+              LocalizedStrings.GatewayEventRemoteDispatcher_STOPPING_THE_PROCESSOR_BECAUSE_THE_FOLLOWING_EXCEPTION_OCCURRED_WHILE_PROCESSING_A_BATCH),
+              e);
+    }
+    return success;
+  }
+
+  private boolean _dispatchBatch(List events, boolean isRetry) {
+    Exception ex = null;
+    int currentBatchId = this.processor.getBatchId();
+    connection = getConnection(true);
+    int batchIdForThisConnection = this.processor.getBatchId();
+    // This means we are writing to a new connection than the previous batch.
+    // i.e The connection has been reset. It also resets the batchId.
+    if (currentBatchId != batchIdForThisConnection
+        || this.processor.isConnectionReset()) {
+      return false;
+    }
+    try {
+      if (this.processor.isConnectionReset()) {
+        isRetry = true;
+      }
+      SenderProxy sp = new SenderProxy(this.sender.getProxy());
+      this.connectionLifeCycleLock.readLock().lock();
+      try {
+        if (connection != null) {
+          sp.dispatchBatch_NewWAN(connection, events, currentBatchId,
+              sender.isRemoveFromQueueOnException(), isRetry);
+          if (logger.isDebugEnabled()) {
+            logger.debug("{} : Dispatched batch (id={}) of {} events, queue size: {} on connection {}",
+                this.processor.getSender(), currentBatchId,  events.size(), this.processor.getQueue().size(), connection);
+          }
+        } else {
+          throw new ConnectionDestroyedException();
+        }
+      }
+      finally{
+        this.connectionLifeCycleLock.readLock().unlock();
+      }
+      return true;
+    }
+    catch (ServerOperationException e) {
+      Throwable t = e.getCause();
+      if (t instanceof BatchException70) {
+        // A BatchException has occurred.
+        // Do not process the connection as dead since it is not dead.
+        ex = (BatchException70)t;
+      }
+      else {
+        ex = e;
+        // keep using the connection if we had a batch exception. Else, destroy it
+        destroyConnection();
+      }
+      throw new GatewaySenderException(
+          LocalizedStrings.GatewayEventRemoteDispatcher_0_EXCEPTION_DURING_PROCESSING_BATCH_1_ON_CONNECTION_2.toLocalizedString(
+              new Object[] {this, Integer.valueOf(currentBatchId), connection}), ex);
+    }
+    catch (Exception e) {
+      // An Exception has occurred. Get its cause.
+      Throwable t = e.getCause();
+      if (t instanceof IOException) {
+        // An IOException has occurred.
+        ex = (IOException)t;
+      } else {
+        ex = e;
+      }
+      //the cause is not going to be BatchException70. So, destroy the connection
+      destroyConnection();
+      
+      throw new GatewaySenderException(
+          LocalizedStrings.GatewayEventRemoteDispatcher_0_EXCEPTION_DURING_PROCESSING_BATCH_1_ON_CONNECTION_2.toLocalizedString(
+              new Object[] {this, Integer.valueOf(currentBatchId), connection}), ex);
+    }
+  }
+  
+  /**
+   * Acquires or adds a new <code>Connection</code> to the corresponding
+   * <code>Gateway</code>
+   *
+   * @return the <code>Connection</code>
+   *
+   * @throws GatewaySenderException
+   * @throws InterruptedException 
+   */
+  public Connection getConnection(boolean startAckReaderThread) throws GatewaySenderException{
+    // IF the connection is null 
+    // OR the connection's ServerLocation doesn't match with the one stored in sender
+    // THEN initialize the connection
+    if(!this.sender.isParallel()) {
+      if (this.connection == null || this.connection.isDestroyed()
+          || !this.connection.getServer().equals(this.sender.getServerLocation())) {
+        if (logger.isDebugEnabled()) {
+          logger.debug("Initializing new connection as serverLocation of old connection is : {} and the serverLocation to connect is {}",
+              ((this.connection == null) ? "null" : this.connection.getServer()),
+              this.sender.getServerLocation());
+        }
+        // Initialize the connection
+        initializeConnection();
+      }
+    } else {
+      if (this.connection == null || this.connection.isDestroyed()) {
+        initializeConnection();
+      }
+    }
+    
+    // Here we might wait on a connection to another server if I was secondary
+    // so don't start waiting until I am primary
+    Cache cache = this.sender.getCache();
+    if (cache != null && !cache.isClosed()) {
+      if (this.sender.isPrimary() && (this.connection != null)) {
+        if (this.ackReaderThread == null || !this.ackReaderThread.isRunning()) {
+          this.ackReaderThread = new AckReaderThread(this.sender);
+          this.ackReaderThread.start();
+          this.ackReaderThread.waitForRunningAckReaderThreadRunningState();
+        }
+      }
+    }
+    return this.connection;
+  }
+  
+  public void destroyConnection() {
+    this.connectionLifeCycleLock.writeLock().lock();
+    try {
+      Connection con = this.connection;
+      if (con != null) {
+        if (!con.isDestroyed()) {
+          con.destroy();
+         this.sender.getProxy().returnConnection(con);
+        }
+        
+        // Reset the connection so the next time through a new one will be
+        // obtained
+        this.connection = null;
+        this.sender.setServerLocation(null);
+      }
+    }
+    finally {
+      this.connectionLifeCycleLock.writeLock().unlock();
+    }
+  }
+
+  /**
+   * Initializes the <code>Connection</code>.
+   *
+   * @throws GatewaySenderException
+   */
+  private void initializeConnection() throws GatewaySenderException,
+      GemFireSecurityException {
+    this.connectionLifeCycleLock.writeLock().lock(); 
+    try {
+      // Attempt to acquire a connection
+      if (this.sender.getProxy() == null
+          || this.sender.getProxy().isDestroyed()) {
+        this.sender.initProxy();
+      } else {
+        this.processor.resetBatchId();
+      }
+      Connection con;
+      try {
+        if (this.sender.isParallel()) {
+          con = this.sender.getProxy().acquireConnection();
+          // For parallel sender, setting server location will not matter.
+          // everytime it will ask for acquire connection whenever it needs it. I
+          // am saving this server location for command purpose
+          sender.setServerLocation(con.getServer());  
+        } else {
+          synchronized (this.sender
+              .getLockForConcurrentDispatcher()) {
+            if (this.sender.getServerLocation() != null) {
+              if (logger.isDebugEnabled()) {
+                logger.debug("ServerLocation is: {}. Connecting to this serverLocation...", sender.getServerLocation());
+              }
+              con = this.sender.getProxy().acquireConnection(
+                  this.sender.getServerLocation());
+            } else {
+              if (logger.isDebugEnabled()) {
+                logger.debug("ServerLocation is null. Creating new connection. ");
+              }
+              con = this.sender.getProxy().acquireConnection();
+              // Acquired connection from pool!! Update the server location
+              // information in the sender and
+              // distribute the information to other senders ONLY IF THIS SENDER
+              // IS
+              // PRIMARY
+              if (this.sender.isPrimary()) {
+                if (sender.getServerLocation() == null) {
+                  sender.setServerLocation(con.getServer());
+                }
+                new UpdateAttributesProcessor(this.sender).distribute(false);
+              }
+            }
+          }
+        }
+      } catch (ServerConnectivityException e) {
+        this.failedConnectCount++;
+        Throwable ex = null;
+
+        if (e.getCause() instanceof GemFireSecurityException) {
+          ex = e.getCause();
+          if (logConnectionFailure()) {
+            // only log this message once; another msg is logged once we connect
+            logger.warn(LocalizedMessage.create(LocalizedStrings.GatewayEventRemoteDispatcher_0_COULD_NOT_CONNECT_1,
+                new Object[] { this.processor.getSender().getId(), ex.getMessage() }));
+          }
+          throw new GatewaySenderException(ex);
+        }
+        List<ServerLocation> servers = this.sender.getProxy()
+            .getCurrentServers();
+        String ioMsg = null;
+        if (servers.size() == 0) {
+          ioMsg = LocalizedStrings.GatewayEventRemoteDispatcher_THERE_ARE_NO_ACTIVE_SERVERS
+              .toLocalizedString();
+        } else {
+          final StringBuilder buffer = new StringBuilder();
+          for (ServerLocation server : servers) {
+            String endpointName = String.valueOf(server);
+            if (buffer.length() > 0) {
+              buffer.append(", ");
+            }
+            buffer.append(endpointName);
+          }
+          ioMsg = LocalizedStrings.GatewayEventRemoteDispatcher_NO_AVAILABLE_CONNECTION_WAS_FOUND_BUT_THE_FOLLOWING_ACTIVE_SERVERS_EXIST_0
+              .toLocalizedString(buffer.toString());
+        }
+        ex = new IOException(ioMsg);
+        // Set the serverLocation to null so that a new connection can be
+        // obtained in next attempt
+        this.sender.setServerLocation(null);
+        if (this.failedConnectCount == 1) {
+          // only log this message once; another msg is logged once we connect
+          logger.warn(LocalizedMessage.create(LocalizedStrings.GatewayEventRemoteDispatcher__0___COULD_NOT_CONNECT,
+                  this.processor.getSender().getId()));
+
+        }
+        // Wrap the IOException in a GatewayException so it can be processed the
+        // same as the other exceptions that might occur in sendBatch.
+        throw new GatewaySenderException(
+            LocalizedStrings.GatewayEventRemoteDispatcher__0___COULD_NOT_CONNECT
+                .toLocalizedString(this.processor.getSender().getId()), ex);
+      }
+      if (this.failedConnectCount > 0) {
+        Object[] logArgs = new Object[] { this.processor.getSender().getId(),
+            con, Integer.valueOf(this.failedConnectCount) };
+        logger.info(LocalizedMessage.create(LocalizedStrings.GatewayEventRemoteDispatcher_0_USING_1_AFTER_2_FAILED_CONNECT_ATTEMPTS,
+                logArgs));
+        this.failedConnectCount = 0;
+      } else {
+        Object[] logArgs = new Object[] { this.processor.getSender().getId(),
+            con };
+        logger.info(LocalizedMessage.create(LocalizedStrings.GatewayEventRemoteDispatcher_0_USING_1, logArgs));
+      }
+      this.connection = con;
+      this.processor.checkIfPdxNeedsResend(this.connection.getQueueStatus().getPdxSize());
+    }
+    catch (ConnectionDestroyedException e) {
+      throw new GatewaySenderException(
+          LocalizedStrings.GatewayEventRemoteDispatcher__0___COULD_NOT_CONNECT.toLocalizedString(this.processor
+              .getSender().getId()), e);
+    }
+    finally {
+      this.connectionLifeCycleLock.writeLock().unlock();
+    }
+  }
+
+  protected boolean logConnectionFailure() {
+    // always log the first failure
+	if (logger.isDebugEnabled() || this.failedConnectCount == 0) {
+	  return true;
+	}
+	else {
+	  // subsequent failures will be logged on 30th, 300th, 3000th try
+	  // each try is at 100millis from higher layer so this accounts for logging
+	  // after 3s, 30s and then every 5mins
+	  if (this.failedConnectCount >= 3000) {
+	    return (this.failedConnectCount % 3000) == 0;
+	  }
+	  else {
+	    return (this.failedConnectCount == 30 || this.failedConnectCount == 300);
+	  }
+    }
+  }
+  
+  public static class GatewayAck {
+    private int batchId;
+
+    private int numEvents;
+
+    private BatchException70 be;
+
+    public GatewayAck(BatchException70 be, int bId) {
+      this.be = be;
+      this.batchId = bId;
+    }
+
+    public GatewayAck(int batchId, int numEvents) {
+      this.batchId = batchId;
+      this.numEvents = numEvents;
+    }
+
+    /**
+     * @return the numEvents
+     */
+    public int getNumEvents() {
+      return numEvents;
+    }
+
+    /**
+     * @return the batchId
+     */
+    public int getBatchId() {
+      return batchId;
+    }
+
+    public BatchException70 getBatchException() {
+      return this.be;
+    }
+  }
+    
+  class AckReaderThread extends Thread {
+
+    private Object runningStateLock = new Object();
+
+    /**
+     * boolean to make a shutdown request
+     */
+    private volatile boolean shutdown = false;
+
+    private final GemFireCacheImpl cache;
+
+    private volatile boolean ackReaderThreadRunning = false;
+
+    public AckReaderThread(GatewaySender sender) {
+      super("AckReaderThread for : " + sender.getId());
+      this.setDaemon(true);
+      this.cache = (GemFireCacheImpl)((AbstractGatewaySender)sender).getCache();
+    }
+
+    public void waitForRunningAckReaderThreadRunningState() {
+      synchronized (runningStateLock) {
+        while (!this.ackReaderThreadRunning) {
+          try {
+            this.runningStateLock.wait();
+          } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
+            break;
+          }
+        }
+      }
+    }
+
+    private boolean checkCancelled() {
+      if (shutdown) {
+        return true;
+      }
+
+      if (cache.getCancelCriterion().cancelInProgress() != null) {
+        return true;
+      }
+      return false;
+    }
+
+    @Override
+    public void run() {
+      int lastBatchIdRead = -1;
+      if (logger.isDebugEnabled()) {
+        logger.debug("AckReaderThread started.. ");
+      }
+
+      synchronized (runningStateLock) {
+        ackReaderThreadRunning = true;
+        this.runningStateLock.notifyAll();
+      }
+
+      try {
+        for (;;) {
+          if (checkCancelled()) {
+            break;
+          }
+          GatewayAck ack = readAcknowledgement(lastBatchIdRead);
+          if (ack != null) {
+            boolean gotBatchException = ack.getBatchException() != null;
+            int batchId = ack.getBatchId();
+            lastBatchIdRead = batchId;
+            int numEvents = ack.getNumEvents();
+
+            // If the batch is successfully processed, remove it from the
+            // queue.
+            if (gotBatchException) {
+              logger.info(LocalizedMessage.create(
+                  LocalizedStrings.GatewaySenderEventRemoteDispatcher_GATEWAY_SENDER_0_RECEIVED_ACK_FOR_BATCH_ID_1_WITH_EXCEPTION,
+                      new Object[] { processor.getSender(), ack.getBatchId() }, ack.getBatchException()));
+              // If we get PDX related exception in the batch exception then try
+              // to resend all the pdx events as well in the next batch.
+              final GatewaySenderStats statistics = sender.getStatistics();
+              statistics.incBatchesRedistributed();
+              // log batch exceptions and remove all the events if remove from
+              // exception is true
+              // do not remove if it is false
+              if (sender.isRemoveFromQueueOnException()) {
+                // log the batchExceptions
+                logBatchExceptions(ack.getBatchException());
+                  processor.handleSuccessBatchAck(batchId);
+              } else {
+                // we assume that batch exception will not occur for PDX related
+                // events
+                List<GatewaySenderEventImpl> pdxEvents = processor
+                    .getBatchIdToPDXEventsMap().get(
+                        ack.getBatchException().getBatchId());
+                if (pdxEvents != null) {
+                  for (GatewaySenderEventImpl senderEvent : pdxEvents) {
+                    senderEvent.isAcked = true;
+                  }
+                }
+                // log the batchExceptions
+                logBatchExceptions(ack.getBatchException());
+                // remove the events that have been processed.
+                BatchException70 be = ack.getBatchException();
+                List<BatchException70> exceptions = be.getExceptions();
+
+                for (int i = 0; i < exceptions.get(0).getIndex(); i++) {
+                  processor.eventQueueRemove();
+                }
+                // reset the sender
+                processor.handleException();
+              }
+            } // unsuccessful batch
+            else { // The batch was successful.
+              if (logger.isDebugEnabled()) {
+                logger.debug("Gateway Sender {} : Received ack for batch id {} of {} events",
+                    processor.getSender(), ack.getBatchId(), ack.getNumEvents());
+              }
+              processor.handleSuccessBatchAck(batchId);
+            }
+          } else {
+            // If we have received IOException.
+            if (logger.isDebugEnabled()) {
+              logger.debug("{}: Received null ack from remote site.", processor.getSender());
+            }
+            processor.handleException();
+            try { // This wait is before trying to getting new connection to
+                  // receive ack. Without this there will be continuous call to
+                  // getConnection
+              Thread.sleep(GatewaySender.CONNECTION_RETRY_INTERVAL);
+            } catch (InterruptedException e) {
+              Thread.currentThread().interrupt();
+            }
+          }
+        }
+      } catch (Exception e) {
+        if (!checkCancelled()) {
+          logger.fatal(LocalizedMessage.create(
+              LocalizedStrings.GatewayEventRemoteDispatcher_STOPPING_THE_PROCESSOR_BECAUSE_THE_FOLLOWING_EXCEPTION_OCCURRED_WHILE_PROCESSING_A_BATCH) ,e);
+        }
+        sender.lifeCycleLock.writeLock().lock();
+        try {
+          processor.stopProcessing();
+          sender.clearTempEventsAfterSenderStopped();
+        } finally {
+          sender.lifeCycleLock.writeLock().unlock();
+        }
+        // destroyConnection();
+      } finally {
+        if (logger.isDebugEnabled()) {
+          logger.debug("AckReaderThread exiting. ");
+        }
+        ackReaderThreadRunning = false;
+      }
+
+    }
+
+    /**
+     * @param exception 
+     * 
+     */
+    private void logBatchExceptions(BatchException70 exception) {
+      for (BatchException70 be : exception.getExceptions()) {
+        boolean logWarning = true;
+        if (be.getCause() instanceof RegionDestroyedException) {
+          RegionDestroyedException rde = (RegionDestroyedException)be
+              .getCause();
+          synchronized (notFoundRegionsSync) {
+            if (notFoundRegions.contains(rde.getRegionFullPath())) {
+              logWarning = false;
+            } else {
+              notFoundRegions.add(rde.getRegionFullPath());
+            }
+          }
+        } else if (be.getCause() instanceof IllegalStateException
+            && be.getCause().getMessage().contains("Unknown pdx type")) {
+          List<GatewaySenderEventImpl> pdxEvents = processor
+              .getBatchIdToPDXEventsMap().get(be.getBatchId());
+          if (logWarning) {
+            logger.warn(LocalizedMessage.create(LocalizedStrings.GatewayEventRemoteDispatcher_A_BATCHEXCEPTION_OCCURRED_PROCESSING_PDX_EVENT__0,
+                    be.getIndex()), be);
+          }
+          if (pdxEvents != null) {
+            for (GatewaySenderEventImpl senderEvent : pdxEvents) {
+              senderEvent.isAcked = false;
+            }
+            GatewaySenderEventImpl gsEvent = pdxEvents.get(be.getIndex());
+            if (logWarning) {
+              logger.warn(LocalizedMessage.create(
+                  LocalizedStrings.GatewayEventRemoteDispatcher_THE_EVENT_BEING_PROCESSED_WHEN_THE_BATCHEXCEPTION_OCCURRED_WAS__0, gsEvent));
+            }
+          }
+          continue;
+        }
+        if (logWarning) {
+          logger.warn(LocalizedMessage.create(LocalizedStrings.GatewayEventRemoteDispatcher_A_BATCHEXCEPTION_OCCURRED_PROCESSING_EVENT__0,
+              be.getIndex()), be);
+        }
+        List<GatewaySenderEventImpl>[] eventsArr = processor.getBatchIdToEventsMap().get(be.getBatchId()); 
+        if (eventsArr != null) {
+          List<GatewaySenderEventImpl> filteredEvents = eventsArr[1];
+          GatewaySenderEventImpl gsEvent = (GatewaySenderEventImpl)filteredEvents
+              .get(be.getIndex());
+          if (logWarning) {
+            logger.warn(LocalizedMessage.create(
+                LocalizedStrings.GatewayEventRemoteDispatcher_THE_EVENT_BEING_PROCESSED_WHEN_THE_BATCHEXCEPTION_OCCURRED_WAS__0, gsEvent));
+          }
+        }
+      }
+    }
+
+    boolean isRunning() {
+      return this.ackReaderThreadRunning;
+    }
+
+    public void shutdown() {
+      // we need to destroy connection irrespective of we are listening on it or
+      // not. No need to take lock as the reader thread may be blocked and we might not
+      // get chance to destroy unless that returns.
+      if (connection != null) {
+        if (!connection.isDestroyed()) {
+          connection.destroy();
+          sender.getProxy().returnConnection(connection);
+        }
+      }
+      this.shutdown = true;
+      boolean interrupted = Thread.interrupted();
+      try {
+        this.join(15 * 1000);
+      } catch (InterruptedException e) {
+        interrupted = true;
+      } finally {
+        if (interrupted) {
+          Thread.currentThread().interrupt();
+        }
+      }
+      if (this.isAlive()) {
+        logger.warn(LocalizedMessage.create(LocalizedStrings.GatewaySender_ACKREADERTHREAD_IGNORED_CANCELLATION));
+      }
+    }
+  }
+    
+  public void stopAckReaderThread() {
+    if (this.ackReaderThread != null) {
+      this.ackReaderThread.shutdown();
+    }    
+  }
+  
+  @Override
+  public boolean isRemoteDispatcher() {
+    return true;
+  }
+
+  @Override
+  public boolean isConnectedToRemote() {
+      return connection != null;
+  }
+  
+  public void stop() {
+    stopAckReaderThread();
+    if(this.processor.isStopped()) {
+      destroyConnection();
+    }
+  }
+}
+

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderFactoryImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderFactoryImpl.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderFactoryImpl.java
new file mode 100644
index 0000000..33128c8
--- /dev/null
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderFactoryImpl.java
@@ -0,0 +1,381 @@
+/*
+ * =========================================================================
+ * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved. 
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ * ========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.wan;
+
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import org.apache.logging.log4j.Logger;
+
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener;
+import com.gemstone.gemfire.cache.client.internal.LocatorDiscoveryCallback;
+import com.gemstone.gemfire.cache.wan.GatewayEventFilter;
+import com.gemstone.gemfire.cache.wan.GatewayEventSubstitutionFilter;
+import com.gemstone.gemfire.cache.wan.GatewaySender;
+import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
+import com.gemstone.gemfire.cache.wan.GatewaySenderFactory;
+import com.gemstone.gemfire.cache.wan.GatewayTransportFilter;
+import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelGatewaySenderImpl;
+import com.gemstone.gemfire.internal.cache.wan.serial.SerialGatewaySenderImpl;
+import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation;
+import com.gemstone.gemfire.internal.cache.xmlcache.ParallelGatewaySenderCreation;
+import com.gemstone.gemfire.internal.cache.xmlcache.SerialGatewaySenderCreation;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.internal.logging.LogService;
+import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
+
+/**
+ * @author Suranjan Kumar
+ * @author Yogesh Mahajan
+ * @author Kishor Bachhav
+ * 
+ * @since 7.0
+ * 
+ */
+public class GatewaySenderFactoryImpl implements
+    InternalGatewaySenderFactory {
+
+  private static final Logger logger = LogService.getLogger();
+  
+  /**
+   * Used internally to pass the attributes from this factory to the real
+   * GatewaySender it is creating.
+   */
+  private GatewaySenderAttributes attrs = new GatewaySenderAttributes();
+
+  private Cache cache;
+
+  private static final AtomicBoolean GATEWAY_CONNECTION_READ_TIMEOUT_PROPERTY_CHECKED = new AtomicBoolean(false);
+
+  public GatewaySenderFactoryImpl(Cache cache) {
+    this.cache = cache;
+  }
+
+  public GatewaySenderFactory setParallel(boolean isParallel){
+    this.attrs.isParallel = isParallel;
+    return this;
+  }
+  
+  public GatewaySenderFactory setForInternalUse(boolean isForInternalUse) {
+    this.attrs.isForInternalUse = isForInternalUse;
+    return this;
+  }
+  
+  public GatewaySenderFactory addGatewayEventFilter(
+      GatewayEventFilter filter) {
+    this.attrs.addGatewayEventFilter(filter);
+    return this;
+  }
+
+  public GatewaySenderFactory addGatewayTransportFilter(
+      GatewayTransportFilter filter) {
+    this.attrs.addGatewayTransportFilter(filter);
+    return this;
+  }
+
+  public GatewaySenderFactory addAsyncEventListener(
+      AsyncEventListener listener) {
+    this.attrs.addAsyncEventListener(listener);
+    return this;
+  }
+  
+  public GatewaySenderFactory setSocketBufferSize(int socketBufferSize) {
+    this.attrs.socketBufferSize = socketBufferSize;
+    return this;
+  }
+
+  public GatewaySenderFactory setSocketReadTimeout(int socketReadTimeout) {
+    this.attrs.socketReadTimeout = socketReadTimeout;
+    return this;
+  }
+
+  public GatewaySenderFactory setDiskStoreName(String diskStoreName) {
+    this.attrs.diskStoreName = diskStoreName;
+    return this;
+  }
+
+  public GatewaySenderFactory setMaximumQueueMemory(int maximumQueueMemory) {
+    this.attrs.maximumQueueMemory = maximumQueueMemory;
+    return this;
+  }
+
+  public GatewaySenderFactory setBatchSize(int batchSize) {
+    this.attrs.batchSize = batchSize;
+    return this;
+  }
+
+  public GatewaySenderFactory setBatchTimeInterval(int batchTimeInterval) {
+    this.attrs.batchTimeInterval = batchTimeInterval;
+    return this;
+  }
+
+  public GatewaySenderFactory setBatchConflationEnabled(
+      boolean enableBatchConflation) {
+    this.attrs.isBatchConflationEnabled = enableBatchConflation;
+    return this;
+  }
+
+  public GatewaySenderFactory setPersistenceEnabled(
+      boolean enablePersistence) {
+    this.attrs.isPersistenceEnabled = enablePersistence;
+    return this;
+  }
+
+  public GatewaySenderFactory setAlertThreshold(int threshold) {
+    this.attrs.alertThreshold = threshold;
+    return this;
+  }
+
+  public GatewaySenderFactory setManualStart(boolean start) {
+    this.attrs.manualStart = start;
+    return this;
+  }
+
+  public GatewaySenderFactory setLocatorDiscoveryCallback(
+      LocatorDiscoveryCallback locCallback) {
+    this.attrs.locatorDiscoveryCallback = locCallback;
+    return this;
+  }
+
+  @Override
+  public GatewaySenderFactory setDiskSynchronous(boolean isSynchronous) {
+    this.attrs.isDiskSynchronous = isSynchronous;
+    return this;
+  }
+  
+  @Override
+  public GatewaySenderFactory setDispatcherThreads(int numThreads) {
+    if ((numThreads > 1) && this.attrs.policy == null) {
+      this.attrs.policy = GatewaySender.DEFAULT_ORDER_POLICY;
+    }
+    this.attrs.dispatcherThreads = numThreads;
+    return this;
+  }
+
+  public GatewaySenderFactory setParallelFactorForReplicatedRegion(int parallel) {
+    this.attrs.parallelism = parallel;
+    this.attrs.policy = GatewaySender.DEFAULT_ORDER_POLICY;
+    return this;
+  }    
+    
+  @Override
+  public GatewaySenderFactory setOrderPolicy(OrderPolicy policy) {
+    this.attrs.policy = policy;
+    return this;
+  }
+  
+  public GatewaySenderFactory setBucketSorted(boolean isBucketSorted){
+    this.attrs.isBucketSorted = isBucketSorted;
+    return this;
+  }
+  public GatewaySenderFactory setIsHDFSQueue(boolean isHDFSQueue){
+    this.attrs.isHDFSQueue = isHDFSQueue;
+    return this;
+  }
+  public GatewaySender create(String id, int remoteDSId) {
+    int myDSId = InternalDistributedSystem.getAnyInstance()
+        .getDistributionManager().getDistributedSystemId();
+    if (remoteDSId == myDSId) {
+      throw new GatewaySenderException(
+          LocalizedStrings.GatewaySenderImpl_GATEWAY_0_CANNOT_BE_CREATED_WITH_REMOTE_SITE_ID_EQUAL_TO_THIS_SITE_ID
+              .toLocalizedString(id));
+    }
+    if (remoteDSId < 0) {
+      throw new GatewaySenderException(
+          LocalizedStrings.GatewaySenderImpl_GATEWAY_0_CANNOT_BE_CREATED_WITH_REMOTE_SITE_ID_LESS_THAN_ZERO
+              .toLocalizedString(id));
+    }
+    this.attrs.id = id;
+    this.attrs.remoteDs = remoteDSId;
+    GatewaySender sender = null;
+
+    if(this.attrs.getDispatcherThreads() <= 0){
+      throw new GatewaySenderException(
+          LocalizedStrings.GatewaySenderImpl_GATEWAY_SENDER_0_CANNOT_HAVE_DISPATCHER_THREADS_LESS_THAN_1
+              .toLocalizedString(id));
+    }
+
+    // Verify socket read timeout if a proper logger is available
+    if (this.cache instanceof GemFireCacheImpl) {
+      // If socket read timeout is less than the minimum, log a warning.
+      // Ideally, this should throw a GatewaySenderException, but wan dunit tests
+      // were failing, and we were running out of time to change them.
+      if (this.attrs.getSocketReadTimeout() != 0
+          && this.attrs.getSocketReadTimeout() < GatewaySender.MINIMUM_SOCKET_READ_TIMEOUT) {
+        logger.warn(LocalizedMessage.create(LocalizedStrings.Gateway_CONFIGURED_SOCKET_READ_TIMEOUT_TOO_LOW,
+            new Object[] { "GatewaySender " + id, this.attrs.getSocketReadTimeout(), GatewaySender.MINIMUM_SOCKET_READ_TIMEOUT }));
+        this.attrs.socketReadTimeout = GatewaySender.MINIMUM_SOCKET_READ_TIMEOUT;
+      }
+
+      // Log a warning if the old system property is set.
+      if (GATEWAY_CONNECTION_READ_TIMEOUT_PROPERTY_CHECKED.compareAndSet(false, true)) {
+        if (System.getProperty(GatewaySender.GATEWAY_CONNECTION_READ_TIMEOUT_PROPERTY) != null) {
+          logger.warn(LocalizedMessage.create(LocalizedStrings.Gateway_OBSOLETE_SYSTEM_POPERTY,
+              new Object[] { GatewaySender.GATEWAY_CONNECTION_READ_TIMEOUT_PROPERTY, "GatewaySender socket read timeout" }));
+        }
+      }
+    }
+
+    if (this.attrs.isParallel()) {
+//      if(this.attrs.getDispatcherThreads() != 1){
+//        throw new GatewaySenderException(
+//            LocalizedStrings.GatewaySenderImpl_PARALLEL_GATEWAY_SENDER_0_CANNOT_BE_CREATED_WITH_DISPATHER_THREADS_OTHER_THAN_1
+//                .toLocalizedString(id));
+//      }
+      if ((this.attrs.getOrderPolicy() != null)
+          && this.attrs.getOrderPolicy().equals(OrderPolicy.THREAD)) {
+        throw new GatewaySenderException(
+            LocalizedStrings.GatewaySenderImpl_PARALLEL_GATEWAY_SENDER_0_CANNOT_BE_CREATED_WITH_ORDER_POLICY_1
+                .toLocalizedString(id, this.attrs.getOrderPolicy()));
+      }
+      if (this.cache instanceof GemFireCacheImpl) {
+        sender = new ParallelGatewaySenderImpl(this.cache, this.attrs);
+        ((GemFireCacheImpl)this.cache).addGatewaySender(sender);
+        
+        if (!this.attrs.isManualStart()) {
+          sender.start();
+        }
+      }
+      else if (this.cache instanceof CacheCreation) {
+        sender = new ParallelGatewaySenderCreation(this.cache, this.attrs);
+        ((CacheCreation)this.cache).addGatewaySender(sender);
+      }
+    }
+    else {
+      if (this.attrs.getAsyncEventListeners().size() > 0) {
+        throw new GatewaySenderException(
+            LocalizedStrings.SerialGatewaySenderImpl_GATEWAY_0_CANNOT_DEFINE_A_REMOTE_SITE_BECAUSE_AT_LEAST_ONE_LISTENER_IS_ALREADY_ADDED
+                .toLocalizedString(id));
+      }
+//      if (this.attrs.getOrderPolicy() != null) {
+//        if (this.attrs.getDispatcherThreads() == GatewaySender.DEFAULT_DISPATCHER_THREADS) {
+//          throw new GatewaySenderException(
+//              LocalizedStrings.SerialGatewaySender_INVALID_GATEWAY_SENDER_ORDER_POLICY_CONCURRENCY_0
+//                  .toLocalizedString(id));
+//        }
+//      }
+      if (this.attrs.getOrderPolicy() == null && this.attrs.getDispatcherThreads() > 1) {
+        this.attrs.policy = GatewaySender.DEFAULT_ORDER_POLICY;
+      }
+      if (this.cache instanceof GemFireCacheImpl) {
+        sender = new SerialGatewaySenderImpl(this.cache, this.attrs);
+        ((GemFireCacheImpl)this.cache).addGatewaySender(sender);
+
+        if (!this.attrs.isManualStart()) {
+          sender.start();
+        }
+      }
+      else if (this.cache instanceof CacheCreation) {
+        sender = new SerialGatewaySenderCreation(this.cache, this.attrs);
+        ((CacheCreation)this.cache).addGatewaySender(sender);
+      }
+    }
+    return sender;
+  }
+
+  public GatewaySender create(String id) {
+    this.attrs.id = id;
+    GatewaySender sender = null;
+
+    if(this.attrs.getDispatcherThreads() <= 0) {
+      throw new AsyncEventQueueConfigurationException(
+          LocalizedStrings.AsyncEventQueue_0_CANNOT_HAVE_DISPATCHER_THREADS_LESS_THAN_1
+              .toLocalizedString(id));
+    }
+    
+    if (this.attrs.isParallel()) {
+      if ((this.attrs.getOrderPolicy() != null)
+          && this.attrs.getOrderPolicy().equals(OrderPolicy.THREAD)) {
+        throw new AsyncEventQueueConfigurationException(
+            LocalizedStrings.AsyncEventQueue_0_CANNOT_BE_CREATED_WITH_ORDER_POLICY_1
+                .toLocalizedString(id, this.attrs.getOrderPolicy()));
+      }
+      
+      if (this.cache instanceof GemFireCacheImpl) {
+        sender = new ParallelGatewaySenderImpl(this.cache, this.attrs);
+        ((GemFireCacheImpl)this.cache).addGatewaySender(sender);
+        if (!this.attrs.isManualStart()) {
+          sender.start();
+        }
+      }
+      else if (this.cache instanceof CacheCreation) {
+        sender = new ParallelGatewaySenderCreation(this.cache, this.attrs);
+        ((CacheCreation)this.cache).addGatewaySender(sender);
+      }
+    }
+    else {
+//      if (this.attrs.getOrderPolicy() != null) {
+//        if (this.attrs.getDispatcherThreads() == GatewaySender.DEFAULT_DISPATCHER_THREADS) {
+//          throw new AsyncEventQueueConfigurationException(
+//              LocalizedStrings.AsyncEventQueue_INVALID_ORDER_POLICY_CONCURRENCY_0
+//                  .toLocalizedString(id));
+//        }
+//      }
+      if (this.attrs.getOrderPolicy() == null && this.attrs.getDispatcherThreads() > 1) {
+         this.attrs.policy = GatewaySender.DEFAULT_ORDER_POLICY;
+      }
+      if (this.cache instanceof GemFireCacheImpl) {
+        sender = new SerialGatewaySenderImpl(this.cache, this.attrs);
+        ((GemFireCacheImpl)this.cache).addGatewaySender(sender);
+        if (!this.attrs.isManualStart()) {
+          sender.start();
+        }
+      }
+      else if (this.cache instanceof CacheCreation) {
+        sender = new SerialGatewaySenderCreation(this.cache, this.attrs);
+        ((CacheCreation)this.cache).addGatewaySender(sender);
+      }
+    }
+    return sender;
+  }
+  
+  public GatewaySenderFactory removeGatewayEventFilter(
+      GatewayEventFilter filter) {
+    this.attrs.eventFilters.remove(filter);
+    return this;
+  }
+
+  public GatewaySenderFactory removeGatewayTransportFilter(
+      GatewayTransportFilter filter) {
+    this.attrs.transFilters.remove(filter);
+    return this;
+  } 
+  
+  public GatewaySenderFactory setGatewayEventSubstitutionFilter(
+      GatewayEventSubstitutionFilter filter) {
+    this.attrs.eventSubstitutionFilter = filter;
+    return this;
+  }
+
+  public void configureGatewaySender(GatewaySender senderCreation) {
+    this.attrs.isParallel = senderCreation.isParallel();
+    this.attrs.manualStart = senderCreation.isManualStart();
+    this.attrs.socketBufferSize = senderCreation.getSocketBufferSize();
+    this.attrs.socketReadTimeout = senderCreation.getSocketReadTimeout();
+    this.attrs.isBatchConflationEnabled = senderCreation.isBatchConflationEnabled();
+    this.attrs.batchSize = senderCreation.getBatchSize();
+    this.attrs.batchTimeInterval = senderCreation.getBatchTimeInterval();
+    this.attrs.isPersistenceEnabled = senderCreation.isPersistenceEnabled();
+    this.attrs.diskStoreName = senderCreation.getDiskStoreName();
+    this.attrs.isDiskSynchronous = senderCreation.isDiskSynchronous();
+    this.attrs.maximumQueueMemory = senderCreation.getMaximumQueueMemory();
+    this.attrs.alertThreshold = senderCreation.getAlertThreshold();
+    this.attrs.dispatcherThreads = senderCreation.getDispatcherThreads();
+    this.attrs.policy = senderCreation.getOrderPolicy();
+    for(GatewayEventFilter filter : senderCreation.getGatewayEventFilters()){
+      this.attrs.eventFilters.add(filter);
+    }
+    for(GatewayTransportFilter filter : senderCreation.getGatewayTransportFilters()){
+      this.attrs.transFilters.add(filter);
+    }
+    this.attrs.eventSubstitutionFilter = senderCreation.getGatewayEventSubstitutionFilter();
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
new file mode 100644
index 0000000..74501fb
--- /dev/null
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderImpl.java
@@ -0,0 +1,261 @@
+/*
+ * =========================================================================
+ * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved. 
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ * ========================================================================
+ * 
+ */
+
+package com.gemstone.gemfire.internal.cache.wan.parallel;
+import org.apache.logging.log4j.Logger;
+
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.EntryOperation;
+import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener;
+import com.gemstone.gemfire.cache.asyncqueue.internal.AsyncEventQueueImpl;
+import com.gemstone.gemfire.cache.asyncqueue.internal.AsyncEventQueueStats;
+import com.gemstone.gemfire.cache.wan.GatewaySender;
+import com.gemstone.gemfire.cache.wan.GatewayTransportFilter;
+import com.gemstone.gemfire.distributed.internal.DistributionAdvisor.Profile;
+import com.gemstone.gemfire.distributed.internal.DistributionAdvisor;
+import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.distributed.internal.ResourceEvent;
+import com.gemstone.gemfire.internal.cache.DistributedRegion;
+import com.gemstone.gemfire.internal.cache.EntryEventImpl;
+import com.gemstone.gemfire.internal.cache.EventID;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.cache.PartitionedRegionHelper;
+import com.gemstone.gemfire.internal.cache.UpdateAttributesProcessor;
+import com.gemstone.gemfire.internal.cache.ha.ThreadIdentifier;
+import com.gemstone.gemfire.internal.cache.wan.AbstractRemoteGatewaySender;
+import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySenderEventProcessor;
+import com.gemstone.gemfire.internal.cache.wan.GatewaySenderAdvisor;
+import com.gemstone.gemfire.internal.cache.wan.GatewaySenderStats;
+import com.gemstone.gemfire.internal.cache.wan.GatewaySenderAdvisor.GatewaySenderProfile;
+import com.gemstone.gemfire.internal.cache.wan.GatewaySenderAttributes;
+import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.internal.logging.LogService;
+import com.gemstone.gemfire.internal.logging.LoggingThreadGroup;
+import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
+
+/**
+ * @author Suranjan Kumar
+ * @author Yogesh Mahajan
+ * @since 7.0
+ *
+ */
+public class ParallelGatewaySenderImpl extends AbstractRemoteGatewaySender {
+  
+  private static final Logger logger = LogService.getLogger();
+  
+  final ThreadGroup loggerGroup = LoggingThreadGroup.createThreadGroup(
+      "Remote Site Discovery Logger Group", logger);
+  
+  public ParallelGatewaySenderImpl(){
+    super();
+    this.isParallel = true;
+  }
+  
+  public ParallelGatewaySenderImpl(Cache cache, GatewaySenderAttributes attrs) {
+    super(cache, attrs);
+  }
+  
+  @Override
+  public void start() {
+    this.lifeCycleLock.writeLock().lock(); 
+    try {
+      if (isRunning()) {
+        logger.warn(LocalizedMessage.create(LocalizedStrings.GatewaySender_SENDER_0_IS_ALREADY_RUNNING, this.getId()));
+        return;
+      }
+
+      if (this.remoteDSId != DEFAULT_DISTRIBUTED_SYSTEM_ID) {
+        String locators = ((GemFireCacheImpl)this.cache).getDistributedSystem()
+            .getConfig().getLocators();
+        if (locators.length() == 0) {
+          throw new IllegalStateException(
+              LocalizedStrings.AbstractGatewaySender_LOCATOR_SHOULD_BE_CONFIGURED_BEFORE_STARTING_GATEWAY_SENDER
+                  .toLocalizedString());
+        }
+      }
+      /*
+       * Now onwards all processing will happen through "ConcurrentParallelGatewaySenderEventProcessor"
+       * we have made "ParallelGatewaySenderEventProcessor" and "ParallelGatewaySenderQueue" as a
+       * utility classes of Concurrent version of processor and queue.
+       */
+      eventProcessor = new RemoteConcurrentParallelGatewaySenderEventProcessor(this);
+      /*if (getDispatcherThreads() > 1) {
+        eventProcessor = new ConcurrentParallelGatewaySenderEventProcessor(this);
+      } else {
+        eventProcessor = new ParallelGatewaySenderEventProcessor(this);
+      }*/
+      
+      eventProcessor.start();
+      waitForRunningStatus();
+      //Only notify the type registry if this is a WAN gateway queue
+      if(!isAsyncEventQueue()) {
+        ((GemFireCacheImpl) getCache()).getPdxRegistry().gatewaySenderStarted(this);
+      }
+      new UpdateAttributesProcessor(this).distribute(false);
+     
+      InternalDistributedSystem system = (InternalDistributedSystem) this.cache
+          .getDistributedSystem();
+      system.handleResourceEvent(ResourceEvent.GATEWAYSENDER_START, this);
+      
+      logger.info(LocalizedMessage.create(LocalizedStrings.ParallelGatewaySenderImpl_STARTED__0, this));
+      
+      if (!tmpQueuedEvents.isEmpty()) {
+        enqueueTempEvents();
+      }
+    }
+    finally {
+      this.lifeCycleLock.writeLock().unlock();
+    }
+  }
+  
+//  /**
+//   * The sender is not started but only the message queue i.e. shadowPR is created on the node.
+//   * @param targetPr
+//   */
+//  private void createMessageQueueOnAccessorNode(PartitionedRegion targetPr) {
+//    eventProcessor = new ParallelGatewaySenderEventProcessor(this, targetPr);
+//  }
+  
+
+  @Override
+  public void stop() {
+    this.lifeCycleLock.writeLock().lock(); 
+    try {
+      if (!this.isRunning()) {
+        return;
+      }
+      // Stop the dispatcher
+      AbstractGatewaySenderEventProcessor ev = this.eventProcessor;
+      //try {
+      if (ev != null && !ev.isStopped()) {
+        ev.stopProcessing();
+      }
+
+      // Stop the proxy (after the dispatcher, so the socket is still
+      // alive until after the dispatcher has stopped)
+      stompProxyDead();
+
+      // Close the listeners
+      for (AsyncEventListener listener : this.listeners) {
+        listener.close();
+      }
+      //stop the running threads, open sockets if any
+      ((ConcurrentParallelGatewaySenderQueue)this.eventProcessor.getQueue()).cleanUp();
+
+      logger.info(LocalizedMessage.create(LocalizedStrings.GatewayImpl_STOPPED__0, this));
+      
+      InternalDistributedSystem system = (InternalDistributedSystem) this.cache
+      .getDistributedSystem();
+      system.handleResourceEvent(ResourceEvent.GATEWAYSENDER_STOP, this);
+      
+      clearTempEventsAfterSenderStopped();
+      // Keep the eventProcessor around so we can ask it for the regionQueues later.
+      // Tests expect to be able to do this. 
+//      } finally {
+//        this.eventProcessor = null;
+//      }
+    }
+    finally {
+      this.lifeCycleLock.writeLock().unlock();
+    }
+  }
+  
+  @Override
+  public String toString() {
+    StringBuffer sb = new StringBuffer();
+    sb.append("ParallelGatewaySender{");
+    sb.append("id=" + getId());
+    sb.append(",remoteDsId="+ getRemoteDSId());
+    sb.append(",isRunning ="+ isRunning());
+    sb.append("}");
+    return sb.toString();
+  }
+
+  public void fillInProfile(Profile profile) {
+    assert profile instanceof GatewaySenderProfile;
+    GatewaySenderProfile pf = (GatewaySenderProfile)profile;
+    pf.Id = getId();
+    pf.remoteDSId = getRemoteDSId();
+    pf.isRunning = isRunning();
+    pf.isPrimary = isPrimary();
+    pf.isParallel = true;
+    pf.isBatchConflationEnabled = isBatchConflationEnabled();
+    pf.isPersistenceEnabled = isPersistenceEnabled();
+    pf.alertThreshold = getAlertThreshold();
+    pf.manualStart = isManualStart();
+    pf.dispatcherThreads = getDispatcherThreads();
+    pf.orderPolicy = getOrderPolicy();
+    for (com.gemstone.gemfire.cache.wan.GatewayEventFilter filter : getGatewayEventFilters()) {
+      pf.eventFiltersClassNames.add(filter.getClass().getName());
+    }
+    for (GatewayTransportFilter filter : getGatewayTransportFilters()) {
+      pf.transFiltersClassNames.add(filter.getClass().getName());
+    }
+    for (AsyncEventListener listener : getAsyncEventListeners()) {
+      pf.senderEventListenerClassNames.add(listener.getClass().getName());
+    }
+    pf.isDiskSynchronous = isDiskSynchronous();
+  }
+
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender#setModifiedEventId(com.gemstone.gemfire.internal.cache.EntryEventImpl)
+   */
+  @Override
+  protected void setModifiedEventId(EntryEventImpl clonedEvent) {
+    int bucketId = -1;
+    //merged from 42004
+    if (clonedEvent.getRegion() instanceof DistributedRegion) {
+//      if (getOrderPolicy() == OrderPolicy.THREAD) {
+//        bucketId = PartitionedRegionHelper.getHashKey(
+//            ((EntryEventImpl)clonedEvent).getEventId().getThreadID(),
+//            getMaxParallelismForReplicatedRegion());
+//      }
+//      else
+        bucketId = PartitionedRegionHelper.getHashKey(clonedEvent.getKey(),
+            getMaxParallelismForReplicatedRegion());
+    }
+    else {
+      bucketId = PartitionedRegionHelper
+          .getHashKey((EntryOperation)clonedEvent);
+    }
+    EventID originalEventId = clonedEvent.getEventId();
+    long originatingThreadId = ThreadIdentifier.getRealThreadID(originalEventId.getThreadID());
+
+    long newThreadId = ThreadIdentifier
+    .createFakeThreadIDForParallelGSPrimaryBucket(bucketId,
+        originatingThreadId, getEventIdIndex());
+    
+    // In case of parallel as all events go through primary buckets
+    // we don't neet to generate different threadId for secondary buckets
+    // as they will be rejected if seen at PR level itself
+    
+//    boolean isPrimary = ((PartitionedRegion)getQueue().getRegion())
+//    .getRegionAdvisor().getBucketAdvisor(bucketId).isPrimary();
+//    if (isPrimary) {
+//      newThreadId = ThreadIdentifier
+//          .createFakeThreadIDForParallelGSPrimaryBucket(bucketId,
+//              originatingThreadId);
+//    } else {
+//      newThreadId = ThreadIdentifier
+//          .createFakeThreadIDForParallelGSSecondaryBucket(bucketId,
+//              originatingThreadId);
+//    }
+
+    EventID newEventId = new EventID(originalEventId.getMembershipID(),
+        newThreadId, originalEventId.getSequenceID(), bucketId);
+    if (logger.isDebugEnabled()) {
+      logger.debug("{}: Generated event id for event with key={}, bucketId={}, original event id={}, threadId={}, new event id={}, newThreadId={}",
+          this, clonedEvent.getKey(), bucketId, originalEventId, originatingThreadId, newEventId, newThreadId);
+    }
+    clonedEvent.setEventId(newEventId);
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/RemoteConcurrentParallelGatewaySenderEventProcessor.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/RemoteConcurrentParallelGatewaySenderEventProcessor.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/RemoteConcurrentParallelGatewaySenderEventProcessor.java
new file mode 100644
index 0000000..db7c03c
--- /dev/null
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/RemoteConcurrentParallelGatewaySenderEventProcessor.java
@@ -0,0 +1,51 @@
+package com.gemstone.gemfire.internal.cache.wan.parallel;
+
+
+import java.util.Set;
+
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
+import com.gemstone.gemfire.internal.cache.wan.GatewaySenderStats;
+import com.gemstone.gemfire.internal.cache.wan.GatewaySenderEventRemoteDispatcher;
+import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelGatewaySenderEventProcessor;
+/**
+ * Remote version of GatewaySenderEvent Processor
+ * @author skumar
+ *
+ */
+public class RemoteConcurrentParallelGatewaySenderEventProcessor extends ConcurrentParallelGatewaySenderEventProcessor{
+  
+  public RemoteConcurrentParallelGatewaySenderEventProcessor(
+      AbstractGatewaySender sender) {
+    super(sender);
+  }
+
+  @Override
+  protected void createProcessors(int dispatcherThreads, Set<Region> targetRs) {
+    processors = new RemoteParallelGatewaySenderEventProcessor[sender.getDispatcherThreads()];
+    if (logger.isDebugEnabled()) {
+      logger.debug("Creating GatewaySenderEventProcessor");
+    }
+    for (int i = 0; i < sender.getDispatcherThreads(); i++) {
+      processors[i] = new RemoteParallelGatewaySenderEventProcessor(sender,
+          targetRs, i, sender.getDispatcherThreads());
+    }
+  }
+  
+  @Override
+  protected void rebalance() {
+    GatewaySenderStats statistics = this.sender.getStatistics();
+    long startTime = statistics.startLoadBalance();
+    try {
+      for (ParallelGatewaySenderEventProcessor parallelProcessor : this.processors) {
+        GatewaySenderEventRemoteDispatcher remoteDispatcher = (GatewaySenderEventRemoteDispatcher)parallelProcessor.getDispatcher();
+        if (remoteDispatcher.isConnectedToRemote()) {
+          remoteDispatcher.stopAckReaderThread();
+          remoteDispatcher.destroyConnection();
+        }
+      }
+    } finally {
+      statistics.endLoadBalance(startTime);
+    }
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/RemoteParallelGatewaySenderEventProcessor.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/RemoteParallelGatewaySenderEventProcessor.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/RemoteParallelGatewaySenderEventProcessor.java
new file mode 100644
index 0000000..f002eae
--- /dev/null
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/RemoteParallelGatewaySenderEventProcessor.java
@@ -0,0 +1,106 @@
+package com.gemstone.gemfire.internal.cache.wan.parallel;
+
+import java.io.IOException;
+import java.util.Set;
+
+import org.apache.logging.log4j.Logger;
+
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.client.internal.Connection;
+import com.gemstone.gemfire.cache.client.internal.pooling.ConnectionDestroyedException;
+import com.gemstone.gemfire.cache.wan.GatewaySender;
+import com.gemstone.gemfire.internal.Version;
+import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
+import com.gemstone.gemfire.internal.cache.wan.GatewaySenderConfigurationException;
+import com.gemstone.gemfire.internal.cache.wan.GatewaySenderEventCallbackDispatcher;
+import com.gemstone.gemfire.internal.cache.wan.GatewaySenderEventDispatcher;
+import com.gemstone.gemfire.internal.cache.wan.GatewaySenderEventRemoteDispatcher;
+import com.gemstone.gemfire.internal.cache.wan.GatewaySenderException;
+import com.gemstone.gemfire.internal.cache.wan.GatewaySenderStats;
+import com.gemstone.gemfire.internal.logging.LogService;
+
+public class RemoteParallelGatewaySenderEventProcessor extends ParallelGatewaySenderEventProcessor {
+  private static final Logger logger = LogService.getLogger();
+  
+  protected RemoteParallelGatewaySenderEventProcessor(
+      AbstractGatewaySender sender) {
+    super(sender);
+  }
+  
+  /**
+   * use in concurrent scenario where queue is to be shared among all the processors.
+   */
+  protected RemoteParallelGatewaySenderEventProcessor(AbstractGatewaySender sender,  Set<Region> userRegions, int id, int nDispatcher) {
+    super(sender,  userRegions, id, nDispatcher);
+  }
+  
+  @Override
+  protected void rebalance() {
+    GatewaySenderStats statistics = this.sender.getStatistics();
+    long startTime = statistics.startLoadBalance();
+    try {
+      if (this.dispatcher.isRemoteDispatcher()) {
+        GatewaySenderEventRemoteDispatcher remoteDispatcher = (GatewaySenderEventRemoteDispatcher) this.dispatcher;
+        if (remoteDispatcher.isConnectedToRemote()) {
+          remoteDispatcher.stopAckReaderThread();
+          remoteDispatcher.destroyConnection();
+        }
+      }
+    } finally {
+      statistics.endLoadBalance(startTime);
+    }
+  }
+  
+  public void initializeEventDispatcher() {
+    if (logger.isDebugEnabled()) {
+      logger.debug(" Creating the GatewayEventRemoteDispatcher");
+    }
+    if (this.sender.getRemoteDSId() != GatewaySender.DEFAULT_DISTRIBUTED_SYSTEM_ID) {
+      this.dispatcher = new GatewaySenderEventRemoteDispatcher(this);
+    }
+  }
+  
+  /**
+   * Returns if corresponding receiver WAN site of this GatewaySender has
+   * GemfireVersion > 7.0.1
+   * 
+   * @param disp
+   * @return true if remote site Gemfire Version is >= 7.0.1
+   */
+  private boolean shouldSendVersionEvents(GatewaySenderEventDispatcher disp)
+      throws GatewaySenderException {
+      try {
+        GatewaySenderEventRemoteDispatcher remoteDispatcher = (GatewaySenderEventRemoteDispatcher) disp;
+        // This will create a new connection if no batch has been sent till
+        // now.
+        Connection conn = remoteDispatcher.getConnection(false);
+        if (conn != null) {
+          short remoteSiteVersion = conn.getWanSiteVersion();
+          if (Version.GFE_701.compareTo(remoteSiteVersion) <= 0) {
+            return true;
+          }
+        }
+      } catch (GatewaySenderException e) {
+        Throwable cause = e.getCause();
+        if (cause instanceof IOException
+            || e instanceof GatewaySenderConfigurationException
+            || cause instanceof ConnectionDestroyedException) {
+          try {
+            int sleepInterval = GatewaySender.CONNECTION_RETRY_INTERVAL;
+            if (logger.isDebugEnabled()) {
+              logger.debug("Sleeping for {} milliseconds", sleepInterval);
+            }
+            Thread.sleep(sleepInterval);
+          } catch (InterruptedException ie) {
+            // log the exception
+            if (logger.isDebugEnabled()){
+              logger.debug(ie.getMessage(), ie);
+            }
+          }
+        }
+        throw e;
+      }
+    return false;
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/RemoteConcurrentSerialGatewaySenderEventProcessor.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/RemoteConcurrentSerialGatewaySenderEventProcessor.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/RemoteConcurrentSerialGatewaySenderEventProcessor.java
new file mode 100644
index 0000000..440930d
--- /dev/null
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/RemoteConcurrentSerialGatewaySenderEventProcessor.java
@@ -0,0 +1,29 @@
+package com.gemstone.gemfire.internal.cache.wan.serial;
+
+import org.apache.logging.log4j.Logger;
+
+import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
+import com.gemstone.gemfire.internal.logging.LogService;
+
+public class RemoteConcurrentSerialGatewaySenderEventProcessor extends
+    ConcurrentSerialGatewaySenderEventProcessor {
+
+  private static final Logger logger = LogService.getLogger();
+  
+  public RemoteConcurrentSerialGatewaySenderEventProcessor(
+      AbstractGatewaySender sender) {
+    super(sender);
+  }
+
+  @Override
+  protected void initializeMessageQueue(String id) {
+    for (int i = 0; i < sender.getDispatcherThreads(); i++) {
+      processors.add(new RemoteSerialGatewaySenderEventProcessor(this.sender, id
+          + "." + i));
+      if (logger.isDebugEnabled()) {
+        logger.debug("Created the RemoteSerialGatewayEventProcessor_{}->{}", i, processors.get(i));
+      }
+    }
+  }
+  
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/RemoteSerialGatewaySenderEventProcessor.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/RemoteSerialGatewaySenderEventProcessor.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/RemoteSerialGatewaySenderEventProcessor.java
new file mode 100644
index 0000000..ea02870
--- /dev/null
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/RemoteSerialGatewaySenderEventProcessor.java
@@ -0,0 +1,34 @@
+package com.gemstone.gemfire.internal.cache.wan.serial;
+
+import org.apache.logging.log4j.Logger;
+
+import com.gemstone.gemfire.internal.cache.wan.GatewaySenderEventRemoteDispatcher;
+import com.gemstone.gemfire.internal.cache.wan.GatewaySenderEventCallbackDispatcher;
+import com.gemstone.gemfire.cache.wan.GatewaySender;
+import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
+import com.gemstone.gemfire.internal.logging.LogService;
+
+public class RemoteSerialGatewaySenderEventProcessor extends
+    SerialGatewaySenderEventProcessor {
+
+  private static final Logger logger = LogService.getLogger();
+  public RemoteSerialGatewaySenderEventProcessor(AbstractGatewaySender sender,
+      String id) {
+    super(sender, id);
+  }
+
+  public void initializeEventDispatcher() {
+    if (logger.isDebugEnabled()) {
+      logger.debug(" Creating the GatewayEventRemoteDispatcher");
+    }
+    // In case of serial there is a way to create gatewaysender and attach
+    // asynceventlistener. Not sure of the use-case but there are dunit tests
+    // To make them passuncommenting the below condition
+    if (this.sender.getRemoteDSId() != GatewaySender.DEFAULT_DISTRIBUTED_SYSTEM_ID) {
+      this.dispatcher = new GatewaySenderEventRemoteDispatcher(this);
+    }else{
+      this.dispatcher = new GatewaySenderEventCallbackDispatcher(this);
+    }
+  }
+  
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderImpl.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderImpl.java
new file mode 100644
index 0000000..d69d747
--- /dev/null
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderImpl.java
@@ -0,0 +1,253 @@
+/*
+ * =========================================================================
+ * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved. 
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ * ========================================================================
+ */
+
+package com.gemstone.gemfire.internal.cache.wan.serial;
+import org.apache.logging.log4j.Logger;
+
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener;
+import com.gemstone.gemfire.cache.asyncqueue.internal.AsyncEventQueueImpl;
+import com.gemstone.gemfire.cache.asyncqueue.internal.AsyncEventQueueStats;
+import com.gemstone.gemfire.cache.wan.GatewaySender;
+import com.gemstone.gemfire.cache.wan.GatewayTransportFilter;
+import com.gemstone.gemfire.distributed.DistributedLockService;
+import com.gemstone.gemfire.distributed.internal.DistributionAdvisor.Profile;
+import com.gemstone.gemfire.distributed.internal.DistributionAdvisor;
+import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.distributed.internal.ResourceEvent;
+import com.gemstone.gemfire.internal.cache.EntryEventImpl;
+import com.gemstone.gemfire.internal.cache.EventID;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.cache.RegionQueue;
+import com.gemstone.gemfire.internal.cache.UpdateAttributesProcessor;
+import com.gemstone.gemfire.internal.cache.ha.ThreadIdentifier;
+import com.gemstone.gemfire.internal.cache.wan.AbstractRemoteGatewaySender;
+import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySenderEventProcessor;
+import com.gemstone.gemfire.internal.cache.wan.GatewaySenderAdvisor.GatewaySenderProfile;
+import com.gemstone.gemfire.internal.cache.wan.GatewaySenderAdvisor;
+import com.gemstone.gemfire.internal.cache.wan.GatewaySenderAttributes;
+import com.gemstone.gemfire.internal.cache.wan.GatewaySenderConfigurationException;
+import com.gemstone.gemfire.internal.cache.wan.GatewaySenderEventImpl;
+import com.gemstone.gemfire.internal.cache.wan.GatewaySenderStats;
+import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.internal.logging.LogService;
+import com.gemstone.gemfire.internal.logging.LoggingThreadGroup;
+import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
+
+/**
+ * @author Suranjan Kumar
+ * @author Yogesh Mahajan
+ * @since 7.0
+ *
+ */
+public class SerialGatewaySenderImpl extends AbstractRemoteGatewaySender {
+
+  private static final Logger logger = LogService.getLogger();
+  
+  final ThreadGroup loggerGroup = LoggingThreadGroup.createThreadGroup(
+      "Remote Site Discovery Logger Group", logger);
+
+  public SerialGatewaySenderImpl(){
+    super();
+    this.isParallel = false;
+  }
+  public SerialGatewaySenderImpl(Cache cache,
+      GatewaySenderAttributes attrs) {
+    super(cache, attrs);
+  }
+  
+  @Override
+  public void start() {
+    if (logger.isDebugEnabled()) {
+      logger.debug("Starting gatewaySender : {}", this);
+    }
+    
+    this.lifeCycleLock.writeLock().lock();
+    try {
+      if (isRunning()) {
+        logger.warn(LocalizedMessage.create(LocalizedStrings.GatewaySender_SENDER_0_IS_ALREADY_RUNNING, this.getId()));
+        return;
+      }
+      if (this.remoteDSId != DEFAULT_DISTRIBUTED_SYSTEM_ID) {
+        String locators = ((GemFireCacheImpl)this.cache).getDistributedSystem()
+            .getConfig().getLocators();
+        if (locators.length() == 0) {
+          throw new GatewaySenderConfigurationException(
+              LocalizedStrings.AbstractGatewaySender_LOCATOR_SHOULD_BE_CONFIGURED_BEFORE_STARTING_GATEWAY_SENDER
+                  .toLocalizedString());
+        }
+      }
+      getSenderAdvisor().initDLockService();
+      if (!isPrimary()) {
+        if (getSenderAdvisor().volunteerForPrimary()) {
+          getSenderAdvisor().makePrimary();
+        } else {
+          getSenderAdvisor().makeSecondary();
+        }
+      }
+      if (getDispatcherThreads() > 1) {
+        eventProcessor = new RemoteConcurrentSerialGatewaySenderEventProcessor(
+            SerialGatewaySenderImpl.this);
+      } else {
+        eventProcessor = new RemoteSerialGatewaySenderEventProcessor(
+            SerialGatewaySenderImpl.this, getId());
+      }
+      eventProcessor.start();
+      waitForRunningStatus();
+      this.startTime = System.currentTimeMillis();
+      
+      //Only notify the type registry if this is a WAN gateway queue
+      if(!isAsyncEventQueue()) {
+        ((GemFireCacheImpl) getCache()).getPdxRegistry().gatewaySenderStarted(this);
+      }
+      new UpdateAttributesProcessor(this).distribute(false);
+
+      
+      InternalDistributedSystem system = (InternalDistributedSystem) this.cache
+          .getDistributedSystem();
+      system.handleResourceEvent(ResourceEvent.GATEWAYSENDER_START, this);
+      
+      logger.info(LocalizedMessage.create(LocalizedStrings.SerialGatewaySenderImpl_STARTED__0, this));
+  
+      enqueueTempEvents();
+    } finally {
+      this.lifeCycleLock.writeLock().unlock();
+    }
+  }
+  
+  @Override
+  public void stop() {
+    if (logger.isDebugEnabled()) {
+      logger.debug("Stopping Gateway Sender : {}", this);
+    }
+    this.lifeCycleLock.writeLock().lock();
+    try {
+      // Stop the dispatcher
+      AbstractGatewaySenderEventProcessor ev = this.eventProcessor;
+      if (ev != null && !ev.isStopped()) {
+        ev.stopProcessing();
+      }
+      this.eventProcessor = null;
+
+      // Stop the proxy (after the dispatcher, so the socket is still
+      // alive until after the dispatcher has stopped)
+      stompProxyDead();
+
+      // Close the listeners
+      for (AsyncEventListener listener : this.listeners) {
+        listener.close();
+      }
+      logger.info(LocalizedMessage.create(LocalizedStrings.GatewayImpl_STOPPED__0, this));
+      
+      clearTempEventsAfterSenderStopped();
+    } finally {
+      this.lifeCycleLock.writeLock().unlock();
+    }
+    if (this.isPrimary()) {
+      try {
+        DistributedLockService
+            .destroy(getSenderAdvisor().getDLockServiceName());
+      } catch (IllegalArgumentException e) {
+        // service not found... ignore
+      }
+    }
+    if (getQueues() != null && !getQueues().isEmpty()) {
+      for (RegionQueue q : getQueues()) {
+        ((SerialGatewaySenderQueue)q).cleanUp();
+      }
+    }
+    this.setIsPrimary(false);
+    new UpdateAttributesProcessor(this).distribute(false);
+    Thread lockObtainingThread = getSenderAdvisor().getLockObtainingThread();
+    if (lockObtainingThread != null && lockObtainingThread.isAlive()) {
+      // wait a while for thread to terminate
+      try {
+        lockObtainingThread.join(3000);
+      } catch (InterruptedException ex) {
+        // we allowed our join to be canceled
+        // reset interrupt bit so this thread knows it has been interrupted
+        Thread.currentThread().interrupt();
+      }
+      if (lockObtainingThread.isAlive()) {
+        logger.info(LocalizedMessage.create(LocalizedStrings.GatewaySender_COULD_NOT_STOP_LOCK_OBTAINING_THREAD_DURING_GATEWAY_SENDER_STOP));
+      }
+    }
+    
+    InternalDistributedSystem system = (InternalDistributedSystem) this.cache
+        .getDistributedSystem();
+    system.handleResourceEvent(ResourceEvent.GATEWAYSENDER_STOP, this);
+  }
+  
+  @Override
+  public String toString() {
+    StringBuffer sb = new StringBuffer();
+    sb.append("SerialGatewaySender{");
+    sb.append("id=" + getId());
+    sb.append(",remoteDsId="+ getRemoteDSId());
+    sb.append(",isRunning ="+ isRunning());
+    sb.append(",isPrimary ="+ isPrimary());
+    sb.append("}");
+    return sb.toString();
+  }
+ 
+  @Override
+  public void fillInProfile(Profile profile) {
+    assert profile instanceof GatewaySenderProfile;
+    GatewaySenderProfile pf = (GatewaySenderProfile)profile;
+    pf.Id = getId();
+    pf.startTime = getStartTime();
+    pf.remoteDSId = getRemoteDSId();
+    pf.isRunning = isRunning();
+    pf.isPrimary = isPrimary();
+    pf.isParallel = false;
+    pf.isBatchConflationEnabled = isBatchConflationEnabled();
+    pf.isPersistenceEnabled = isPersistenceEnabled();
+    pf.alertThreshold = getAlertThreshold();
+    pf.manualStart = isManualStart();
+    for (com.gemstone.gemfire.cache.wan.GatewayEventFilter filter : getGatewayEventFilters()) {
+      pf.eventFiltersClassNames.add(filter.getClass().getName());
+    }
+    for (GatewayTransportFilter filter : getGatewayTransportFilters()) {
+      pf.transFiltersClassNames.add(filter.getClass().getName());
+    }
+    for (AsyncEventListener listener : getAsyncEventListeners()) {
+      pf.senderEventListenerClassNames.add(listener.getClass().getName());
+    }
+    pf.isDiskSynchronous = isDiskSynchronous();
+    pf.dispatcherThreads = getDispatcherThreads();
+    pf.orderPolicy = getOrderPolicy();
+    pf.serverLocation = this.getServerLocation(); 
+  }
+
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender#setModifiedEventId(com.gemstone.gemfire.internal.cache.EntryEventImpl)
+   */
+  @Override
+  protected void setModifiedEventId(EntryEventImpl clonedEvent) {
+    EventID originalEventId = clonedEvent.getEventId();
+    long originalThreadId = originalEventId.getThreadID();
+    long newThreadId = originalThreadId;
+    if (ThreadIdentifier.isWanTypeThreadID(newThreadId)) {
+      // This thread id has already been converted. Do nothing.
+    } else {
+      newThreadId = ThreadIdentifier
+        .createFakeThreadIDForParallelGSPrimaryBucket(0, originalThreadId,
+            getEventIdIndex());
+    }
+    EventID newEventId = new EventID(originalEventId.getMembershipID(),
+        newThreadId, originalEventId.getSequenceID());
+    if (logger.isDebugEnabled()) {
+      logger.debug("{}: Generated event id for event with key={}, original event id={}, originalThreadId={}, new event id={}, newThreadId={}",
+          this, clonedEvent.getKey(), originalEventId, originalThreadId, newEventId, newThreadId);
+    }
+    clonedEvent.setEventId(newEventId);
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/main/resources/.keepme
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/resources/.keepme b/gemfire-wan/src/main/resources/.keepme
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/main/resources/META-INF/services/com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListener
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/resources/META-INF/services/com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListener b/gemfire-wan/src/main/resources/META-INF/services/com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListener
new file mode 100644
index 0000000..ce96f96
--- /dev/null
+++ b/gemfire-wan/src/main/resources/META-INF/services/com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListener
@@ -0,0 +1 @@
+com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListenerImpl
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.wan.spi.WANFactory
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.wan.spi.WANFactory b/gemfire-wan/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.wan.spi.WANFactory
new file mode 100644
index 0000000..4d47e35
--- /dev/null
+++ b/gemfire-wan/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.wan.spi.WANFactory
@@ -0,0 +1 @@
+com.gemstone.gemfire.cache.client.internal.locator.wan.WANFactoryImpl


[47/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/CQJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/CQJUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/CQJUnitTest.java
new file mode 100644
index 0000000..66b23c2
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/CQJUnitTest.java
@@ -0,0 +1,147 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+
+//
+//  CQJUnitTest.java
+//
+//  Created by Eric Zoerner on 6/28/07.
+
+package com.gemstone.gemfire.cache.query.cq;
+
+import java.util.Properties;
+
+import org.junit.experimental.categories.Category;
+
+import junit.framework.TestCase;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.RegionAttributes;
+import com.gemstone.gemfire.cache.query.CacheUtils;
+import com.gemstone.gemfire.cache.query.CqAttributes;
+import com.gemstone.gemfire.cache.query.CqAttributesFactory;
+import com.gemstone.gemfire.cache.query.QueryInvalidException;
+import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.distributed.DistributedSystem;
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+
+@Category(IntegrationTest.class)
+public class CQJUnitTest extends TestCase {
+  private DistributedSystem ds;
+  private Cache cache;
+  private QueryService qs;
+  
+  /////////////////////////////////////
+  // Methods for setUp and tearDown
+  /////////////////////////////////////
+  
+  public CQJUnitTest(String name) {
+    super(name);
+  }
+  
+  public void setUp() throws Exception {
+    Properties props = new Properties();
+    props.setProperty("mcast-port", "0");
+    props.setProperty("log-level", "config");
+    this.ds = DistributedSystem.connect(props);
+    this.cache = CacheFactory.create(ds);
+    this.qs = cache.getQueryService();
+  }
+  
+  public void tearDown() throws Exception {
+    this.cache.close();
+    this.ds.disconnect();
+  }
+
+  /////////////////////////////////////
+  // Test Methods
+  /////////////////////////////////////
+  
+  
+  /**
+   * Test to make sure CQs that have invalid syntax
+   * throw QueryInvalidException, and CQs that have unsupported
+   * CQ features throw UnsupportedOperationException
+   */
+  public void testValidateCQ() throws Exception {
+   
+    AttributesFactory attributesFactory = new AttributesFactory();
+    RegionAttributes regionAttributes = attributesFactory.create();
+   //The order by query computes dependency after compilation so the region has to be present
+    // for the query to progress further to throw UnsupportedOperationException
+    cache.createRegion("region",regionAttributes);
+    
+    // default attributes
+    CqAttributes attrs = new CqAttributesFactory().create();
+    
+    // valid CQ
+    this.qs.newCq("SELECT * FROM /region WHERE status = 'active'",
+                              attrs);
+    
+    // invalid syntax
+    try {
+      this.qs.newCq("this query is garbage", attrs);
+      fail("should have thrown a QueryInvalidException");
+    }
+    catch (QueryInvalidException e) {
+      // pass
+    }
+    
+    String[] unsupportedCQs = new String[] {
+      // not "just" a select statement
+      "(select * from /region where status = 'active').isEmpty",
+      
+      // cannot be DISTINCT
+      "select DISTINCT * from /region WHERE status = 'active'",
+      
+      // references more than one region
+      "select * from /region1 r1, /region2 r2 where r1 = r2",
+      
+      // where clause refers to a region
+      "select * from /region r where r.val = /region.size",
+      
+      // more than one iterator in FROM clause
+      "select * from /portfolios p1, p1.positions p2 where p2.id = 'IBM'",
+      
+      // first iterator in FROM clause is not just a region path
+      "select * from /region.entries e where e.value.id = 23",
+      
+      // has projections
+      "select id from /region where status = 'active'",
+      
+      // has ORDER BY
+      "select * from /region where status = 'active' ORDER BY id",
+    };
+    
+    for (int i = 0; i < unsupportedCQs.length; i++) {      
+      try {
+        this.qs.newCq(unsupportedCQs[i], attrs);
+        fail("should have thrown UnsupportedOperationException for query #" + i);
+      }
+      catch (UnsupportedOperationException e) {
+        // pass
+      }
+    }
+  }
+  
+  /* would need to make the constructServerSideQuery method package
+   * accessible and move this to the internal package in order
+   * to test that method
+   * 
+  public void testConstructServerSideQuery() throws Exception {
+    // default attributes
+    CqAttributes attrs = new CqAttributesFactory().create();
+    
+    // valid CQ
+    CqQuery cq = this.qs.newCq("SELECT * FROM /region WHERE status = 'active'",
+                              attrs);
+    Query serverSideQuery = ((CqQueryImpl)cq).constructServerSideQuery();
+  }
+  */
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java
new file mode 100644
index 0000000..1a1fc77
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java
@@ -0,0 +1,1154 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.query.cq.dunit;
+
+import java.util.HashSet;
+import java.util.concurrent.CountDownLatch;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.EvictionAction;
+import com.gemstone.gemfire.cache.EvictionAttributes;
+import com.gemstone.gemfire.cache.MirrorType;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.cache.query.SelectResults;
+import com.gemstone.gemfire.cache.query.Struct;
+import com.gemstone.gemfire.cache.query.data.Portfolio;
+import com.gemstone.gemfire.cache.query.internal.cq.CqQueryImpl;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.cache30.CacheTestCase;
+import com.gemstone.gemfire.cache30.CertifiableTestCacheListener;
+import com.gemstone.gemfire.internal.AvailablePortHelper;
+
+import dunit.AsyncInvocation;
+import dunit.DistributedTestCase;
+import dunit.Host;
+import dunit.SerializableRunnable;
+import dunit.VM;
+
+/**
+ * This class tests the ContiunousQuery mechanism in GemFire.
+ * This includes the test with different data activities.
+ *
+ * @author anil
+ */
+public class CqDataDUnitTest extends CacheTestCase {
+
+  protected CqQueryDUnitTest cqDUnitTest = new CqQueryDUnitTest("CqDataDUnitTest");
+  
+  public CqDataDUnitTest(String name) {
+    super(name);
+  }
+  
+  public void setUp() throws Exception {
+    super.setUp();
+    
+    // avoid IllegalStateException from HandShake by connecting all vms tor
+    // system before creating ConnectionPools
+    getSystem();
+    invokeInEveryVM(new SerializableRunnable("getSystem") {
+      public void run() {
+        getSystem();
+      }
+    });
+    
+  }
+    
+  /**
+   * Tests with client acting as feeder/publisher and registering cq.
+   * Added wrt bug 37161.
+   * In case of InterestList the events are not sent back to the client
+   * if its the originator, this is not true for cq.
+   * 
+   * @throws Exception
+   */
+  public void testClientWithFeederAndCQ() throws Exception
+  {
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+
+    cqDUnitTest.createServer(server);
+
+    final int port = server.invokeInt(CqQueryDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+
+    // Create client.
+    cqDUnitTest.createClient(client, port, host0);
+
+
+    cqDUnitTest.createCQ(client, "testClientWithFeederAndCQ_0", cqDUnitTest.cqs[0]);
+    cqDUnitTest.executeCQ(client, "testClientWithFeederAndCQ_0", false, null);
+
+    final int size = 10;
+    cqDUnitTest.createValues(client, cqDUnitTest.regions[0], size);
+    cqDUnitTest.waitForCreated(client, "testClientWithFeederAndCQ_0", CqQueryDUnitTest.KEY+size);
+
+    cqDUnitTest.validateCQ(client, "testClientWithFeederAndCQ_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server);
+    
+  }
+
+  /**
+   * Test for CQ Fail over/HA with redundancy level set.
+   * @throws Exception
+   */
+  public void testCQHAWithState() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM server3 = host.getVM(2);
+    
+    VM client = host.getVM(3);
+    
+    //Killing servers can cause this message on the client side.
+    addExpectedException("Could not find any server");
+    cqDUnitTest.createServer(server1);
+    
+    final int port1 = server1.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+    
+    final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(2);
+    
+    cqDUnitTest.createServer(server2, ports[0]);
+    final int port2 = server2.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+            
+    // Create client - With 3 server endpoints and redundancy level set to 2.
+    
+    // Create client with redundancyLevel 1
+    cqDUnitTest.createClient(client, new int[] {port1, port2, ports[1]}, host0, "1");
+    
+    // Create CQs.
+    int numCQs = 1;
+    for (int i=0; i < numCQs; i++) {
+      // Create CQs.
+      cqDUnitTest.createCQ(client, "testCQHAWithState_" + i, cqDUnitTest.cqs[i]);
+      cqDUnitTest.executeCQ(client, "testCQHAWithState_" + i, false, null);
+    }
+    
+    pause(1 * 1000);
+    
+    int size = 10;
+    
+    // CREATE.
+    cqDUnitTest.createValues(server1, cqDUnitTest.regions[0], size);
+    cqDUnitTest.createValues(server1, cqDUnitTest.regions[1], size);
+    
+    for (int i=1; i <= size; i++) {
+      cqDUnitTest.waitForCreated(client, "testCQHAWithState_0", CqQueryDUnitTest.KEY + i);
+    }
+    
+    // Clients expected initial result.
+    int[] resultsCnt = new int[] {10, 1, 2};
+
+    for (int i=0; i < numCQs; i++) {
+      cqDUnitTest.validateCQ(client, "testCQHAWithState_" + i, CqQueryDUnitTest.noTest, resultsCnt[i], 0, 0);
+    }    
+
+    // Close server1.
+    // To maintain the redundancy; it will make connection to endpoint-3.
+    cqDUnitTest.closeServer(server1);
+    pause(3 * 1000);
+    
+    
+    // UPDATE-1.
+    cqDUnitTest.createValues(server2, cqDUnitTest.regions[0], 10);
+    cqDUnitTest.createValues(server2, cqDUnitTest.regions[1], 10);
+    
+    for (int i=1; i <= size; i++) {
+      cqDUnitTest.waitForUpdated(client, "testCQHAWithState_0", CqQueryDUnitTest.KEY + size);
+    }
+    
+    for (int i=0; i < numCQs; i++) {
+      cqDUnitTest.validateCQ(client, "testCQHAWithState_" + i, CqQueryDUnitTest.noTest, resultsCnt[i], resultsCnt[i], CqQueryDUnitTest.noTest);
+    }    
+
+    //Stop cq.
+    cqDUnitTest.stopCQ(client, "testCQHAWithState_0");
+    
+    pause(2 * 1000);
+    
+    // UPDATE with stop.
+    cqDUnitTest.createServer(server3, ports[1]);
+    server3.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    pause(2 * 1000);
+    
+    cqDUnitTest.clearCQListenerEvents(client, "testCQHAWithState_0");
+    
+    cqDUnitTest.createValues(server2, cqDUnitTest.regions[0], 10);    
+    cqDUnitTest.createValues(server2, cqDUnitTest.regions[1], 10);
+    
+    // Wait for events at client.
+    try {
+      cqDUnitTest.waitForUpdated(client, "testCQHAWithState_0", CqQueryDUnitTest.KEY + 1);
+      fail("Events not expected since CQ is in stop state.");
+    } catch (Exception ex) {
+      // Success.
+    }
+    
+    cqDUnitTest.executeCQ(client, "testCQHAWithState_0", false, null);
+    pause(2 * 1000);
+    
+    // Update - 2 
+    cqDUnitTest.createValues(server3, cqDUnitTest.regions[0], 10);    
+    cqDUnitTest.createValues(server3, cqDUnitTest.regions[1], 10);
+    
+    for (int i=1; i <= size; i++) {
+      cqDUnitTest.waitForUpdated(client, "testCQHAWithState_0", CqQueryDUnitTest.KEY + size);
+    }
+
+    for (int i=0; i < numCQs; i++) {
+      cqDUnitTest.validateCQ(client, "testCQHAWithState_" + i, CqQueryDUnitTest.noTest, resultsCnt[i], resultsCnt[i] * 2, CqQueryDUnitTest.noTest);
+    }    
+    
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server2);
+    cqDUnitTest.closeServer(server3);
+  }
+
+  
+  
+  /**
+   * Tests propogation of invalidates and destorys to the clients. Bug 37242.
+   * 
+   * @throws Exception
+   */
+  public void testCQWithDestroysAndInvalidates() throws Exception
+  {
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    VM producer = host.getVM(2);
+    cqDUnitTest.createServer(server, 0, true);
+    final int port = server.invokeInt(CqQueryDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+
+    // Create client.
+    cqDUnitTest.createClient(client, port, host0);
+    // producer is not doing any thing.
+    cqDUnitTest.createClient(producer, port, host0);
+
+    final int size = 10;
+    final String name = "testQuery_4";
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], size);
+
+    cqDUnitTest.createCQ(client, name, cqDUnitTest.cqs[4]);
+    cqDUnitTest.executeCQ(client, name, true, null);
+    
+    // do destroys and invalidates.
+    server.invoke(new CacheSerializableRunnable("Create values") {
+      public void run2() throws CacheException
+      {
+        Region region1 = getRootRegion().getSubregion(cqDUnitTest.regions[0]);
+        for (int i = 1; i <= 5; i++) {
+          region1.destroy( CqQueryDUnitTest.KEY + i);
+        }
+      }
+    });
+    for (int i = 1; i <= 5; i++) {
+      cqDUnitTest.waitForDestroyed(client, name , CqQueryDUnitTest.KEY+i);
+    }
+    // recreate the key values from 1 - 5
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], 5);
+    // wait for all creates to arrive.
+    for (int i = 1; i <= 5; i++) {
+      cqDUnitTest.waitForCreated(client, name , CqQueryDUnitTest.KEY+i);
+    }
+    
+    // do more puts to push first five key-value to disk.
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], 10);
+    // do invalidates on fisrt five keys.
+    server.invoke(new CacheSerializableRunnable("Create values") {
+      public void run2() throws CacheException
+      {
+        Region region1 = getRootRegion().getSubregion(cqDUnitTest.regions[0]);
+        for (int i = 1; i <= 5; i++) {
+          region1.invalidate( CqQueryDUnitTest.KEY + i);
+        }
+      }
+    });
+    // wait for invalidates now.
+    for (int i = 1; i <= 5; i++) {
+      cqDUnitTest.waitForInvalidated(client, name , CqQueryDUnitTest.KEY+i);
+    }
+        
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server);
+  
+  }
+  
+  /**
+   * Tests make sure that the second client doesnt get more
+   * events then there should be. This will test the fix for 
+   * bug 37295.
+   * 
+   * @author rdubey
+   */
+  public void testCQWithMultipleClients() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client1 = host.getVM(1);
+    VM client2 = host.getVM(2);
+    VM client3 = host.getVM(3);
+    
+    /* Create Server and Client */
+    cqDUnitTest.createServer(server);
+    final int port = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    cqDUnitTest.createClient(client1, port, host0);
+    cqDUnitTest.createClient(client2, port, host0);
+    
+    /* Create CQs. and initialize the region */
+    // this should statisfy every thing since id is always greater than 
+    // zero.
+    cqDUnitTest.createCQ(client1, "testCQWithMultipleClients_0", cqDUnitTest.cqs[0]);
+    cqDUnitTest.executeCQ(client1, "testCQWithMultipleClients_0", false, null);
+    // should only satisfy one key-value pair in the region.
+    cqDUnitTest.createCQ(client2, "testCQWithMultipleClients_0", cqDUnitTest.cqs[1]);
+    cqDUnitTest.executeCQ(client2, "testCQWithMultipleClients_0", false, null);
+    
+    int size = 10;
+    
+    // Create Values on Server.
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], size);
+    
+    
+    cqDUnitTest.waitForCreated(client1, "testCQWithMultipleClients_0", CqQueryDUnitTest.KEY + 10);
+    
+    
+    /* Validate the CQs */
+    cqDUnitTest.validateCQ(client1, "testCQWithMultipleClients_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    
+    cqDUnitTest.waitForCreated(client2, "testCQWithMultipleClients_0", CqQueryDUnitTest.KEY + 2 );
+    
+    
+    cqDUnitTest.validateCQ(client2, "testCQWithMultipleClients_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ 1,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ 1,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ 1);
+         
+        
+    /* Close Server and Client */
+    cqDUnitTest.closeClient(client2);
+    cqDUnitTest.closeClient(client3);
+    cqDUnitTest.closeServer(server);
+  }
+
+  /**
+   * Test for CQ when region is populated with net load.
+   * @throws Exception
+   */
+  public void testCQWithLoad() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    
+    VM client = host.getVM(2);
+    
+    cqDUnitTest.createServer(server1, 0, false, MirrorType.KEYS_VALUES);
+    cqDUnitTest.createServer(server2, 0, false, MirrorType.KEYS);
+        
+    final int port1 = server1.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+      
+    cqDUnitTest.createClient(client, port1, host0);
+    
+    // Create CQs.
+    cqDUnitTest.createCQ(client, "testCQWithLoad_0", cqDUnitTest.cqs[0]);  
+    cqDUnitTest.executeCQ(client, "testCQWithLoad_0", false, null); 
+    
+    pause(2 * 1000);
+    
+    final int size = 10;
+    
+    // CREATE VALUES.
+    cqDUnitTest.createValues(server2, cqDUnitTest.regions[0], size);
+    
+    server1.invoke(new CacheSerializableRunnable("Load from second server") {
+      public void run2() throws CacheException {
+        Region region1 = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        for (int i=1; i <= size; i++){
+          region1.get(CqQueryDUnitTest.KEY + i);
+        }
+      }
+    });
+    
+    for (int i=1; i <= size; i++) {
+      cqDUnitTest.waitForCreated(client, "testCQWithLoad_0", CqQueryDUnitTest.KEY + i);
+    }
+        
+    cqDUnitTest.validateCQ(client, "testCQWithLoad_0", CqQueryDUnitTest.noTest, size, 0, 0);
+        
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server1);
+    cqDUnitTest.closeServer(server2);
+  }
+
+  /**
+   * Test for CQ when entries are evicted from region.
+   * @throws Exception
+   */
+  public void testCQWithEviction() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM client = host.getVM(2);
+    
+    final int evictionThreshold = 1;
+    server1.invoke(new CacheSerializableRunnable("Create Cache Server") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Create Cache Server. ###");
+        AttributesFactory factory = new AttributesFactory();
+        factory.setScope(Scope.DISTRIBUTED_ACK);
+        factory.setDataPolicy(DataPolicy.REPLICATE);
+        //factory.setMirrorType(MirrorType.NONE);
+        // setting the eviction attributes.
+        EvictionAttributes evictAttrs = EvictionAttributes.createLRUEntryAttributes(evictionThreshold, 
+            EvictionAction.OVERFLOW_TO_DISK);
+        factory.setEvictionAttributes(evictAttrs);
+      
+        for (int i = 0; i < cqDUnitTest.regions.length; i++) { 
+          Region region = createRegion(cqDUnitTest.regions[i], factory.createRegionAttributes());
+          // Set CacheListener.
+          region.getAttributesMutator().setCacheListener(new CertifiableTestCacheListener(getLogWriter()));  
+        } 
+        pause(2000);
+        
+        try {
+          cqDUnitTest.startBridgeServer(0, true);
+        } catch (Exception ex) {
+          fail("While starting CacheServer", ex);
+        }
+        pause(2000);
+
+      }
+    });
+        
+    final int port1 = server1.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+      
+    cqDUnitTest.createClient(client, port1, host0);
+    
+    // Create CQs.
+    cqDUnitTest.createCQ(client, "testCQWithEviction_0", cqDUnitTest.cqs[0]);  
+    
+    final int size = 10;
+    
+    // CREATE VALUES.
+    cqDUnitTest.createValues(server1, cqDUnitTest.regions[0], size);
+    
+    cqDUnitTest.executeCQ(client, "testCQWithEviction_0", false, "CqException"); 
+    
+    pause(1 * 1000);
+
+    // Update VALUES.
+    cqDUnitTest.createValues(server1, cqDUnitTest.regions[0], size);
+
+    for (int i=1; i <= size; i++) {
+      cqDUnitTest.waitForUpdated(client, "testCQWithEviction_0", cqDUnitTest.KEY + i);
+    }
+
+    cqDUnitTest.validateCQ(client, "testCQWithEviction_0", cqDUnitTest.noTest, 0, 10, 0);
+        
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server1);
+  }
+
+  /**
+   * Test for CQ with ConnectionPool.
+   * @throws Exception
+   */
+  public void testCQWithConnectionPool() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM client = host.getVM(1);
+
+    cqDUnitTest.createServer(server1, 0, false, MirrorType.KEYS_VALUES);
+
+    final int port1 = server1.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final String serverHost = getServerHostName(server1.getHost());
+
+    final String[] regions = cqDUnitTest.regions;
+    final int[] serverPorts = new int[] {port1};
+
+    // createClientWithConnectionPool
+    SerializableRunnable createClientWithPool =
+      new CacheSerializableRunnable("createClientWithPool") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Create Client. ###");
+        // Initialize CQ Service.
+        try {
+          getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+
+        AttributesFactory regionFactory = new AttributesFactory();
+        regionFactory.setScope(Scope.LOCAL);
+        ClientServerTestCase.configureConnectionPool(regionFactory, serverHost, serverPorts[0], -1, false, -1, -1, null);
+        for (int i=0; i < regions.length; i++) {        
+          createRegion(regions[i], regionFactory.create() );
+          getLogWriter().info("### Successfully Created Region on Client :" + regions[i]);
+        }
+      }
+    };
+
+    client.invoke(createClientWithPool);
+
+    // Create CQs.
+    cqDUnitTest.createCQ(client, "testCQWithPool_0", cqDUnitTest.cqs[0]);  
+
+    // This should fail as Region doesn't have ConnectionPool
+    try {
+      cqDUnitTest.executeCQ(client, "testCQWithPool_0", false,"CqException");
+      fail("CQ Execution should have failed with BridgeClient/Writer not found.");
+    } catch (Exception ex) {
+      // Expected.
+    }
+
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server1);
+  }
+  
+  /**
+   * Test for CQ with BridgeClient.
+   * @throws Exception
+   */
+  public void testCQWithBridgeClient() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM client = host.getVM(1);
+
+    cqDUnitTest.createServer(server1, 0, false, MirrorType.KEYS_VALUES);
+
+    final int port1 = server1.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final String serverHost = getServerHostName(server1.getHost());
+
+    final String[] regions = cqDUnitTest.regions;
+    final int[] serverPorts = new int[] {port1};
+
+    // createClientWithBridgeClient
+    SerializableRunnable createClientWithPool =
+      new CacheSerializableRunnable("createClientWithPool") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Create Client. ###");
+        //Region region1 = null;
+        // Initialize CQ Service.
+        try {
+          getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+
+        AttributesFactory regionFactory = new AttributesFactory();
+        regionFactory.setScope(Scope.LOCAL);
+        ClientServerTestCase.configureConnectionPool(regionFactory, serverHost, serverPorts[0], -1, true, -1, -1, null);
+
+        for (int i=0; i < regions.length; i++) {        
+          createRegion(regions[i], regionFactory.createRegionAttributes());
+          getLogWriter().info("### Successfully Created Region on Client :" + regions[i]);
+        }
+      }
+    };
+
+    client.invoke(createClientWithPool);
+
+    // Create CQs.
+    cqDUnitTest.createCQ(client, "testCQWithPool_1", cqDUnitTest.cqs[0]);  
+
+    // This should pass.
+    cqDUnitTest.executeCQ(client, "testCQWithPool_1", false,null);
+
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server1);
+  }
+  
+  /**
+   * Test for CQ with ConnectionPool.
+   * @throws Exception
+   */
+  public void testCQWithPool() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM client = host.getVM(1);
+
+    cqDUnitTest.createServer(server1, 0, false, MirrorType.KEYS_VALUES);
+
+    final int port1 = server1.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final String serverHost = getServerHostName(server1.getHost());
+
+    final String[] regions = cqDUnitTest.regions;
+    final int[] serverPorts = new int[] {port1};
+
+    // createClientWithConnectionPool
+    SerializableRunnable createClientWithConnectionPool =
+      new CacheSerializableRunnable("createClientWithConnectionPool") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Create Client. ###");
+        //Region region1 = null;
+        // Initialize CQ Service.
+        try {
+          getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+
+        AttributesFactory regionFactory = new AttributesFactory();
+        regionFactory.setScope(Scope.LOCAL);
+        ClientServerTestCase.configureConnectionPool(regionFactory, serverHost, serverPorts[0], -1, true, -1, -1, null);
+        for (int i=0; i < regions.length; i++) {        
+          createRegion(regions[i], regionFactory.createRegionAttributes());
+          getLogWriter().info("### Successfully Created Region on Client :" + regions[i]);
+        }
+      }
+    };
+
+    client.invoke(createClientWithConnectionPool);
+
+    // Create CQs.
+    cqDUnitTest.createCQ(client, "testCQWithPool_2", cqDUnitTest.cqs[0]);  
+
+    // This should pass.
+    cqDUnitTest.executeCQ(client, "testCQWithPool_2", false, null);
+
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server1);
+  }
+
+  /**
+   * Test for CQ with establishCallBackConnection.
+   * @throws Exception
+   */
+  public void testCQWithEstablishCallBackConnection() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM client = host.getVM(1);
+
+    cqDUnitTest.createServer(server1, 0, false, MirrorType.KEYS_VALUES);
+
+    final int port1 = server1.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final String serverHost = getServerHostName(server1.getHost());
+
+    final String[] regions = cqDUnitTest.regions;
+    final int[] serverPorts = new int[] {port1};
+
+    // createClientWithPool
+    SerializableRunnable createClientWithPool =
+      new CacheSerializableRunnable("createClientWithPool") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Create Client. ###");
+        //Region region1 = null;
+        // Initialize CQ Service.
+        try {
+          getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+
+        AttributesFactory regionFactory = new AttributesFactory();
+        regionFactory.setScope(Scope.LOCAL);
+        
+        ClientServerTestCase.configureConnectionPool(regionFactory, serverHost, serverPorts[0], -1, false, -1, -1, null);
+
+        for (int i=0; i < regions.length; i++) {        
+          createRegion(regions[i], regionFactory.createRegionAttributes());
+          getLogWriter().info("### Successfully Created Region on Client :" + regions[i]);
+        }
+      }
+    };
+
+    
+    client.invoke(createClientWithPool);
+
+    // Create CQs.
+    cqDUnitTest.createCQ(client, "testCQWithEstablishCallBackConnection_0", cqDUnitTest.cqs[0]);  
+
+    // This should fail.
+    try {
+      cqDUnitTest.executeCQ(client, "testCQWithEstablishCallBackConnection_0", false, "CqException");
+      fail("Test should have failed with connection with establishCallBackConnection not found.");
+    } catch (Exception ex) {
+      // Expected.
+    }
+
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server1);
+  }
+  
+  /**
+   * Test for:
+   * Region destroy, calls close on the server.
+   * Region clear triggers cqEvent with query op region clear.
+   * Region invalidate triggers cqEvent with query op region invalidate.
+   * @throws Exception
+   */
+  public void testRegionEvents() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    
+    cqDUnitTest.createServer(server);
+    final int port = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    
+    cqDUnitTest.createClient(client, port, host0);
+    
+    // Create CQ on regionA
+    cqDUnitTest.createCQ(client, "testRegionEvents_0", cqDUnitTest.cqs[0]);
+    cqDUnitTest.executeCQ(client, "testRegionEvents_0", false, null);
+    
+    // Create CQ on regionB
+    cqDUnitTest.createCQ(client, "testRegionEvents_1", cqDUnitTest.cqs[2]);
+    cqDUnitTest.executeCQ(client, "testRegionEvents_1", false, null);
+
+    // Test for Event on Region Clear.
+    server.invoke(new CacheSerializableRunnable("testRegionEvents"){
+      public void run2()throws CacheException {
+        getLogWriter().info("### Clearing the region on the server ###");
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        for (int i = 1; i <=5; i++) {
+          region.put(CqQueryDUnitTest.KEY+i, new Portfolio(i));
+        }
+        region.clear();
+      }
+    });
+    
+    cqDUnitTest.waitForRegionClear(client,"testRegionEvents_0");
+
+    // Test for Event on Region invalidate.
+    server.invoke(new CacheSerializableRunnable("testRegionEvents"){
+      public void run2()throws CacheException {
+        getLogWriter().info("### Invalidate the region on the server ###");
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        for (int i = 1; i <=5; i++) {
+          region.put(CqQueryDUnitTest.KEY+i, new Portfolio(i));
+        }
+        region.invalidateRegion();
+      }
+    });
+
+    cqDUnitTest.waitForRegionInvalidate(client,"testRegionEvents_0");
+
+    // Test for Event on Region destroy.
+    server.invoke(new CacheSerializableRunnable("testRegionEvents"){
+      public void run2()throws CacheException {
+        getLogWriter().info("### Destroying the region on the server ###");
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[1]);
+        for (int i = 1; i <=5; i++) {
+          region.put(CqQueryDUnitTest.KEY+i, new Portfolio(i));
+        }
+        // this should close one cq on client.
+        region.destroyRegion();
+      }
+    });
+
+    pause(1000); // wait for cq to close becuse of region destroy on server.
+    //cqDUnitTest.waitForClose(client,"testRegionEvents_1");
+    cqDUnitTest.validateCQCount(client,1);
+
+        
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server);
+
+  }
+
+
+  /**
+   * Test for events created during the CQ query execution.
+   * When CQs are executed using executeWithInitialResults 
+   * there may be possibility that the region changes during
+   * that time may not be reflected in the query result set
+   * thus making the query data and region data inconsistent.
+   * @throws Exception
+   */
+  public void testEventsDuringQueryExecution() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    final String cqName = "testEventsDuringQueryExecution_0";
+    cqDUnitTest.createServer(server);
+    final int port = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    
+    // Initialize Client.
+    cqDUnitTest.createClient(client, port, host0);
+    
+    // create CQ.
+    cqDUnitTest.createCQ(client, cqName, cqDUnitTest.cqs[0]);
+    
+    final int numObjects = 200;
+    final int totalObjects = 500;
+    
+    // initialize Region.
+    server.invoke(new CacheSerializableRunnable("Update Region"){
+      public void run2()throws CacheException {
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        for (int i = 1; i <= numObjects; i++) {
+          Portfolio p = new Portfolio(i);
+          region.put(""+i, p);
+        }
+      }
+    });
+    
+    // Execute CQ while update is in progress.
+    AsyncInvocation processCqs = client.invokeAsync(new CacheSerializableRunnable("Execute CQ") {
+      public void run2()throws CacheException {
+        QueryService cqService = getCache().getQueryService();
+        // Get CqQuery object.
+        CqQuery cq1 = cqService.getCq(cqName);
+        if (cq1 == null) {
+          fail("Failed to get CQ " + cqName);
+        }
+        
+        SelectResults cqResults = null;
+
+        try {
+          cqResults = cq1.executeWithInitialResults();
+        } catch (Exception ex){
+          AssertionError err = new AssertionError("Failed to execute  CQ " + cqName);
+          err.initCause(ex);
+          throw err;
+        }
+        
+        //getLogWriter().info("initial result size = " + cqResults.size());
+        
+        CqQueryTestListener cqListener = (CqQueryTestListener)cq1.getCqAttributes().getCqListener();
+        // Wait for the last key to arrive.
+        cqListener.waitForCreated("" + totalObjects);
+        
+        // Check if the events from CqListener are in order.
+        int oldId = 0;
+        for (Object cqEvent : cqListener.events.toArray()) { 
+          int newId = new Integer(cqEvent.toString()).intValue();
+          if (oldId > newId){
+            fail("Queued events for CQ Listener during execution with " + 
+                "Initial results is not in the order in which they are created.");
+          }
+          oldId = newId;
+        }
+        
+        // Check if all the IDs are present as part of Select Results and CQ Events.
+        HashSet ids = new HashSet(cqListener.events);
+        for (Object o : cqResults.asList()) {
+          Struct s = (Struct)o;
+          ids.add(s.get("key"));
+        }
+
+        //Iterator iter = cqResults.asSet().iterator();
+        //while (iter.hasNext()) {
+        //  Portfolio p = (Portfolio)iter.next();
+        //  ids.add(p.getPk());
+        //  //getLogWriter().info("Result set value : " + p.getPk());
+        //}
+        
+        HashSet missingIds = new HashSet();
+        String key = "";
+        for (int i = 1; i <= totalObjects; i++) {
+          key = "" + i;
+          if (!(ids.contains(key))){
+            missingIds.add(key);
+          }
+        }
+        
+        if (!missingIds.isEmpty()) {
+          fail("Missing Keys in either ResultSet or the Cq Event list. " +
+              " Missing keys : [size : " + missingIds.size() + "]" + missingIds +
+              " Ids in ResultSet and CQ Events :" + ids);
+        }
+        
+      } 
+    });
+    
+    // Keep updating region (async invocation).
+    server.invokeAsync(new CacheSerializableRunnable("Update Region"){
+      public void run2()throws CacheException {
+        //Wait to allow client a chance to register the cq
+        try {
+          Thread.sleep(1000);
+        } catch (InterruptedException e) {
+          Thread.currentThread().interrupt();
+        }
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        for (int i = numObjects + 1; i <= totalObjects; i++) {
+          Portfolio p = new Portfolio(i);
+          region.put(""+i, p);
+        }
+      }
+    });
+
+    //wait for 60 seconds for test to complete
+    DistributedTestCase.join(processCqs, 60 * 1000, getLogWriter());
+    
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server);
+  }
+  
+  /**
+   * This test was created to test executeWithInitialResults being called
+   * multiple times. Previously, the queueEvents would be overwritten and we
+   * would lose data. This test will execute the method twice. The first time,
+   * the first execution will block it's own child thread (TC1). The second
+   * execution will block until TC1 is completed (based on how
+   * executeWithInitialResults is implemented) A third thread will be awaken and
+   * release the latch in the testhook for TC1 to complete.
+   * 
+   * @throws Exception
+   */
+  public void testMultipleExecuteWithInitialResults() throws Exception {
+    final int numObjects = 200;
+    final int totalObjects = 500;
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    client.invoke(setTestHook());
+    final String cqName = "testMultiExecuteWithInitialResults";
+
+    // initialize server and retreive host and port values
+    cqDUnitTest.createServer(server);
+    final int port = server.invokeInt(CqQueryDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+
+    // Initialize Client.
+    cqDUnitTest.createClient(client, port, host0);
+
+    // create CQ.
+    cqDUnitTest.createCQ(client, cqName, cqDUnitTest.cqs[0]);
+
+    // initialize Region.
+    server.invoke(new CacheSerializableRunnable("Update Region") {
+      public void run2() throws CacheException {
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        for (int i = 1; i <= numObjects; i++) {
+          Portfolio p = new Portfolio(i);
+          region.put("" + i, p);
+        }
+      }
+    });
+
+    // Keep updating region (async invocation).
+    server.invokeAsync(new CacheSerializableRunnable("Update Region") {
+      public void run2() throws CacheException {
+        //Wait to give client a chance to register the cq
+        try {
+          Thread.sleep(1000);
+        } catch (InterruptedException e) {
+          Thread.currentThread().interrupt();
+        }
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        for (int i = numObjects + 1; i <= totalObjects; i++) {
+          Portfolio p = new Portfolio(i);
+          region.put("" + i, p);
+        }
+      }
+    });
+    
+    // the thread that validates all results and executes first
+    AsyncInvocation processCqs =client.invokeAsync(new CacheSerializableRunnable("Execute CQ first") {
+      public void run2() throws CacheException {
+        SelectResults cqResults = null;
+        QueryService cqService = getCache().getQueryService();
+        // Get CqQuery object.
+        CqQuery cq1 = cqService.getCq(cqName);
+        if (cq1 == null) {
+          fail("Failed to get CQ " + cqName);
+        }
+        try {
+          cqResults = cq1.executeWithInitialResults();
+
+        } catch (Exception e) {
+          AssertionError err = new AssertionError("Failed to execute  CQ "
+              + cqName);
+          err.initCause(e);
+          throw err;
+        }
+
+        CqQueryTestListener cqListener = (CqQueryTestListener) cq1
+            .getCqAttributes().getCqListener();
+        // Wait for the last key to arrive.
+        cqListener.waitForCreated("" + totalObjects);
+        // Check if the events from CqListener are in order.
+        int oldId = 0;
+        for (Object cqEvent : cqListener.events.toArray()) {
+          int newId = new Integer(cqEvent.toString()).intValue();
+          if (oldId > newId) {
+            fail("Queued events for CQ Listener during execution with "
+                + "Initial results is not in the order in which they are created.");
+          }
+          oldId = newId;
+        }
+
+        // Check if all the IDs are present as part of Select Results and CQ
+        // Events.
+        HashSet ids = new HashSet(cqListener.events);
+        for (Object o : cqResults.asList()) {
+          Struct s = (Struct) o;
+          ids.add(s.get("key"));
+        }
+
+        HashSet missingIds = new HashSet();
+        String key = "";
+        for (int i = 1; i <= totalObjects; i++) {
+          key = "" + i;
+          if (!(ids.contains(key))) {
+            missingIds.add(key);
+          }
+        }
+
+        if (!missingIds.isEmpty()) {
+          fail("Missing Keys in either ResultSet or the Cq Event list. "
+              + " Missing keys : [size : " + missingIds.size() + "]"
+              + missingIds + " Ids in ResultSet and CQ Events :" + ids);
+        }
+      }
+    });
+
+    // the second call to executeWithInitialResults. Goes to sleep hopefully
+    // long enough
+    // for the first call to executeWithInitialResults first
+    client.invokeAsync(new CacheSerializableRunnable("Execute CQ second") {
+      public void run2() throws CacheException {
+        try {
+          Thread.sleep(2000);
+        } catch (InterruptedException e) {
+          Thread.currentThread().interrupt();
+        }
+        QueryService cqService = getCache().getQueryService();
+        // Get CqQuery object.
+        CqQuery cq1 = cqService.getCq(cqName);
+        if (cq1 == null) {
+          fail("Failed to get CQ " + cqName);
+        }
+        try {
+          cq1.executeWithInitialResults();
+        } catch (IllegalStateException e) {
+          // we expect an error due to the cq having already being in run state
+        } catch (Exception e) {
+          AssertionError err = new AssertionError("test hook lock interrupted"
+              + cqName);
+          err.initCause(e);
+          throw err;
+        }
+      }
+    });
+
+    // thread that unlatches the test hook, sleeping long enough for both
+    // the other two threads to execute first
+    client.invokeAsync(new CacheSerializableRunnable("Release latch") {
+      public void run2() throws CacheException {
+        // we wait to release the testHook and hope the other two threads have
+        // had a chance to invoke executeWithInitialResults
+        try {
+          Thread.sleep(5000);
+        } catch (InterruptedException e) {
+          Thread.currentThread().interrupt();
+          AssertionError err = new AssertionError("test hook lock interrupted"
+              + cqName);
+          err.initCause(e);
+          throw err;
+        }
+        CqQueryImpl.testHook.ready();
+      }
+    });
+
+    //wait for 60 seconds for test to complete
+    DistributedTestCase.join(processCqs, 60 * 1000, getLogWriter());
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server);
+  }
+
+  public CacheSerializableRunnable setTestHook() {
+    SerializableRunnable sr = new CacheSerializableRunnable("TestHook") {
+      public void run2() {
+        class CqQueryTestHook implements CqQueryImpl.TestHook {
+
+          CountDownLatch latch = new CountDownLatch(1);
+
+          public void pauseUntilReady() {
+            try {
+              latch.await();
+            } catch (Exception e) {
+              e.printStackTrace();
+              Thread.currentThread().interrupt();
+            }
+          }
+
+          public void ready() {
+            latch.countDown();
+          }
+
+          @Override
+          public int numQueuedEvents() {
+            // TODO Auto-generated method stub
+            return 0;
+          }
+
+          @Override
+          public void setEventCount(int count) {
+            // TODO Auto-generated method stub
+            
+          }
+
+        }
+        ;
+        CqQueryImpl.testHook = new CqQueryTestHook();
+      }
+    };
+    return (CacheSerializableRunnable) sr;
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
new file mode 100644
index 0000000..9ea420d
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
@@ -0,0 +1,46 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.query.cq.dunit;
+
+
+import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
+
+import dunit.SerializableRunnable;
+
+/**
+ * Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
+ *
+ */
+public class CqDataOptimizedExecuteDUnitTest extends CqDataDUnitTest{
+
+  public CqDataOptimizedExecuteDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+    //We're seeing this on the server when the client
+    //disconnects.
+    addExpectedException("Connection reset");
+    invokeInEveryVM(new SerializableRunnable("getSystem") {
+      public void run() {
+        CqServiceImpl.EXECUTE_QUERY_DURING_INIT = false;
+      }
+    });
+  }
+  
+  @Override
+  public void tearDown2() throws Exception {
+    invokeInEveryVM(new SerializableRunnable("getSystem") {
+      public void run() {
+        CqServiceImpl.EXECUTE_QUERY_DURING_INIT = true;
+      }
+    });
+    super.tearDown2();
+  }
+}


[12/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPropogationOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPropogationOffHeapDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPropogationOffHeapDUnitTest.java
new file mode 100644
index 0000000..d61bed7
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPropogationOffHeapDUnitTest.java
@@ -0,0 +1,18 @@
+package com.gemstone.gemfire.internal.cache.wan.offheap;
+
+import com.gemstone.gemfire.internal.cache.wan.serial.SerialWANPropogationDUnitTest;
+
+@SuppressWarnings("serial")
+public class SerialWANPropogationOffHeapDUnitTest extends
+    SerialWANPropogationDUnitTest {
+
+  public SerialWANPropogationOffHeapDUnitTest(String name) {
+    super(name);
+  }
+
+  @Override
+  public boolean isOffHeap() {
+    return true;
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPropogation_PartitionedRegionOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPropogation_PartitionedRegionOffHeapDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPropogation_PartitionedRegionOffHeapDUnitTest.java
new file mode 100644
index 0000000..6dd805d
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPropogation_PartitionedRegionOffHeapDUnitTest.java
@@ -0,0 +1,18 @@
+package com.gemstone.gemfire.internal.cache.wan.offheap;
+
+import com.gemstone.gemfire.internal.cache.wan.serial.SerialWANPropogation_PartitionedRegionDUnitTest;
+
+@SuppressWarnings("serial")
+public class SerialWANPropogation_PartitionedRegionOffHeapDUnitTest extends
+    SerialWANPropogation_PartitionedRegionDUnitTest {
+
+  public SerialWANPropogation_PartitionedRegionOffHeapDUnitTest(String name) {
+    super(name);
+  }
+
+  @Override
+  public boolean isOffHeap() {
+    return true;
+  }
+
+}


[59/70] incubator-geode git commit: GEODE-803: Updating headers on WAN and CQ code

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
index 6d465f0..14affa6 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
index 29ed0a4..56d8f77 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
index b66228e..2109e24 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
index b7eaaa2..fdb46c3 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
index 47a3fe7..249f3da 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
index 1a61233..9769ddd 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqTimeTestListener.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqTimeTestListener.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqTimeTestListener.java
index 4948fe9..cd75e97 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqTimeTestListener.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqTimeTestListener.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
index 1dbb1d7..a236909 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
index a9a1ac8..4bbc5e7 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
index 14c4f9d..c8e502f 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
index 1e165c9..c890c87 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java
index 51a60d2..15a74ce 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.cache.query.dunit;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
index de1ed89..7129f62 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
@@ -1,500 +1,500 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.gemstone.gemfire.cache.query.dunit;
-
-import java.io.IOException;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-
-import com.gemstone.gemfire.LogWriter;
-import com.gemstone.gemfire.cache.AttributesFactory;
-import com.gemstone.gemfire.cache.Cache;
-import com.gemstone.gemfire.cache.CacheException;
-import com.gemstone.gemfire.cache.CacheFactory;
-import com.gemstone.gemfire.cache.DataPolicy;
-import com.gemstone.gemfire.cache.PartitionAttributes;
-import com.gemstone.gemfire.cache.PartitionAttributesFactory;
-import com.gemstone.gemfire.cache.Scope;
-import com.gemstone.gemfire.cache.client.PoolFactory;
-import com.gemstone.gemfire.cache.client.PoolManager;
-import com.gemstone.gemfire.cache.query.CacheUtils;
-import com.gemstone.gemfire.cache.query.CqAttributes;
-import com.gemstone.gemfire.cache.query.CqEvent;
-import com.gemstone.gemfire.cache.query.CqListener;
-import com.gemstone.gemfire.cache.query.CqQuery;
-import com.gemstone.gemfire.cache.query.Query;
-import com.gemstone.gemfire.cache.query.QueryService;
-import com.gemstone.gemfire.cache.query.SelectResults;
-import com.gemstone.gemfire.cache.query.Struct;
-import com.gemstone.gemfire.cache.query.cq.dunit.CqQueryTestListener;
-import com.gemstone.gemfire.cache.query.data.PortfolioPdx;
-import com.gemstone.gemfire.cache.query.data.PositionPdx;
-import com.gemstone.gemfire.cache.server.CacheServer;
-import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
-import com.gemstone.gemfire.cache30.CacheTestCase;
-import com.gemstone.gemfire.compression.Compressor;
-import com.gemstone.gemfire.compression.SnappyCompressor;
-import com.gemstone.gemfire.i18n.LogWriterI18n;
-import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-import com.gemstone.gemfire.pdx.PdxReader;
-import com.gemstone.gemfire.pdx.PdxSerializable;
-import com.gemstone.gemfire.pdx.PdxWriter;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
-
-public abstract class PdxQueryCQTestBase extends CacheTestCase {
-
-  /** The port on which the bridge server was started in this VM */
-  private static int bridgeServerPort;
-  protected static final Compressor compressor = SnappyCompressor.getDefaultInstance();
-  protected final String rootRegionName = "root";
-  protected final String regionName = "PdxTest";
-  protected final String regionName2 = "PdxTest2";
-  protected final String regName = "/" + rootRegionName + "/" + regionName;
-  protected final String regName2 = "/" + rootRegionName + "/" + regionName2;
-  protected final String[] queryString = new String[] {
-      "SELECT DISTINCT id FROM " + regName, // 0
-      "SELECT * FROM " + regName, // 1
-      "SELECT ticker FROM " + regName, // 2
-      "SELECT * FROM " + regName + " WHERE id > 5", // 3
-      "SELECT p FROM " + regName + " p, p.idTickers idTickers WHERE p.ticker = 'vmware'", // 4
-    };
-
-  private static int getCacheServerPort() {
-    return bridgeServerPort;
-  }
-
-  public void tearDown2() throws Exception {
-    disconnectAllFromDS(); // tests all expect to create a new ds
-    // Reset the testObject numinstance for the next test.
-    TestObject.numInstance = 0;
-    // In all VM.
-    resetTestObjectInstanceCount();    
-  }
-
-  private void resetTestObjectInstanceCount() {
-    final Host host = Host.getHost(0);
-    for (int i=0; i < 4; i++) {
-      VM vm = host.getVM(i);
-      vm.invoke(new CacheSerializableRunnable("Create Bridge Server") {
-        public void run2() throws CacheException {
-          TestObject.numInstance = 0;
-          PortfolioPdx.numInstance = 0;
-          PositionPdx.numInstance = 0;
-          PositionPdx.cnt = 0;
-          TestObject2.numInstance = 0;
-        }
-      });
-    }
-  }
-
-  public void createPool(VM vm, String poolName, String server, int port,
-      boolean subscriptionEnabled) {
-        createPool(vm, poolName, new String[]{server}, new int[]{port}, subscriptionEnabled);  
-      }
-
-  public void createPool(VM vm, String poolName, String server, int port) {
-    createPool(vm, poolName, new String[]{server}, new int[]{port}, false);  
-  }
-
-  public void createPool(VM vm, final String poolName, final String[] servers, final int[] ports,
-      final boolean subscriptionEnabled) {
-        createPool(vm, poolName, servers, ports, subscriptionEnabled, 0);    
-      }
-
-  public void createPool(VM vm, final String poolName, final String[] servers, final int[] ports,
-      final boolean subscriptionEnabled, final int redundancy) {
-        vm.invoke(new CacheSerializableRunnable("createPool :" + poolName) {
-          public void run2() throws CacheException {
-            // Create Cache.
-            Properties props = new Properties();
-            props.setProperty("mcast-port", "0");
-            props.setProperty("locators", "");
-            getSystem(props );
-            getCache();        
-            PoolFactory cpf = PoolManager.createFactory();
-            cpf.setSubscriptionEnabled(subscriptionEnabled);
-            cpf.setSubscriptionRedundancy(redundancy);
-            for (int i=0; i < servers.length; i++){
-              getLogWriter().info("### Adding to Pool. ### Server : " + servers[i] + " Port : " + ports[i]);
-              cpf.addServer(servers[i], ports[i]);
-            }
-            cpf.create(poolName);
-          }
-        });   
-      }
-
-  public void executeClientQueries(VM vm, final String poolName, final String queryStr) {
-    vm.invoke(new CacheSerializableRunnable("Execute queries") {
-      public void run2() throws CacheException {
-        SelectResults results = null;
-        Comparator comparator = null;
-        Object[] resultsArray = null;
-        QueryService remoteQueryService = null;
-        QueryService localQueryService = null;
-        SelectResults[][] rs = new SelectResults[1][2];
-        
-        try {
-          remoteQueryService = (PoolManager.find(poolName)).getQueryService();
-          localQueryService = getCache().getQueryService();
-        } catch (Exception e) {
-          fail("Failed to get QueryService.", e);
-        }          
-  
-        try {
-          getLogWriter().info("### Executing Query on server:" + queryStr);
-          Query query = remoteQueryService.newQuery(queryStr);
-          rs[0][0] = (SelectResults)query.execute();
-          //printResults (rs[0][0], " ### Remote Query Results : ####");
-          getLogWriter().info("### Executing Query locally:" + queryStr);
-          query = localQueryService.newQuery(queryStr);
-          rs[0][1] = (SelectResults)query.execute();
-          getLogWriter().info("### Remote Query rs size: " + (rs[0][0]).size() + 
-              "Local Query rs size: " + (rs[0][1]).size());
-          //printResults (rs[0][1], " ### Local Query Results : ####");
-          // Compare local and remote query results.
-          if (!CacheUtils.compareResultsOfWithAndWithoutIndex(rs))
-          {
-             fail("Local and Remote Query Results are not matching for query :" + queryStr);  
-          }
-        } catch (Exception e) {
-          fail("Failed executing " + queryStr, e);
-        }
-      }
-    });
-  }
-
-  public void printResults(SelectResults results, String message) {
-    Object r;
-    Struct s;
-    LogWriterI18n logger = GemFireCacheImpl.getInstance().getLoggerI18n();
-    logger.fine(message);
-    int row = 0;
-    for (Iterator iter = results.iterator(); iter.hasNext(); ) {
-      r = iter.next();
-      row++;
-      if (r instanceof Struct) {
-         s = (Struct)r;
-         String[] fieldNames = ((Struct)r).getStructType().getFieldNames();
-         for (int i=0; i < fieldNames.length; i++){
-            logger.fine("### Row " + row  + "\n" + "Field: " +
-                fieldNames[i] + " > " + s.get(fieldNames[i]).toString());
-         }
-      } else {
-        logger.fine("#### Row " + row + "\n" + r);
-      }
-    }
-  }
-
-  protected void configAndStartBridgeServer() {
-    configAndStartBridgeServer(false, false, false, null); 
-  }
-
-  protected void configAndStartBridgeServer(boolean isPr, boolean isAccessor) {
-    configAndStartBridgeServer(false, false, false, null); 
-  }
-
-  protected void configAndStartBridgeServer(boolean isPr, boolean isAccessor,
-      boolean asyncIndex, Compressor compressor) {
-        AttributesFactory factory = new AttributesFactory();
-        if (isPr) {
-          PartitionAttributesFactory paf = new PartitionAttributesFactory();
-          //factory.setDataPolicy(DataPolicy.PARTITION);
-          if (isAccessor){
-            paf.setLocalMaxMemory(0);
-          }
-          PartitionAttributes prAttr = paf.setTotalNumBuckets(20).setRedundantCopies(0).create();
-          factory.setPartitionAttributes(prAttr);
-        } else {
-          factory.setScope(Scope.DISTRIBUTED_ACK);
-          factory.setDataPolicy(DataPolicy.REPLICATE);      
-        }
-        if (asyncIndex) {
-          factory.setIndexMaintenanceSynchronous(!asyncIndex);
-        }
-        if (compressor != null) {
-          factory.setCompressor(compressor);
-        }
-        
-        createRegion(this.regionName, this.rootRegionName, factory.create());
-        createRegion(this.regionName2, this.rootRegionName, factory.create());
-        
-        try {
-          startBridgeServer(0, false);
-        } catch (Exception ex) {
-          fail("While starting CacheServer", ex);
-        }
-      }
-
-  protected void executeCompiledQueries(String poolName, Object[][] params) {
-    SelectResults results = null;
-    Comparator comparator = null;
-    Object[] resultsArray = null;
-    QueryService qService = null;
-  
-    try {
-      qService = (PoolManager.find(poolName)).getQueryService();
-    } catch (Exception e) {
-      fail("Failed to get QueryService.", e);
-    }          
-  
-    for (int i=0; i < queryString.length; i++){
-      try {
-        getLogWriter().info("### Executing Query :" + queryString[i]);
-        Query query = qService.newQuery(queryString[i]);
-        results = (SelectResults)query.execute(params[i]);
-      } catch (Exception e) {
-        fail("Failed executing " + queryString[i], e);
-      }
-    }        
-  }
-
-  /**
-   * Starts a bridge server on the given port, using the given
-   * deserializeValues and notifyBySubscription to serve up the
-   * given region.
-   */
-  protected void startBridgeServer(int port, boolean notifyBySubscription)
-      throws IOException {
-      
-        Cache cache = getCache();
-        CacheServer bridge = cache.addCacheServer();
-        bridge.setPort(port);
-        bridge.setNotifyBySubscription(notifyBySubscription);
-        bridge.start();
-        bridgeServerPort = bridge.getPort();
-      }
-
-  /**
-   * Stops the bridge server that serves up the given cache.
-   */
-  protected void stopBridgeServer(Cache cache) {
-    CacheServer bridge =
-      (CacheServer) cache.getCacheServers().iterator().next();
-    bridge.stop();
-    assertFalse(bridge.isRunning());
-  }
-
-  public void closeClient(VM client) {
-    SerializableRunnable closeCache =
-      new CacheSerializableRunnable("Close Client") {
-      public void run2() throws CacheException {
-        getLogWriter().info("### Close Client. ###");
-        try {
-          closeCache();
-          disconnectFromDS();
-        } catch (Exception ex) {
-          getLogWriter().info("### Failed to get close client. ###");
-        }
-      }
-    };
-    
-    client.invoke(closeCache);
-  }
-
-  public static class TestObject2 implements PdxSerializable {
-    public int _id;
-    public static int numInstance = 0;
-    
-    public TestObject2(){
-      numInstance++;
-    }
-    
-    public TestObject2(int id){
-      this._id = id;
-      numInstance++;
-    }
-    
-    public int getId() {
-      return this._id;
-    }
-    
-    public void toData(PdxWriter out) {
-      out.writeInt("id", this._id);
-    }
-    
-    public void fromData(PdxReader in) {
-      this._id = in.readInt("id");
-    }
-    
-    @Override
-    public boolean equals(Object o){
-      getLogWriter().info("In TestObject2.equals() this: " + this + " other :" + o);
-      GemFireCacheImpl.getInstance().getLoggerI18n().fine("In TestObject2.equals() this: " + this + " other :" + o);
-      TestObject2 other = (TestObject2)o;
-      if (_id == other._id) {
-        return true;
-      } else {
-        getLogWriter().info("NOT EQUALS");  
-        return false;
-      }
-    }
-    
-    @Override
-    public int hashCode(){
-      GemFireCacheImpl.getInstance().getLoggerI18n().fine("In TestObject2.hashCode() : " + this._id);
-      return this._id;
-    }
-  }
-
-  public static class TestObject implements PdxSerializable {
-      public static LogWriter log;
-      protected String _ticker;
-      protected int _price;
-      public int id;
-      public int important;
-      public int selection;
-      public int select;
-      public static int numInstance = 0;
-      public Map idTickers = new HashMap();
-      public HashMap positions = new HashMap();
-      public TestObject2 test;
-      
-      public TestObject() {
-        if (log != null) {
-          log.info("TestObject ctor stack trace", new Exception());
-        }
-        numInstance++;
-        //GemFireCacheImpl.getInstance().getLoggerI18n().fine(new Exception("DEBUG"));
-      }
-  
-      public TestObject(int id, String ticker) {
-        if (log != null) {
-          log.info("TestObject ctor stack trace", new Exception());
-        }
-        this.id = id;
-        this._ticker = ticker;
-        this._price = id;
-        this.important = id;
-        this.selection =id;
-        this.select =id;
-        //GemFireCacheImpl.getInstance().getLoggerI18n().fine(new Exception("DEBUG"));
-        numInstance++;
-        idTickers.put(id + "", ticker);
-        this.test = new TestObject2(id);
-      }
-  
-      public TestObject(int id, String ticker, int numPositions) {
-        this(id, ticker);
-        for (int i=0; i < numPositions; i++) {
-          positions.put(id + i, new PositionPdx(ticker + ":" +  id + ":" + i , (id + 100)));
-        }
-      }
-      
-      public int getIdValue() {
-        return this.id;
-      }
-  
-      public String getTicker() {
-        return this._ticker;
-      }
-  
-      public int getPriceValue() {
-        return this._price;
-      }
-  
-      public HashMap getPositions(String id) {
-        return this.positions;  
-      }
-  
-      public String getStatus(){
-        return (id % 2 == 0) ? "active" : "inactive";
-      }
-  
-      public void toData(PdxWriter out)
-      {
-        //System.out.println("Is serializing in WAN: " + GatewayEventImpl.isSerializingValue());
-        out.writeInt("id", this.id);
-        out.writeString("ticker", this._ticker);
-        out.writeInt("price", this._price);
-        out.writeObject("idTickers", this.idTickers);
-        out.writeObject("positions", this.positions);
-        out.writeObject("test", this.test);
-      }
-  
-      public void fromData(PdxReader in)
-      {
-        //System.out.println("Is deserializing in WAN: " + GatewayEventImpl.isDeserializingValue());
-        this.id = in.readInt("id");
-        this._ticker = in.readString("ticker");
-        this._price = in.readInt("price");
-        this.idTickers = (Map)in.readObject("idTickers");
-        this.positions = (HashMap)in.readObject("positions");
-        this.test = (TestObject2)in.readObject("test");
-      }
-  
-      public String toString() {
-        StringBuffer buffer = new StringBuffer();
-        buffer
-        .append("TestObject [")
-        .append("id=")
-        .append(this.id)
-        .append("; ticker=")
-        .append(this._ticker)
-        .append("; price=")
-        .append(this._price)
-        .append("]");
-        return buffer.toString();
-      }
-  
-      @Override
-      public boolean equals(Object o){
-  //      getLogWriter().info("In TestObject.equals() this: " + this + " other :" + o);
-  //      GemFireCacheImpl.getInstance().getLoggerI18n().fine("In TestObject.equals() this: " + this + " other :" + o);
-        TestObject other = (TestObject)o;
-        if ((id == other.id) && (_ticker.equals(other._ticker))) {
-          return true;
-        } else {
-  //        getLogWriter().info("NOT EQUALS");  
-          return false;
-        }
-      }
-      
-      @Override
-      public int hashCode(){
-        GemFireCacheImpl.getInstance().getLoggerI18n().fine("In TestObject.hashCode() : " + this.id);
-        return this.id;
-      }
-  
-    }
-
-  /**
-   * Starts a bridge server on the given port, using the given
-   * deserializeValues and notifyBySubscription to serve up the
-   * given region.
-   */
-  protected void startCacheServer(int port, boolean notifyBySubscription)
-      throws IOException {
-      
-        Cache cache = CacheFactory.getAnyInstance();
-        CacheServer bridge = cache.addCacheServer();
-        bridge.setPort(port);
-        bridge.setNotifyBySubscription(notifyBySubscription);
-        bridge.start();
-        bridgeServerPort = bridge.getPort();
-      }
-
-  public PdxQueryCQTestBase(String name) {
-    super(name);
-  }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.cache.query.dunit;
+
+import java.io.IOException;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+
+import com.gemstone.gemfire.LogWriter;
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.PartitionAttributes;
+import com.gemstone.gemfire.cache.PartitionAttributesFactory;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.client.PoolFactory;
+import com.gemstone.gemfire.cache.client.PoolManager;
+import com.gemstone.gemfire.cache.query.CacheUtils;
+import com.gemstone.gemfire.cache.query.CqAttributes;
+import com.gemstone.gemfire.cache.query.CqEvent;
+import com.gemstone.gemfire.cache.query.CqListener;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.Query;
+import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.cache.query.SelectResults;
+import com.gemstone.gemfire.cache.query.Struct;
+import com.gemstone.gemfire.cache.query.cq.dunit.CqQueryTestListener;
+import com.gemstone.gemfire.cache.query.data.PortfolioPdx;
+import com.gemstone.gemfire.cache.query.data.PositionPdx;
+import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.cache30.CacheTestCase;
+import com.gemstone.gemfire.compression.Compressor;
+import com.gemstone.gemfire.compression.SnappyCompressor;
+import com.gemstone.gemfire.i18n.LogWriterI18n;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.pdx.PdxReader;
+import com.gemstone.gemfire.pdx.PdxSerializable;
+import com.gemstone.gemfire.pdx.PdxWriter;
+
+import dunit.Host;
+import dunit.SerializableRunnable;
+import dunit.VM;
+
+public abstract class PdxQueryCQTestBase extends CacheTestCase {
+
+  /** The port on which the bridge server was started in this VM */
+  private static int bridgeServerPort;
+  protected static final Compressor compressor = SnappyCompressor.getDefaultInstance();
+  protected final String rootRegionName = "root";
+  protected final String regionName = "PdxTest";
+  protected final String regionName2 = "PdxTest2";
+  protected final String regName = "/" + rootRegionName + "/" + regionName;
+  protected final String regName2 = "/" + rootRegionName + "/" + regionName2;
+  protected final String[] queryString = new String[] {
+      "SELECT DISTINCT id FROM " + regName, // 0
+      "SELECT * FROM " + regName, // 1
+      "SELECT ticker FROM " + regName, // 2
+      "SELECT * FROM " + regName + " WHERE id > 5", // 3
+      "SELECT p FROM " + regName + " p, p.idTickers idTickers WHERE p.ticker = 'vmware'", // 4
+    };
+
+  private static int getCacheServerPort() {
+    return bridgeServerPort;
+  }
+
+  public void tearDown2() throws Exception {
+    disconnectAllFromDS(); // tests all expect to create a new ds
+    // Reset the testObject numinstance for the next test.
+    TestObject.numInstance = 0;
+    // In all VM.
+    resetTestObjectInstanceCount();    
+  }
+
+  private void resetTestObjectInstanceCount() {
+    final Host host = Host.getHost(0);
+    for (int i=0; i < 4; i++) {
+      VM vm = host.getVM(i);
+      vm.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+        public void run2() throws CacheException {
+          TestObject.numInstance = 0;
+          PortfolioPdx.numInstance = 0;
+          PositionPdx.numInstance = 0;
+          PositionPdx.cnt = 0;
+          TestObject2.numInstance = 0;
+        }
+      });
+    }
+  }
+
+  public void createPool(VM vm, String poolName, String server, int port,
+      boolean subscriptionEnabled) {
+        createPool(vm, poolName, new String[]{server}, new int[]{port}, subscriptionEnabled);  
+      }
+
+  public void createPool(VM vm, String poolName, String server, int port) {
+    createPool(vm, poolName, new String[]{server}, new int[]{port}, false);  
+  }
+
+  public void createPool(VM vm, final String poolName, final String[] servers, final int[] ports,
+      final boolean subscriptionEnabled) {
+        createPool(vm, poolName, servers, ports, subscriptionEnabled, 0);    
+      }
+
+  public void createPool(VM vm, final String poolName, final String[] servers, final int[] ports,
+      final boolean subscriptionEnabled, final int redundancy) {
+        vm.invoke(new CacheSerializableRunnable("createPool :" + poolName) {
+          public void run2() throws CacheException {
+            // Create Cache.
+            Properties props = new Properties();
+            props.setProperty("mcast-port", "0");
+            props.setProperty("locators", "");
+            getSystem(props );
+            getCache();        
+            PoolFactory cpf = PoolManager.createFactory();
+            cpf.setSubscriptionEnabled(subscriptionEnabled);
+            cpf.setSubscriptionRedundancy(redundancy);
+            for (int i=0; i < servers.length; i++){
+              getLogWriter().info("### Adding to Pool. ### Server : " + servers[i] + " Port : " + ports[i]);
+              cpf.addServer(servers[i], ports[i]);
+            }
+            cpf.create(poolName);
+          }
+        });   
+      }
+
+  public void executeClientQueries(VM vm, final String poolName, final String queryStr) {
+    vm.invoke(new CacheSerializableRunnable("Execute queries") {
+      public void run2() throws CacheException {
+        SelectResults results = null;
+        Comparator comparator = null;
+        Object[] resultsArray = null;
+        QueryService remoteQueryService = null;
+        QueryService localQueryService = null;
+        SelectResults[][] rs = new SelectResults[1][2];
+        
+        try {
+          remoteQueryService = (PoolManager.find(poolName)).getQueryService();
+          localQueryService = getCache().getQueryService();
+        } catch (Exception e) {
+          fail("Failed to get QueryService.", e);
+        }          
+  
+        try {
+          getLogWriter().info("### Executing Query on server:" + queryStr);
+          Query query = remoteQueryService.newQuery(queryStr);
+          rs[0][0] = (SelectResults)query.execute();
+          //printResults (rs[0][0], " ### Remote Query Results : ####");
+          getLogWriter().info("### Executing Query locally:" + queryStr);
+          query = localQueryService.newQuery(queryStr);
+          rs[0][1] = (SelectResults)query.execute();
+          getLogWriter().info("### Remote Query rs size: " + (rs[0][0]).size() + 
+              "Local Query rs size: " + (rs[0][1]).size());
+          //printResults (rs[0][1], " ### Local Query Results : ####");
+          // Compare local and remote query results.
+          if (!CacheUtils.compareResultsOfWithAndWithoutIndex(rs))
+          {
+             fail("Local and Remote Query Results are not matching for query :" + queryStr);  
+          }
+        } catch (Exception e) {
+          fail("Failed executing " + queryStr, e);
+        }
+      }
+    });
+  }
+
+  public void printResults(SelectResults results, String message) {
+    Object r;
+    Struct s;
+    LogWriterI18n logger = GemFireCacheImpl.getInstance().getLoggerI18n();
+    logger.fine(message);
+    int row = 0;
+    for (Iterator iter = results.iterator(); iter.hasNext(); ) {
+      r = iter.next();
+      row++;
+      if (r instanceof Struct) {
+         s = (Struct)r;
+         String[] fieldNames = ((Struct)r).getStructType().getFieldNames();
+         for (int i=0; i < fieldNames.length; i++){
+            logger.fine("### Row " + row  + "\n" + "Field: " +
+                fieldNames[i] + " > " + s.get(fieldNames[i]).toString());
+         }
+      } else {
+        logger.fine("#### Row " + row + "\n" + r);
+      }
+    }
+  }
+
+  protected void configAndStartBridgeServer() {
+    configAndStartBridgeServer(false, false, false, null); 
+  }
+
+  protected void configAndStartBridgeServer(boolean isPr, boolean isAccessor) {
+    configAndStartBridgeServer(false, false, false, null); 
+  }
+
+  protected void configAndStartBridgeServer(boolean isPr, boolean isAccessor,
+      boolean asyncIndex, Compressor compressor) {
+        AttributesFactory factory = new AttributesFactory();
+        if (isPr) {
+          PartitionAttributesFactory paf = new PartitionAttributesFactory();
+          //factory.setDataPolicy(DataPolicy.PARTITION);
+          if (isAccessor){
+            paf.setLocalMaxMemory(0);
+          }
+          PartitionAttributes prAttr = paf.setTotalNumBuckets(20).setRedundantCopies(0).create();
+          factory.setPartitionAttributes(prAttr);
+        } else {
+          factory.setScope(Scope.DISTRIBUTED_ACK);
+          factory.setDataPolicy(DataPolicy.REPLICATE);      
+        }
+        if (asyncIndex) {
+          factory.setIndexMaintenanceSynchronous(!asyncIndex);
+        }
+        if (compressor != null) {
+          factory.setCompressor(compressor);
+        }
+        
+        createRegion(this.regionName, this.rootRegionName, factory.create());
+        createRegion(this.regionName2, this.rootRegionName, factory.create());
+        
+        try {
+          startBridgeServer(0, false);
+        } catch (Exception ex) {
+          fail("While starting CacheServer", ex);
+        }
+      }
+
+  protected void executeCompiledQueries(String poolName, Object[][] params) {
+    SelectResults results = null;
+    Comparator comparator = null;
+    Object[] resultsArray = null;
+    QueryService qService = null;
+  
+    try {
+      qService = (PoolManager.find(poolName)).getQueryService();
+    } catch (Exception e) {
+      fail("Failed to get QueryService.", e);
+    }          
+  
+    for (int i=0; i < queryString.length; i++){
+      try {
+        getLogWriter().info("### Executing Query :" + queryString[i]);
+        Query query = qService.newQuery(queryString[i]);
+        results = (SelectResults)query.execute(params[i]);
+      } catch (Exception e) {
+        fail("Failed executing " + queryString[i], e);
+      }
+    }        
+  }
+
+  /**
+   * Starts a bridge server on the given port, using the given
+   * deserializeValues and notifyBySubscription to serve up the
+   * given region.
+   */
+  protected void startBridgeServer(int port, boolean notifyBySubscription)
+      throws IOException {
+      
+        Cache cache = getCache();
+        CacheServer bridge = cache.addCacheServer();
+        bridge.setPort(port);
+        bridge.setNotifyBySubscription(notifyBySubscription);
+        bridge.start();
+        bridgeServerPort = bridge.getPort();
+      }
+
+  /**
+   * Stops the bridge server that serves up the given cache.
+   */
+  protected void stopBridgeServer(Cache cache) {
+    CacheServer bridge =
+      (CacheServer) cache.getCacheServers().iterator().next();
+    bridge.stop();
+    assertFalse(bridge.isRunning());
+  }
+
+  public void closeClient(VM client) {
+    SerializableRunnable closeCache =
+      new CacheSerializableRunnable("Close Client") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Close Client. ###");
+        try {
+          closeCache();
+          disconnectFromDS();
+        } catch (Exception ex) {
+          getLogWriter().info("### Failed to get close client. ###");
+        }
+      }
+    };
+    
+    client.invoke(closeCache);
+  }
+
+  public static class TestObject2 implements PdxSerializable {
+    public int _id;
+    public static int numInstance = 0;
+    
+    public TestObject2(){
+      numInstance++;
+    }
+    
+    public TestObject2(int id){
+      this._id = id;
+      numInstance++;
+    }
+    
+    public int getId() {
+      return this._id;
+    }
+    
+    public void toData(PdxWriter out) {
+      out.writeInt("id", this._id);
+    }
+    
+    public void fromData(PdxReader in) {
+      this._id = in.readInt("id");
+    }
+    
+    @Override
+    public boolean equals(Object o){
+      getLogWriter().info("In TestObject2.equals() this: " + this + " other :" + o);
+      GemFireCacheImpl.getInstance().getLoggerI18n().fine("In TestObject2.equals() this: " + this + " other :" + o);
+      TestObject2 other = (TestObject2)o;
+      if (_id == other._id) {
+        return true;
+      } else {
+        getLogWriter().info("NOT EQUALS");  
+        return false;
+      }
+    }
+    
+    @Override
+    public int hashCode(){
+      GemFireCacheImpl.getInstance().getLoggerI18n().fine("In TestObject2.hashCode() : " + this._id);
+      return this._id;
+    }
+  }
+
+  public static class TestObject implements PdxSerializable {
+      public static LogWriter log;
+      protected String _ticker;
+      protected int _price;
+      public int id;
+      public int important;
+      public int selection;
+      public int select;
+      public static int numInstance = 0;
+      public Map idTickers = new HashMap();
+      public HashMap positions = new HashMap();
+      public TestObject2 test;
+      
+      public TestObject() {
+        if (log != null) {
+          log.info("TestObject ctor stack trace", new Exception());
+        }
+        numInstance++;
+        //GemFireCacheImpl.getInstance().getLoggerI18n().fine(new Exception("DEBUG"));
+      }
+  
+      public TestObject(int id, String ticker) {
+        if (log != null) {
+          log.info("TestObject ctor stack trace", new Exception());
+        }
+        this.id = id;
+        this._ticker = ticker;
+        this._price = id;
+        this.important = id;
+        this.selection =id;
+        this.select =id;
+        //GemFireCacheImpl.getInstance().getLoggerI18n().fine(new Exception("DEBUG"));
+        numInstance++;
+        idTickers.put(id + "", ticker);
+        this.test = new TestObject2(id);
+      }
+  
+      public TestObject(int id, String ticker, int numPositions) {
+        this(id, ticker);
+        for (int i=0; i < numPositions; i++) {
+          positions.put(id + i, new PositionPdx(ticker + ":" +  id + ":" + i , (id + 100)));
+        }
+      }
+      
+      public int getIdValue() {
+        return this.id;
+      }
+  
+      public String getTicker() {
+        return this._ticker;
+      }
+  
+      public int getPriceValue() {
+        return this._price;
+      }
+  
+      public HashMap getPositions(String id) {
+        return this.positions;  
+      }
+  
+      public String getStatus(){
+        return (id % 2 == 0) ? "active" : "inactive";
+      }
+  
+      public void toData(PdxWriter out)
+      {
+        //System.out.println("Is serializing in WAN: " + GatewayEventImpl.isSerializingValue());
+        out.writeInt("id", this.id);
+        out.writeString("ticker", this._ticker);
+        out.writeInt("price", this._price);
+        out.writeObject("idTickers", this.idTickers);
+        out.writeObject("positions", this.positions);
+        out.writeObject("test", this.test);
+      }
+  
+      public void fromData(PdxReader in)
+      {
+        //System.out.println("Is deserializing in WAN: " + GatewayEventImpl.isDeserializingValue());
+        this.id = in.readInt("id");
+        this._ticker = in.readString("ticker");
+        this._price = in.readInt("price");
+        this.idTickers = (Map)in.readObject("idTickers");
+        this.positions = (HashMap)in.readObject("positions");
+        this.test = (TestObject2)in.readObject("test");
+      }
+  
+      public String toString() {
+        StringBuffer buffer = new StringBuffer();
+        buffer
+        .append("TestObject [")
+        .append("id=")
+        .append(this.id)
+        .append("; ticker=")
+        .append(this._ticker)
+        .append("; price=")
+        .append(this._price)
+        .append("]");
+        return buffer.toString();
+      }
+  
+      @Override
+      public boolean equals(Object o){
+  //      getLogWriter().info("In TestObject.equals() this: " + this + " other :" + o);
+  //      GemFireCacheImpl.getInstance().getLoggerI18n().fine("In TestObject.equals() this: " + this + " other :" + o);
+        TestObject other = (TestObject)o;
+        if ((id == other.id) && (_ticker.equals(other._ticker))) {
+          return true;
+        } else {
+  //        getLogWriter().info("NOT EQUALS");  
+          return false;
+        }
+      }
+      
+      @Override
+      public int hashCode(){
+        GemFireCacheImpl.getInstance().getLoggerI18n().fine("In TestObject.hashCode() : " + this.id);
+        return this.id;
+      }
+  
+    }
+
+  /**
+   * Starts a bridge server on the given port, using the given
+   * deserializeValues and notifyBySubscription to serve up the
+   * given region.
+   */
+  protected void startCacheServer(int port, boolean notifyBySubscription)
+      throws IOException {
+      
+        Cache cache = CacheFactory.getAnyInstance();
+        CacheServer bridge = cache.addCacheServer();
+        bridge.setPort(port);
+        bridge.setNotifyBySubscription(notifyBySubscription);
+        bridge.start();
+        bridgeServerPort = bridge.getPort();
+      }
+
+  public PdxQueryCQTestBase(String name) {
+    super(name);
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
index fa4f610..8f80f48 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
@@ -1,12 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-/**
- * 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.query.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
index 1f1758d..f421273 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.query.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
index 9d9557c..5ccaeb3 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.snapshot;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java
index f0fffa7..231f018 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java
@@ -1,70 +1,79 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-package com.gemstone.gemfire.codeAnalysis;
-
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.experimental.categories.Category;
-
-import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
-import com.gemstone.gemfire.util.test.TestUtil;
-
-/**
- * @author bruces
- * 
- */
-@Category(IntegrationTest.class)
-public class AnalyzeCQSerializablesJUnitTest extends AnalyzeSerializablesJUnitTest {
-  
-  @Before
-  public void loadClasses() throws Exception {
-    if (classes.size() > 0) {
-      return;
-    }
-    System.out.println("loadClasses starting");
-    List<String> excludedClasses = loadExcludedClasses(new File(TestUtil.getResourcePath(AnalyzeCQSerializablesJUnitTest.class, "excludedClasses.txt")));
-    List<String> openBugs = loadOpenBugs(new File(TestUtil.getResourcePath(AnalyzeCQSerializablesJUnitTest.class, "openBugs.txt")));
-    excludedClasses.addAll(openBugs);
-    
-    String cp = System.getProperty("java.class.path");
-    System.out.println("java classpath is " + cp);
-    System.out.flush();
-    String[] entries = cp.split(File.pathSeparator);
-    String buildDirName =
-         "gemfire-cq"+File.separatorChar
-        +"build"+File.separatorChar
-        +"classes"+File.separatorChar
-        +"main";
-    String buildDir = null;
-    
-    for (int i=0; i<entries.length  &&  buildDir==null; i++) {
-      System.out.println("examining '" + entries[i] + "'");
-      System.out.flush();
-      if (entries[i].endsWith(buildDirName)) {
-        buildDir = entries[i];
-      }
-    }
-    if (buildDir != null) {
-      System.out.println("loading class files from " + buildDir);
-      System.out.flush();
-      long start = System.currentTimeMillis();
-      loadClassesFromBuild(new File(buildDir), excludedClasses);
-      long finish = System.currentTimeMillis();
-      System.out.println("done loading " + classes.size() + " classes.  elapsed time = "
-          + (finish-start)/1000 + " seconds");
-    }
-    else {
-      fail("unable to find CQ classes");
-    }
-  }
-  
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.codeAnalysis;
+
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.experimental.categories.Category;
+
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+import com.gemstone.gemfire.util.test.TestUtil;
+
+/**
+ * @author bruces
+ * 
+ */
+@Category(IntegrationTest.class)
+public class AnalyzeCQSerializablesJUnitTest extends AnalyzeSerializablesJUnitTest {
+  
+  @Before
+  public void loadClasses() throws Exception {
+    if (classes.size() > 0) {
+      return;
+    }
+    System.out.println("loadClasses starting");
+    List<String> excludedClasses = loadExcludedClasses(new File(TestUtil.getResourcePath(AnalyzeCQSerializablesJUnitTest.class, "excludedClasses.txt")));
+    List<String> openBugs = loadOpenBugs(new File(TestUtil.getResourcePath(AnalyzeCQSerializablesJUnitTest.class, "openBugs.txt")));
+    excludedClasses.addAll(openBugs);
+    
+    String cp = System.getProperty("java.class.path");
+    System.out.println("java classpath is " + cp);
+    System.out.flush();
+    String[] entries = cp.split(File.pathSeparator);
+    String buildDirName =
+         "gemfire-cq"+File.separatorChar
+        +"build"+File.separatorChar
+        +"classes"+File.separatorChar
+        +"main";
+    String buildDir = null;
+    
+    for (int i=0; i<entries.length  &&  buildDir==null; i++) {
+      System.out.println("examining '" + entries[i] + "'");
+      System.out.flush();
+      if (entries[i].endsWith(buildDirName)) {
+        buildDir = entries[i];
+      }
+    }
+    if (buildDir != null) {
+      System.out.println("loading class files from " + buildDir);
+      System.out.flush();
+      long start = System.currentTimeMillis();
+      loadClassesFromBuild(new File(buildDir), excludedClasses);
+      long finish = System.currentTimeMillis();
+      System.out.println("done loading " + classes.size() + " classes.  elapsed time = "
+          + (finish-start)/1000 + " seconds");
+    }
+    else {
+      fail("unable to find CQ classes");
+    }
+  }
+  
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
index 061655a..4810e28 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
index 6a8cfa9..3737ffb 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
index 6413518..0f089c5 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.internal.cache;
 /*=========================================================================
  * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
index 05eb566..4bce2ac 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
@@ -1,12 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-/**
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.ha;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
index 649297e..2f64285 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.ha;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
index cf434b3..968eda9 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
index dc2f1f4..382b056 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
@@ -1,12 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-/**
- * 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
index 096c831..6902619 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 



[50/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqQueryImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqQueryImpl.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqQueryImpl.java
new file mode 100644
index 0000000..f2aed77
--- /dev/null
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqQueryImpl.java
@@ -0,0 +1,375 @@
+/*=========================================================================
+ * Copyright Copyright (c) 2000-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ * $Id: DefaultQueryService.java,v 1.2 2005/02/01 17:19:20 vaibhav Exp $
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.query.internal.cq;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.logging.log4j.Logger;
+
+import com.gemstone.gemfire.StatisticsFactory;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.query.CqClosedException;
+import com.gemstone.gemfire.cache.query.CqEvent;
+import com.gemstone.gemfire.cache.query.CqException;
+import com.gemstone.gemfire.cache.query.CqExistsException;
+import com.gemstone.gemfire.cache.query.CqState;
+import com.gemstone.gemfire.cache.query.CqStatistics;
+import com.gemstone.gemfire.cache.query.Query;
+import com.gemstone.gemfire.cache.query.internal.CompiledIteratorDef;
+import com.gemstone.gemfire.cache.query.internal.CompiledRegion;
+import com.gemstone.gemfire.cache.query.internal.CompiledSelect;
+import com.gemstone.gemfire.cache.query.internal.CompiledValue;
+import com.gemstone.gemfire.cache.query.internal.CqQueryVsdStats;
+import com.gemstone.gemfire.cache.query.internal.CqStateImpl;
+import com.gemstone.gemfire.cache.query.internal.DefaultQuery;
+import com.gemstone.gemfire.cache.query.internal.ExecutionContext;
+import com.gemstone.gemfire.cache.query.internal.QueryExecutionContext;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.cache.LocalRegion;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.internal.logging.InternalLogWriter;
+import com.gemstone.gemfire.internal.logging.LogService;
+import com.gemstone.gemfire.i18n.StringId;
+
+/**
+ * @author rmadduri
+ * @author anil
+ * @since 5.5
+ * Represents the CqQuery object. Implements CqQuery API and CqAttributeMutator. 
+ *  
+ */
+public abstract class CqQueryImpl implements InternalCqQuery {
+  private static final Logger logger = LogService.getLogger();
+  
+  protected String cqName;
+  
+  protected String queryString;
+  
+  protected static final Object TOKEN = new Object();
+
+  protected LocalRegion cqBaseRegion;
+  
+  protected Query query = null;
+  
+  protected InternalLogWriter securityLogWriter;
+  
+  protected CqServiceImpl cqService;
+  
+  protected String regionName;
+  
+  protected boolean isDurable = false ;
+  
+  // Stats counters
+  protected CqStatisticsImpl cqStats;
+  
+  protected CqQueryVsdStats stats;
+    
+  protected final CqStateImpl cqState = new CqStateImpl();
+  
+  protected ExecutionContext queryExecutionContext = null;
+
+  public static TestHook testHook = null;
+  
+  /**
+   * Constructor.
+   */
+  public CqQueryImpl(){
+  }
+  
+  public CqQueryImpl(CqServiceImpl cqService, String cqName, String queryString, boolean isDurable)  {
+    this.cqName = cqName;
+    this.queryString = queryString;
+    this.securityLogWriter = (InternalLogWriter) cqService.getCache().getSecurityLoggerI18n();
+    this.cqService = cqService;
+    this.isDurable = isDurable ;
+  }
+  
+  /** 
+   * returns CQ name
+   */
+  public String getName() {
+    return this.cqName;
+  }
+  
+  @Override
+  public void setName(String cqName) {
+    this.cqName = cqName;
+  }
+
+  public void setCqService(CqService cqService) {
+    this.cqService = (CqServiceImpl) cqService;
+  }
+  
+  /**
+   * get the region name in CQ query
+   */
+  @Override
+  public String getRegionName() {
+    return this.regionName;
+  }
+
+  public void updateCqCreateStats() {
+    // Initialize the VSD statistics
+    StatisticsFactory factory = cqService.getCache().getDistributedSystem();
+    this.stats = new CqQueryVsdStats(factory, getServerCqName());
+    this.cqStats = new CqStatisticsImpl(this);
+
+    // Update statistics with CQ creation.
+    this.cqService.stats.incCqsStopped();
+    this.cqService.stats.incCqsCreated();
+    this.cqService.stats.incCqsOnClient();
+  }
+
+  /**
+   * Validates the CQ. Checks for cq constraints. 
+   * Also sets the base region name.
+   */
+  public void validateCq() {
+    Cache cache = cqService.getCache();
+    DefaultQuery locQuery = (DefaultQuery)((GemFireCacheImpl)cache).getLocalQueryService().newQuery(this.queryString);
+    this.query = locQuery;
+//    assert locQuery != null;
+    
+    // validate Query.
+    Object[] parameters = new Object[0]; // parameters are not permitted
+    
+    // check that it is only a SELECT statement (possibly with IMPORTs)
+    CompiledSelect select = locQuery.getSimpleSelect();
+    if (select == null) {
+      throw new UnsupportedOperationException(LocalizedStrings.CqQueryImpl_CQ_QUERIES_MUST_BE_A_SELECT_STATEMENT_ONLY.toLocalizedString());
+    }    
+    
+    // must not be a DISTINCT select
+    if (select.isDistinct()) {
+      throw new UnsupportedOperationException(LocalizedStrings.CqQueryImpl_SELECT_DISTINCT_QUERIES_NOT_SUPPORTED_IN_CQ.toLocalizedString());
+    }
+    
+    // get the regions referenced in this query
+    Set regionsInQuery = locQuery.getRegionsInQuery(parameters);
+    // check for more than one region is referenced in the query
+    // (though it could still be one region referenced multiple times)
+    if (regionsInQuery.size() > 1 || regionsInQuery.size() < 1) {
+      throw new UnsupportedOperationException(LocalizedStrings.CqQueryImpl_CQ_QUERIES_MUST_REFERENCE_ONE_AND_ONLY_ONE_REGION.toLocalizedString());
+    }
+    this.regionName = (String)regionsInQuery.iterator().next();
+    
+    // make sure the where clause references no regions
+    Set regions = new HashSet();
+    CompiledValue whereClause = select.getWhereClause();
+    if (whereClause != null) {
+      whereClause.getRegionsInQuery(regions, parameters);
+      if (!regions.isEmpty()) {
+        throw new UnsupportedOperationException(LocalizedStrings.CqQueryImpl_THE_WHERE_CLAUSE_IN_CQ_QUERIES_CANNOT_REFER_TO_A_REGION.toLocalizedString());
+      }
+    }
+    List fromClause = select.getIterators();
+    // cannot have more than one iterator in FROM clause
+    if (fromClause.size() > 1) {
+      throw new UnsupportedOperationException(LocalizedStrings.CqQueryImpl_CQ_QUERIES_CANNOT_HAVE_MORE_THAN_ONE_ITERATOR_IN_THE_FROM_CLAUSE.toLocalizedString());
+    }
+    
+    // the first iterator in the FROM clause must be just a CompiledRegion
+    CompiledIteratorDef itrDef = (CompiledIteratorDef)fromClause.get(0);
+    // By process of elimination, we know that the first iterator contains a reference
+    // to the region. Check to make sure it is only a CompiledRegion
+    if (!(itrDef.getCollectionExpr() instanceof CompiledRegion)) {
+      throw new UnsupportedOperationException(LocalizedStrings.CqQueryImpl_CQ_QUERIES_MUST_HAVE_A_REGION_PATH_ONLY_AS_THE_FIRST_ITERATOR_IN_THE_FROM_CLAUSE.toLocalizedString());
+    }
+    
+    // must not have any projections
+    List projs = select.getProjectionAttributes();
+    if (projs != null) {
+      throw new UnsupportedOperationException(LocalizedStrings.CqQueryImpl_CQ_QUERIES_DO_NOT_SUPPORT_PROJECTIONS.toLocalizedString());
+    }
+    
+    // check the orderByAttrs, not supported
+    List orderBys = select.getOrderByAttrs();
+    if (orderBys != null) {
+      throw new UnsupportedOperationException(LocalizedStrings.CqQueryImpl_CQ_QUERIES_DO_NOT_SUPPORT_ORDER_BY.toLocalizedString());
+    }   
+    
+    // Set Query ExecutionContext, that will be used in later execution.
+    this.setQueryExecutionContext(new QueryExecutionContext(null, this.cqService.getCache()));
+  }
+  
+  /**
+   * Removes the CQ from CQ repository.
+   * @throws CqException
+   */
+  protected void removeFromCqMap() throws CqException {
+    try {
+      cqService.removeCq(this.getServerCqName());
+    } catch (Exception ex){
+      StringId errMsg = LocalizedStrings.CqQueryImpl_FAILED_TO_REMOVE_CONTINUOUS_QUERY_FROM_THE_REPOSITORY_CQNAME_0_ERROR_1;
+      Object[] errMsgArgs = new Object[] {cqName, ex.getLocalizedMessage()};
+      String msg = errMsg.toLocalizedString(errMsgArgs);
+      logger.error(msg);
+      throw new CqException(msg, ex);
+    }    
+    if (logger.isDebugEnabled()){
+      logger.debug("Removed CQ from the CQ repository. CQ Name: {}", this.cqName);
+    }
+  }
+
+  /** 
+   * Returns the QueryString of this CQ.
+   */
+  public String getQueryString() {
+    return queryString;
+  }
+  
+  /**
+   * Return the query after replacing region names with parameters
+   * @return the Query for the query string
+   */
+  public Query getQuery(){
+    return query;
+  }
+  
+  
+  /**
+   * @see com.gemstone.gemfire.cache.query.CqQuery#getStatistics()
+   */
+  public CqStatistics getStatistics() {
+    return cqStats;
+  }
+  
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqQuery2#getCqBaseRegion()
+   */
+  @Override
+  public LocalRegion getCqBaseRegion() {
+    return this.cqBaseRegion;
+  }
+  
+  protected abstract void cleanup() throws CqException;
+  
+  /**
+   * @return Returns the Region name on which this cq is created.
+   */
+  public String getBaseRegionName() {
+    
+    return this.regionName;
+  }
+
+  public abstract String getServerCqName();
+
+  /**
+   * Return the state of this query.
+   * Should not modify this state without first locking it.
+   * @return STOPPED RUNNING or CLOSED
+   */
+  public CqState getState() {
+    return this.cqState;
+  }
+
+ /* (non-Javadoc)
+ * @see com.gemstone.gemfire.cache.query.internal.InternalCqQuery2#setCqState(int)
+ */
+  @Override
+  public void setCqState(int state) {
+    if (this.isClosed()) {
+      throw new CqClosedException(LocalizedStrings.CqQueryImpl_CQ_IS_CLOSED_CQNAME_0
+          .toLocalizedString(this.cqName));
+    }
+
+    synchronized (cqState) {
+      if (state == CqStateImpl.RUNNING){
+        if (this.isRunning()) {
+          //throw new IllegalStateException(LocalizedStrings.CqQueryImpl_CQ_IS_NOT_IN_RUNNING_STATE_STOP_CQ_DOES_NOT_APPLY_CQNAME_0
+          //  .toLocalizedString(this.cqName));
+        }
+        this.cqState.setState(CqStateImpl.RUNNING);
+        this.cqService.stats.incCqsActive();
+        this.cqService.stats.decCqsStopped();
+      } else if(state == CqStateImpl.STOPPED) {
+        this.cqState.setState(CqStateImpl.STOPPED);
+        this.cqService.stats.incCqsStopped();
+        this.cqService.stats.decCqsActive();
+      } else if(state == CqStateImpl.CLOSING) {
+        this.cqState.setState(state);
+      }
+    }
+  }
+
+  /**
+   * Update CQ stats
+   * @param cqEvent object
+   */
+  public void updateStats(CqEvent cqEvent) {
+    this.stats.updateStats(cqEvent);  // Stats for VSD
+  }
+  
+  /**
+   * Return true if the CQ is in running state
+   * @return true if running, false otherwise
+   */
+  public boolean isRunning() {
+    return this.cqState.isRunning();
+  }
+  
+  /**
+   * Return true if the CQ is in Sstopped state
+   * @return true if stopped, false otherwise
+   */ 
+  public boolean isStopped() {
+    return this.cqState.isStopped();
+  }
+  
+  /**
+   * Return true if the CQ is closed
+   * @return true if closed, false otherwise
+   */
+  public boolean isClosed() {
+    return this.cqState.isClosed();
+  }
+
+  /**
+   * Return true if the CQ is in closing state.
+   * @return true if close in progress, false otherwise
+   */
+  public boolean isClosing() {
+    return this.cqState.isClosing();
+  }
+  
+  /**
+   * Return true if the CQ is durable
+   * @return true if durable, false otherwise
+   */
+  public boolean isDurable() {
+    return this.isDurable;
+  }
+
+  /**
+   * Returns a reference to VSD stats of the CQ
+   * @return VSD stats of the CQ
+   */
+  @Override
+  public CqQueryVsdStats getVsdStats() {
+    return stats;
+  }
+
+  public ExecutionContext getQueryExecutionContext() {
+    return queryExecutionContext;
+  }
+
+  public void setQueryExecutionContext(ExecutionContext queryExecutionContext) {
+    this.queryExecutionContext = queryExecutionContext;
+  }
+
+  /** Test Hook */
+  public interface TestHook {
+    public void pauseUntilReady();
+    public void ready();
+    public int numQueuedEvents();
+    public void setEventCount(int count);
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceFactoryImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceFactoryImpl.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceFactoryImpl.java
new file mode 100644
index 0000000..e39ba53
--- /dev/null
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceFactoryImpl.java
@@ -0,0 +1,53 @@
+package com.gemstone.gemfire.cache.query.internal.cq;
+
+import java.io.DataInput;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.gemstone.gemfire.cache.query.internal.cq.spi.CqServiceFactory;
+import com.gemstone.gemfire.internal.Version;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.cache.tier.Command;
+import com.gemstone.gemfire.internal.cache.tier.MessageType;
+import com.gemstone.gemfire.internal.cache.tier.sockets.CommandInitializer;
+import com.gemstone.gemfire.internal.cache.tier.sockets.command.CloseCQ;
+import com.gemstone.gemfire.internal.cache.tier.sockets.command.ExecuteCQ;
+import com.gemstone.gemfire.internal.cache.tier.sockets.command.ExecuteCQ61;
+import com.gemstone.gemfire.internal.cache.tier.sockets.command.GetCQStats;
+import com.gemstone.gemfire.internal.cache.tier.sockets.command.GetDurableCQs;
+import com.gemstone.gemfire.internal.cache.tier.sockets.command.MonitorCQ;
+import com.gemstone.gemfire.internal.cache.tier.sockets.command.StopCQ;
+
+public class CqServiceFactoryImpl implements CqServiceFactory {
+  
+  public void initialize() {
+    {
+      Map<Version, Command> versions = new HashMap<Version, Command>();
+      versions.put(Version.GFE_57, ExecuteCQ.getCommand());
+      versions.put(Version.GFE_61, ExecuteCQ61.getCommand());
+      CommandInitializer.registerCommand(MessageType.EXECUTECQ_MSG_TYPE, versions);
+      CommandInitializer.registerCommand(MessageType.EXECUTECQ_WITH_IR_MSG_TYPE, versions);
+    }
+    
+    CommandInitializer.registerCommand(MessageType.GETCQSTATS_MSG_TYPE, Collections.singletonMap(Version.GFE_57, GetCQStats.getCommand()));
+    CommandInitializer.registerCommand(MessageType.MONITORCQ_MSG_TYPE, Collections.singletonMap(Version.GFE_57, MonitorCQ.getCommand()));
+    CommandInitializer.registerCommand(MessageType.STOPCQ_MSG_TYPE, Collections.singletonMap(Version.GFE_57, StopCQ.getCommand()));
+    CommandInitializer.registerCommand(MessageType.CLOSECQ_MSG_TYPE, Collections.singletonMap(Version.GFE_57, CloseCQ.getCommand()));
+    CommandInitializer.registerCommand(MessageType.GETDURABLECQS_MSG_TYPE, Collections.singletonMap(Version.GFE_70, GetDurableCQs.getCommand()));
+  }
+
+  @Override
+  public CqService create(GemFireCacheImpl cache) {
+    return new CqServiceImpl(cache);
+  }
+
+  @Override
+  public ServerCQ readCqQuery(DataInput in) throws ClassNotFoundException, IOException {
+    ServerCQImpl cq = new ServerCQImpl();
+    cq.fromData(in);
+    return cq;
+  }
+
+}


[25/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorDiscovery.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorDiscovery.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorDiscovery.java
new file mode 100644
index 0000000..04abc89
--- /dev/null
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorDiscovery.java
@@ -0,0 +1,218 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.client.internal.locator.wan;
+
+import java.io.IOException;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.logging.log4j.Logger;
+
+import com.gemstone.gemfire.distributed.internal.InternalLocator;
+import com.gemstone.gemfire.distributed.internal.WanLocatorDiscoverer;
+import com.gemstone.gemfire.distributed.internal.tcpserver.TcpClient;
+import com.gemstone.gemfire.internal.admin.remote.DistributionLocatorId;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.internal.logging.LogService;
+import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
+import com.gemstone.gemfire.internal.tcp.ConnectionException;
+import com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListener;
+
+/**
+ * This class represent a runnable task which exchange the locator information
+ * with local locators(within the site) as well as remote locators (across the
+ * site)
+ * 
+ * @author kbachhav
+ * @since 7.0
+ */
+public class LocatorDiscovery{
+
+  private static final Logger logger = LogService.getLogger();
+  
+  private DistributionLocatorId locatorId;
+  
+  private LocatorMembershipListener locatorListener;
+  
+  RemoteLocatorJoinRequest request;
+
+  public static final int WAN_LOCATOR_CONNECTION_RETRY_ATTEMPT = Integer
+      .getInteger("WANLocator.CONNECTION_RETRY_ATTEMPT", 50000).intValue();
+
+  public static final int WAN_LOCATOR_CONNECTION_INTERVAL = Integer.getInteger(
+      "WANLocator.CONNECTION_INTERVAL", 10000).intValue();
+
+  public static final int WAN_LOCATOR_PING_INTERVAL = Integer.getInteger(
+      "WANLocator.PING_INTERVAL", 10000).intValue();
+
+  public LocatorDiscovery(DistributionLocatorId locotor,RemoteLocatorJoinRequest request,
+      LocatorMembershipListener locatorListener) {
+    this.locatorId = locotor;
+    this.request = request; 
+    this.locatorListener = locatorListener;
+  }
+  
+  /**
+   * When a batch fails, then this keeps the last time when a failure was logged
+   * . We don't want to swamp the logs in retries due to same batch failures.
+   */
+  private final ConcurrentHashMap<DistributionLocatorId, long[]> failureLogInterval = new ConcurrentHashMap<DistributionLocatorId, long[]>();
+
+  /**
+   * The maximum size of {@link #failureLogInterval} beyond which it will start
+   * logging all failure instances. Hopefully this should never happen in
+   * practice.
+   */
+  private static final int FAILURE_MAP_MAXSIZE = Integer.getInteger(
+      "gemfire.GatewaySender.FAILURE_MAP_MAXSIZE", 1000000);
+
+  /**
+   * The maximum interval for logging failures of the same event in millis.
+   */
+  private static final int FAILURE_LOG_MAX_INTERVAL = Integer.getInteger(
+      "gemfire.LocatorDiscovery.FAILURE_LOG_MAX_INTERVAL", 300000);
+
+  public final boolean skipFailureLogging(DistributionLocatorId locatorId) {
+    boolean skipLogging = false;
+    if (this.failureLogInterval.size() < FAILURE_MAP_MAXSIZE) {
+      long[] logInterval = this.failureLogInterval.get(locatorId);
+      if (logInterval == null) {
+        logInterval = this.failureLogInterval.putIfAbsent(locatorId,
+            new long[] { System.currentTimeMillis(), 1000 });
+      }
+      if (logInterval != null) {
+        long currentTime = System.currentTimeMillis();
+        if ((currentTime - logInterval[0]) < logInterval[1]) {
+          skipLogging = true;
+        } else {
+          logInterval[0] = currentTime;
+          if (logInterval[1] <= (FAILURE_LOG_MAX_INTERVAL / 2)) {
+            logInterval[1] *= 2;
+          }
+        }
+      }
+    }
+    return skipLogging;
+  }
+
+
+  public class LocalLocatorDiscovery implements Runnable {
+    public void run() {
+      exchangeLocalLocators();
+    }
+  }
+
+  public class RemoteLocatorDiscovery implements Runnable {
+    public void run() {
+      exchangeRemoteLocators();
+    }
+  }
+  
+  
+  private void exchangeLocalLocators() {
+    int retryAttempt = 1;
+    while (true) {
+      try {
+        RemoteLocatorJoinResponse response = (RemoteLocatorJoinResponse)TcpClient
+            .requestToServer(locatorId.getHost(), locatorId.getPort(), request,
+                WanLocatorDiscoverer.WAN_LOCATOR_CONNECTION_TIMEOUT);
+        if (response != null) {
+          LocatorHelper.addExchnagedLocators(response.getLocators(),
+              this.locatorListener);
+          logger.info(LocalizedMessage.create(LocalizedStrings.LOCATOR_DISCOVERY_TASK_EXCHANGED_LOCATOR_INFORMATION_0_WITH_1,
+              new Object[] { request.getLocator(), locatorId }));
+          break;
+        }
+      }
+      catch (IOException ioe) {
+        if (retryAttempt == WAN_LOCATOR_CONNECTION_RETRY_ATTEMPT) {
+          ConnectionException coe = new ConnectionException(
+              "Not able to connect to local locator after "
+              + WAN_LOCATOR_CONNECTION_RETRY_ATTEMPT + " retry attempts",
+          ioe);
+          logger.fatal(LocalizedMessage.create(LocalizedStrings.LOCATOR_DISCOVERY_TASK_COULD_NOT_EXCHANGE_LOCATOR_INFORMATION_0_WITH_1_AFTER_2,
+              new Object[] { request.getLocator(),locatorId, retryAttempt }), coe);
+          break;
+        }
+        if (skipFailureLogging(locatorId)) {
+          logger.warn(LocalizedMessage.create(LocalizedStrings.LOCATOR_DISCOVERY_TASK_COULD_NOT_EXCHANGE_LOCATOR_INFORMATION_0_WITH_1_AFTER_2_RETRYING_IN_3_MS,
+              new Object[] { request.getLocator(), locatorId, retryAttempt, WAN_LOCATOR_CONNECTION_INTERVAL }));
+        }
+        try {
+          Thread.sleep(WAN_LOCATOR_CONNECTION_INTERVAL);
+        }
+        catch (InterruptedException e) {
+          Thread.currentThread().interrupt();
+        }
+        retryAttempt++;
+        continue;
+      }
+      catch (ClassNotFoundException cnfe) {
+        logger.fatal(LocalizedMessage.create(LocalizedStrings.LOCATOR_DISCOVERY_TASK_ENCOUNTERED_UNEXPECTED_EXCEPTION), cnfe);
+        break;
+      }
+    }
+  }
+  
+  public void exchangeRemoteLocators() {
+    int retryAttempt = 1;
+    DistributionLocatorId remoteLocator = this.locatorId;
+    while (true) {
+      RemoteLocatorJoinResponse response;
+      try {
+        response = (RemoteLocatorJoinResponse)TcpClient
+            .requestToServer(remoteLocator.getHost(), remoteLocator.getPort(),
+                request, WanLocatorDiscoverer.WAN_LOCATOR_CONNECTION_TIMEOUT);
+        if (response != null) {
+          LocatorHelper.addExchnagedLocators(response.getLocators(), this.locatorListener);
+          logger.info(LocalizedMessage.create(LocalizedStrings.LOCATOR_DISCOVERY_TASK_EXCHANGED_LOCATOR_INFORMATION_0_WITH_1,
+              new Object[] { request.getLocator(), locatorId }));
+          RemoteLocatorPingRequest pingRequest = new RemoteLocatorPingRequest(
+              "");
+          while (true) {
+            Thread.sleep(WAN_LOCATOR_PING_INTERVAL);
+            RemoteLocatorPingResponse pingResponse = (RemoteLocatorPingResponse) TcpClient
+                .requestToServer(remoteLocator.getHost(),
+                    remoteLocator.getPort(), pingRequest,
+                    WanLocatorDiscoverer.WAN_LOCATOR_CONNECTION_TIMEOUT);
+            if (pingResponse != null) {
+              continue;
+            }
+            break;
+          }
+        }
+      }
+      catch (IOException ioe) {
+        if (retryAttempt == WAN_LOCATOR_CONNECTION_RETRY_ATTEMPT) {
+          logger.fatal(LocalizedMessage.create(LocalizedStrings.LOCATOR_DISCOVERY_TASK_COULD_NOT_EXCHANGE_LOCATOR_INFORMATION_0_WITH_1_AFTER_2,
+              new Object[] { request.getLocator(), remoteLocator, retryAttempt}), ioe);
+          break;
+        }
+        if (skipFailureLogging(remoteLocator)) {
+          logger.warn(LocalizedMessage.create(LocalizedStrings.LOCATOR_DISCOVERY_TASK_COULD_NOT_EXCHANGE_LOCATOR_INFORMATION_0_WITH_1_AFTER_2_RETRYING_IN_3_MS,
+              new Object[] { request.getLocator(), remoteLocator, retryAttempt, WAN_LOCATOR_CONNECTION_INTERVAL }));
+        }
+        try {
+          Thread.sleep(WAN_LOCATOR_CONNECTION_INTERVAL);
+        }
+        catch (InterruptedException e) {
+          Thread.currentThread().interrupt();
+        }
+        retryAttempt++;
+        continue;
+      }
+      catch (ClassNotFoundException cnfe) {
+        logger.fatal(LocalizedMessage.create(LocalizedStrings.LOCATOR_DISCOVERY_TASK_ENCOUNTERED_UNEXPECTED_EXCEPTION), cnfe);
+        break;
+      }
+      catch (InterruptedException e) {
+        Thread.currentThread().interrupt();
+      }
+    }
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorHelper.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorHelper.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorHelper.java
new file mode 100644
index 0000000..a5b57c8
--- /dev/null
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorHelper.java
@@ -0,0 +1,134 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.client.internal.locator.wan;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import com.gemstone.gemfire.distributed.internal.InternalLocator;
+import com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListener;
+import com.gemstone.gemfire.distributed.internal.WanLocatorDiscoverer;
+import com.gemstone.gemfire.internal.CopyOnWriteHashSet;
+import com.gemstone.gemfire.internal.admin.remote.DistributionLocatorId;
+/**
+ * This is a helper class which helps to add the locator information to the allLocatorInfoMap.
+ * 
+ * @author Kishor Bachhav
+ *
+ */
+public class LocatorHelper {
+  
+  public final static Object locatorObject = new Object();
+  /**
+   * 
+   * This methods add the given locator to allLocatorInfoMap.
+   * It also invokes a locatorlistener to inform other locators in allLocatorInfoMap about this newly added locator.
+   * @param distributedSystemId
+   * @param locator
+   * @param locatorListener
+   * @param sourceLocator
+   */
+  public static boolean addLocator(int distributedSystemId,
+      DistributionLocatorId locator, LocatorMembershipListener locatorListener,
+      DistributionLocatorId sourceLocator) {
+      ConcurrentHashMap<Integer, Set<DistributionLocatorId>> allLocatorsInfo = (ConcurrentHashMap<Integer, Set<DistributionLocatorId>>)locatorListener
+          .getAllLocatorsInfo();
+      Set<DistributionLocatorId> locatorsSet = new CopyOnWriteHashSet<DistributionLocatorId>();
+      locatorsSet.add(locator);
+      Set<DistributionLocatorId> existingValue = allLocatorsInfo.putIfAbsent(distributedSystemId, locatorsSet);
+      if(existingValue != null){
+        if (!existingValue.contains(locator)) {
+          existingValue.add(locator);
+          addServerLocator(distributedSystemId, locatorListener, locator);
+          locatorListener.locatorJoined(distributedSystemId, locator,
+              sourceLocator);
+        }
+        else {
+          return false;
+        }
+      }else{
+        addServerLocator(distributedSystemId, locatorListener, locator);
+        locatorListener.locatorJoined(distributedSystemId, locator,
+          sourceLocator);
+      }
+    return true;
+  }
+
+  /**
+   * This methods decides whether the given locator is server locator, if so
+   * then add this locator in allServerLocatorsInfo map.
+   * 
+   * @param distributedSystemId
+   * @param locatorListener
+   * @param locator
+   */
+  private static void addServerLocator(Integer distributedSystemId,
+      LocatorMembershipListener locatorListener, DistributionLocatorId locator) {
+    if (!locator.isServerLocator()) {
+      return;
+    }
+    ConcurrentHashMap<Integer, Set<String>> allServerLocatorsInfo = (ConcurrentHashMap<Integer, Set<String>>)locatorListener
+        .getAllServerLocatorsInfo();
+    
+    Set<String> locatorsSet = new CopyOnWriteHashSet<String>();
+    locatorsSet.add(locator.toString());
+    Set<String> existingValue = allServerLocatorsInfo.putIfAbsent(distributedSystemId, locatorsSet);
+    if(existingValue != null){
+      if (!existingValue.contains(locator.toString())) {
+        existingValue.add(locator.toString());
+      }
+    }
+  }
+
+  /**
+   * This method adds the map of locatorsinfo sent by other locator to this locator's allLocatorInfo
+   * 
+   * @param locators
+   * @param locatorListener
+   */
+  public static boolean addExchnagedLocators(Map<Integer, Set<DistributionLocatorId>> locators,
+      LocatorMembershipListener locatorListener) {
+
+    ConcurrentHashMap<Integer, Set<DistributionLocatorId>> allLocators = (ConcurrentHashMap<Integer, Set<DistributionLocatorId>>)locatorListener
+        .getAllLocatorsInfo();
+    if (!allLocators.equals(locators)) {
+      for (Map.Entry<Integer, Set<DistributionLocatorId>> entry : locators
+          .entrySet()) {
+        Set<DistributionLocatorId> existingValue = allLocators.putIfAbsent(
+            entry.getKey(), new CopyOnWriteHashSet<DistributionLocatorId>(entry
+                .getValue()));
+
+        if (existingValue != null) {
+          Set<DistributionLocatorId> localLocators = allLocators.get(entry
+              .getKey());
+          if (!localLocators.equals(entry.getValue())) {
+            entry.getValue().removeAll(localLocators);
+            for (DistributionLocatorId locator : entry.getValue()) {
+              localLocators.add(locator);
+              addServerLocator(entry.getKey(), locatorListener, locator);
+              locatorListener.locatorJoined(entry.getKey(), locator, null);
+            }
+          }
+
+        }
+        else {
+          for (DistributionLocatorId locator : entry.getValue()) {
+            addServerLocator(entry.getKey(), locatorListener, locator);
+            locatorListener.locatorJoined(entry.getKey(), locator, null);
+          }
+        }
+      }
+      return true;
+    }
+    return false;
+  }
+  
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorJoinMessage.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorJoinMessage.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorJoinMessage.java
new file mode 100644
index 0000000..124ca2e
--- /dev/null
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorJoinMessage.java
@@ -0,0 +1,96 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.client.internal.locator.wan;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import com.gemstone.gemfire.DataSerializer;
+import com.gemstone.gemfire.cache.client.internal.locator.ServerLocationRequest;
+import com.gemstone.gemfire.internal.DataSerializableFixedID;
+import com.gemstone.gemfire.internal.admin.remote.DistributionLocatorId;
+
+public class LocatorJoinMessage extends ServerLocationRequest {
+
+  private DistributionLocatorId locator;
+  
+  private int distributedSystemId;
+  
+  private DistributionLocatorId sourceLocator;
+
+  public LocatorJoinMessage() {
+    super();
+  }
+
+  public LocatorJoinMessage(int distributedSystemId, DistributionLocatorId locator,
+      DistributionLocatorId sourceLocator, String serverGroup) {
+    super(serverGroup);
+    this.locator = locator;
+    this.distributedSystemId = distributedSystemId;
+    this.sourceLocator = sourceLocator;
+  }
+
+  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+    super.fromData(in);
+    this.locator = DataSerializer.readObject(in);
+    this.distributedSystemId = in.readInt();
+    this.sourceLocator = DataSerializer.readObject(in);
+  }
+
+  public void toData(DataOutput out) throws IOException {
+    super.toData(out);
+    DataSerializer.writeObject(locator, out);
+    out.writeInt(this.distributedSystemId);
+    DataSerializer.writeObject(sourceLocator, out);
+  }
+
+  public DistributionLocatorId getLocator() {
+    return this.locator;
+  }
+
+  public int getDistributedSystemId() {
+    return distributedSystemId;
+  }
+  
+  public DistributionLocatorId getSourceLocator() {
+    return sourceLocator;
+  }
+  
+  public int getDSFID() {
+    return DataSerializableFixedID.LOCATOR_JOIN_MESSAGE;
+  }
+
+  @Override
+  public String toString() {
+    return "LocatorJoinMessage{distributedSystemId="+ distributedSystemId +" locators=" + locator + " Source Locator : " + sourceLocator +"}";
+  }
+
+  @Override
+  public boolean equals(Object obj){
+    if ( this == obj ) return true;
+    if ( !(obj instanceof LocatorJoinMessage) ) return false;
+    LocatorJoinMessage myObject = (LocatorJoinMessage)obj;
+    if((this.distributedSystemId == myObject.getDistributedSystemId()) && this.locator.equals(myObject.getLocator())){
+      return true;
+    }
+    return false;
+  }
+  
+  @Override
+  public int hashCode() {
+    // it is sufficient for all messages having the same locator to hash to the same bucket
+    if (this.locator == null) {
+      return 0;
+    } else {
+      return this.locator.hashCode();
+    }
+  }
+
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorMembershipListenerImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorMembershipListenerImpl.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorMembershipListenerImpl.java
new file mode 100644
index 0000000..67049e6
--- /dev/null
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/LocatorMembershipListenerImpl.java
@@ -0,0 +1,221 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.client.internal.locator.wan;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import org.apache.logging.log4j.Logger;
+
+import com.gemstone.gemfire.distributed.Locator;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.distributed.internal.InternalLocator;
+import com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListener;
+import com.gemstone.gemfire.distributed.internal.WanLocatorDiscoverer;
+import com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorJoinMessage;
+import com.gemstone.gemfire.cache.client.internal.locator.wan.RemoteLocatorJoinRequest;
+import com.gemstone.gemfire.cache.client.internal.locator.wan.RemoteLocatorJoinResponse;
+import com.gemstone.gemfire.cache.client.internal.locator.wan.RemoteLocatorPingRequest;
+import com.gemstone.gemfire.cache.client.internal.locator.wan.RemoteLocatorPingResponse;
+import com.gemstone.gemfire.cache.client.internal.locator.wan.RemoteLocatorRequest;
+import com.gemstone.gemfire.cache.client.internal.locator.wan.RemoteLocatorResponse;
+import com.gemstone.gemfire.internal.CopyOnWriteHashSet;
+import com.gemstone.gemfire.internal.DSFIDFactory;
+import com.gemstone.gemfire.internal.DataSerializableFixedID;
+import com.gemstone.gemfire.internal.Version;
+import com.gemstone.gemfire.internal.admin.remote.DistributionLocatorId;
+import com.gemstone.gemfire.internal.cache.tier.Command;
+import com.gemstone.gemfire.internal.cache.tier.MessageType;
+import com.gemstone.gemfire.internal.cache.tier.sockets.CommandInitializer;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.internal.logging.LogService;
+import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
+import com.gemstone.gemfire.distributed.internal.tcpserver.TcpClient;
+
+/**
+ * An implementation of
+ * {@link com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListener}
+ * 
+ * @author kbachhav
+ * 
+ */
+public class LocatorMembershipListenerImpl implements LocatorMembershipListener {
+
+  private ConcurrentMap<Integer, Set<DistributionLocatorId>> allLocatorsInfo = new ConcurrentHashMap<Integer, Set<DistributionLocatorId>>();
+  
+  private ConcurrentMap<Integer, Set<String>> allServerLocatorsInfo = new ConcurrentHashMap<Integer, Set<String>>();
+  
+  private static final Logger logger = LogService.getLogger();
+  
+  private DistributionConfig config;
+  
+  private int port;
+  
+  public LocatorMembershipListenerImpl() {
+  }
+  
+  public void setPort(int port){
+    this.port = port;
+  }
+
+  public void setConfig(DistributionConfig config) {
+    this.config = config;
+  }
+  
+  /**
+   * When the new locator is added to remote locator metadata, inform all other
+   * locators in remote locator metadata about the new locator so that they can
+   * update their remote locator metadata.
+   * 
+   * @param locator
+   */
+  
+  public void locatorJoined(final int distributedSystemId,
+      final DistributionLocatorId locator,
+      final DistributionLocatorId sourceLocator) {
+    Thread distributeLocator = new Thread(new Runnable() {
+      public void run() {
+        ConcurrentMap<Integer, Set<DistributionLocatorId>> remoteLocators = getAllLocatorsInfo();
+        ArrayList<DistributionLocatorId> locatorsToRemove = new ArrayList<DistributionLocatorId>();
+        
+        String localLocator = config.getStartLocator();
+        DistributionLocatorId localLocatorId = null;
+        if (localLocator.equals(DistributionConfig.DEFAULT_START_LOCATOR)) {
+          localLocatorId = new DistributionLocatorId(port, config
+              .getBindAddress());
+        }
+        else {
+          localLocatorId = new DistributionLocatorId(localLocator);
+        }
+        locatorsToRemove.add(localLocatorId);
+        locatorsToRemove.add(locator);
+        locatorsToRemove.add(sourceLocator);
+        
+        Map<Integer, Set<DistributionLocatorId>> localCopy = new HashMap<Integer, Set<DistributionLocatorId>>();
+        for(Map.Entry<Integer, Set<DistributionLocatorId>> entry : remoteLocators.entrySet()){
+          Set<DistributionLocatorId> value = new CopyOnWriteHashSet<DistributionLocatorId>(entry.getValue());
+          localCopy.put(entry.getKey(), value);
+        }  
+        for(Map.Entry<Integer, Set<DistributionLocatorId>> entry : localCopy.entrySet()){
+          for(DistributionLocatorId removeLocId : locatorsToRemove){
+            if(entry.getValue().contains(removeLocId)){
+              entry.getValue().remove(removeLocId);
+            }
+          }
+          for (DistributionLocatorId value : entry.getValue()) {
+            try {
+              TcpClient.requestToServer(value.getHost(), value.getPort(),
+                  new LocatorJoinMessage(distributedSystemId, locator, localLocatorId, ""), 1000, false);
+            }
+            catch (Exception e) {
+              if (logger.isDebugEnabled()) {
+                logger.debug(LocalizedMessage.create(LocalizedStrings.LOCATOR_MEMBERSHIP_LISTENER_COULD_NOT_EXCHANGE_LOCATOR_INFORMATION_0_1_WIHT_2_3, 
+                    new Object[] { locator.getHost(), locator.getPort(), value.getHost(), value.getPort() }));
+              }
+            }
+            try {
+              TcpClient.requestToServer(locator.getHost(), locator.getPort(),
+                  new LocatorJoinMessage(entry.getKey(), value, localLocatorId, ""), 1000, false);
+            }
+            catch (Exception e) {
+              if (logger.isDebugEnabled()) {
+                logger.debug(LocalizedMessage.create(LocalizedStrings.LOCATOR_MEMBERSHIP_LISTENER_COULD_NOT_EXCHANGE_LOCATOR_INFORMATION_0_1_WIHT_2_3,
+                    new Object[] { value.getHost(), value.getPort(), locator.getHost(), locator.getPort() }));
+              }
+            }
+          }
+        }
+      }
+    });
+    distributeLocator.setDaemon(true);
+    distributeLocator.start();
+  }
+
+  public Object handleRequest(Object request) {
+    Object response = null;
+    if (request instanceof RemoteLocatorJoinRequest) {
+      response = updateAllLocatorInfo((RemoteLocatorJoinRequest)request);
+    }
+    else if (request instanceof LocatorJoinMessage) {
+      response = informAboutRemoteLocators((LocatorJoinMessage)request);
+    }
+    else if (request instanceof RemoteLocatorPingRequest) {
+      response = getPingResponse((RemoteLocatorPingRequest)request);
+    }
+    else if (request instanceof RemoteLocatorRequest) {
+      response = getRemoteLocators((RemoteLocatorRequest)request);
+    }
+    return response;
+  }
+  
+  /**
+   * A locator from the request is checked against the existing remote locator
+   * metadata. If it is not available then added to existing remote locator
+   * metadata and LocatorMembershipListener is invoked to inform about the
+   * this newly added locator to all other locators available in remote locator
+   * metadata. As a response, remote locator metadata is sent.
+   * 
+   * @param request
+   */
+  private synchronized Object updateAllLocatorInfo(RemoteLocatorJoinRequest request) {
+    int distributedSystemId = request.getDistributedSystemId();
+    DistributionLocatorId locator = request.getLocator();
+
+    LocatorHelper.addLocator(distributedSystemId, locator, this, null);
+    return new RemoteLocatorJoinResponse(this.getAllLocatorsInfo());
+  }
+  
+  private Object getPingResponse(RemoteLocatorPingRequest request) {
+   return new RemoteLocatorPingResponse();
+  }
+  
+  private Object informAboutRemoteLocators(LocatorJoinMessage request){
+    // TODO: FInd out the importance of list locatorJoinMessages. During
+    // refactoring I could not understand its significance
+//    synchronized (locatorJoinObject) {
+//      if (locatorJoinMessages.contains(request)) {
+//        return null;
+//      }
+//      locatorJoinMessages.add(request);  
+//    }
+    int distributedSystemId = request.getDistributedSystemId();
+    DistributionLocatorId locator = request.getLocator();
+    DistributionLocatorId sourceLocatorId = request.getSourceLocator();
+
+    LocatorHelper.addLocator(distributedSystemId, locator, this, sourceLocatorId);
+    return null;
+  }
+  
+  private Object getRemoteLocators(RemoteLocatorRequest request) {
+    int dsId = request.getDsId();
+    Set<String> locators = this.getRemoteLocatorInfo(dsId);
+    return new RemoteLocatorResponse(locators);
+  }
+  
+  public Set<String> getRemoteLocatorInfo(int dsId) {
+    return this.allServerLocatorsInfo.get(dsId);
+  }
+
+  public ConcurrentMap<Integer,Set<DistributionLocatorId>> getAllLocatorsInfo() {
+    return this.allLocatorsInfo;
+  }
+  
+  public ConcurrentMap<Integer,Set<String>> getAllServerLocatorsInfo() {
+    return this.allServerLocatorsInfo;
+  }
+  
+  public void clearLocatorInfo(){
+    allLocatorsInfo.clear();
+    allServerLocatorsInfo.clear();
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorJoinRequest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorJoinRequest.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorJoinRequest.java
new file mode 100644
index 0000000..b31a6bd
--- /dev/null
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorJoinRequest.java
@@ -0,0 +1,78 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.client.internal.locator.wan;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import com.gemstone.gemfire.DataSerializer;
+import com.gemstone.gemfire.cache.client.internal.locator.ServerLocationRequest;
+import com.gemstone.gemfire.internal.DataSerializableFixedID;
+import com.gemstone.gemfire.internal.Version;
+import com.gemstone.gemfire.internal.admin.remote.DistributionLocatorId;
+
+/**
+ * Requests remote locators of a remote WAN site
+ * 
+ * @author Suranjan Kumar
+ * @author Yogesh Mahajan
+ * @author Kishor Bachhav
+ * 
+ * @since 6.6
+ * 
+ */
+public class RemoteLocatorJoinRequest implements DataSerializableFixedID {
+
+  private DistributionLocatorId locator = null;
+ 
+  private int distributedSystemId = -1;
+
+  public RemoteLocatorJoinRequest() {
+    super();
+  }
+
+  public RemoteLocatorJoinRequest(int distributedSystemId, DistributionLocatorId locator,
+      String serverGroup) {
+    this.distributedSystemId = distributedSystemId;
+    this.locator = locator;
+  }
+
+  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+    this.locator = DataSerializer.readObject(in);
+    this.distributedSystemId = in.readInt();
+  }
+
+  public void toData(DataOutput out) throws IOException {
+    DataSerializer.writeObject(locator, out);
+    out.writeInt(this.distributedSystemId);
+  }
+
+  public DistributionLocatorId getLocator() {
+    return this.locator;
+  }
+  
+  public int getDistributedSystemId() {
+    return distributedSystemId;
+  }
+  
+  public int getDSFID() {
+    return DataSerializableFixedID.REMOTE_LOCATOR_JOIN_REQUEST;
+  }
+
+  @Override
+  public String toString() {
+    return "RemoteLocatorJoinRequest{locator=" + locator + "}";
+  }
+
+  @Override
+  public Version[] getSerializationVersions() {
+    return null;
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorJoinResponse.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorJoinResponse.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorJoinResponse.java
new file mode 100644
index 0000000..4bd478d
--- /dev/null
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorJoinResponse.java
@@ -0,0 +1,80 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.client.internal.locator.wan;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import com.gemstone.gemfire.DataSerializer;
+import com.gemstone.gemfire.internal.CopyOnWriteHashSet;
+import com.gemstone.gemfire.internal.DataSerializableFixedID;
+import com.gemstone.gemfire.internal.Version;
+import com.gemstone.gemfire.internal.admin.remote.DistributionLocatorId;
+
+/**
+ * List of remote locators as a response
+ * 
+ * @author Suranjan Kumar
+ * @author Yogesh Mahajan
+ * @author Kishor Bachhav
+ * 
+ * 
+ */
+public class RemoteLocatorJoinResponse implements DataSerializableFixedID{
+
+  private HashMap<Integer, Set<DistributionLocatorId>> locators = new HashMap<Integer, Set<DistributionLocatorId>>();
+  
+  /** Used by DataSerializer */
+  public RemoteLocatorJoinResponse() {
+    super();
+  }
+
+  public RemoteLocatorJoinResponse(
+      Map<Integer, Set<DistributionLocatorId>> locators) {
+    super();
+    this.locators = new HashMap<Integer, Set<DistributionLocatorId>>();
+    for (Map.Entry<Integer, Set<DistributionLocatorId>> entry : locators
+        .entrySet()) {
+      this.locators.put(entry.getKey(), new CopyOnWriteHashSet<DistributionLocatorId>(
+          entry.getValue()));
+    }
+  }
+  
+  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+    this.locators = DataSerializer.readHashMap(in);
+    
+  }
+
+  public void toData(DataOutput out) throws IOException {
+    DataSerializer.writeHashMap(locators, out);
+  }
+
+  public Map<Integer, Set<DistributionLocatorId>> getLocators() {
+    return this.locators;
+  }
+
+  @Override
+  public String toString() {
+    return "RemoteLocatorJoinResponse{locators=" + locators + "}";
+  }
+
+  public int getDSFID() {
+    return DataSerializableFixedID.REMOTE_LOCATOR_JOIN_RESPONSE;
+  }
+
+  @Override
+  public Version[] getSerializationVersions() {
+    return null;
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorPingRequest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorPingRequest.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorPingRequest.java
new file mode 100644
index 0000000..937b676
--- /dev/null
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorPingRequest.java
@@ -0,0 +1,47 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.client.internal.locator.wan;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import com.gemstone.gemfire.internal.DataSerializableFixedID;
+import com.gemstone.gemfire.internal.Version;
+
+/**
+ * 
+ * @author Kishor Bachhav
+ *
+ */
+
+public class RemoteLocatorPingRequest implements DataSerializableFixedID{
+
+  public RemoteLocatorPingRequest() {
+    super();
+  }
+
+  public RemoteLocatorPingRequest(String serverGroup) {
+  }
+
+  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+  }
+
+  public void toData(DataOutput out) throws IOException {
+  }
+
+  public int getDSFID() {
+    return DataSerializableFixedID.REMOTE_LOCATOR_PING_REQUEST;
+  }
+
+  @Override
+  public Version[] getSerializationVersions() {
+    return null;
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorPingResponse.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorPingResponse.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorPingResponse.java
new file mode 100644
index 0000000..3978e81
--- /dev/null
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorPingResponse.java
@@ -0,0 +1,46 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.client.internal.locator.wan;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import com.gemstone.gemfire.internal.DataSerializableFixedID;
+import com.gemstone.gemfire.internal.Version;
+
+/**
+ * 
+ * @author Kishor Bachhav
+ */
+public class RemoteLocatorPingResponse implements DataSerializableFixedID {
+
+
+  /** Used by DataSerializer */
+  public RemoteLocatorPingResponse() {
+    super();
+  }
+
+  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+  }
+
+  public void toData(DataOutput out) throws IOException {
+  }
+
+
+
+  public int getDSFID() {
+    return DataSerializableFixedID.REMOTE_LOCATOR_PING_RESPONSE;
+  }
+
+  @Override
+  public Version[] getSerializationVersions() {
+    return null;
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorRequest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorRequest.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorRequest.java
new file mode 100644
index 0000000..8187531
--- /dev/null
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorRequest.java
@@ -0,0 +1,57 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.client.internal.locator.wan;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+
+import com.gemstone.gemfire.internal.DataSerializableFixedID;
+import com.gemstone.gemfire.internal.Version;
+/**
+ * 
+ * @author Suranjan Kumar
+ * @author Yogesh Mahajan
+ * @author Kishor Bachhav
+ *
+ */
+public class RemoteLocatorRequest implements DataSerializableFixedID{
+  private int distributedSystemId ;
+
+  public RemoteLocatorRequest() {
+    super();
+  }
+  public RemoteLocatorRequest(int dsId, String serverGroup) {
+    this.distributedSystemId = dsId;
+  }
+  
+  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+    this.distributedSystemId = in.readInt();
+  }
+
+  public void toData(DataOutput out) throws IOException {
+    out.writeInt(this.distributedSystemId);
+  }
+
+  public int getDsId() {
+    return this.distributedSystemId;
+  }
+  
+  public int getDSFID() {
+    return DataSerializableFixedID.REMOTE_LOCATOR_REQUEST;
+  }
+
+  @Override
+  public String toString() {
+    return "RemoteLocatorRequest{dsName=" + distributedSystemId + "}";
+  }
+  @Override
+  public Version[] getSerializationVersions() {
+    return null;
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorResponse.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorResponse.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorResponse.java
new file mode 100644
index 0000000..5c61bdf
--- /dev/null
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/RemoteLocatorResponse.java
@@ -0,0 +1,65 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.client.internal.locator.wan;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.Set;
+
+import com.gemstone.gemfire.DataSerializer;
+import com.gemstone.gemfire.internal.DataSerializableFixedID;
+import com.gemstone.gemfire.internal.Version;
+
+/**
+ * 
+ * @author Suranjan Kumar
+ * @author Yogesh Mahajan
+ * @author Kishor Bachhav
+ *
+ */
+public class RemoteLocatorResponse implements DataSerializableFixedID{
+
+  private Set<String> locators ;
+
+  /** Used by DataSerializer */
+  public RemoteLocatorResponse() {
+    super();
+  }
+  
+  public RemoteLocatorResponse(Set<String> locators) {
+    this.locators = locators;
+  }
+  
+  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+    this.locators = DataSerializer.readObject(in);
+  }
+
+  public void toData(DataOutput out) throws IOException {
+    DataSerializer.writeObject(this.locators, out);
+  }
+
+  public Set<String> getLocators() {
+    return this.locators;
+  }
+  
+  @Override
+  public String toString() {
+    return "RemoteLocatorResponse{locators=" + locators +"}";
+  }
+
+  public int getDSFID() {
+    return DataSerializableFixedID.REMOTE_LOCATOR_RESPONSE;
+  }
+
+  @Override
+  public Version[] getSerializationVersions() {
+     return null;
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/WANFactoryImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/WANFactoryImpl.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/WANFactoryImpl.java
new file mode 100644
index 0000000..a44a449
--- /dev/null
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/WANFactoryImpl.java
@@ -0,0 +1,58 @@
+package com.gemstone.gemfire.cache.client.internal.locator.wan;
+
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.wan.GatewayReceiverFactory;
+import com.gemstone.gemfire.cache.wan.GatewaySenderFactory;
+import com.gemstone.gemfire.distributed.internal.WanLocatorDiscoverer;
+import com.gemstone.gemfire.internal.DSFIDFactory;
+import com.gemstone.gemfire.internal.DataSerializableFixedID;
+import com.gemstone.gemfire.internal.cache.wan.GatewayReceiverFactoryImpl;
+import com.gemstone.gemfire.internal.cache.wan.GatewaySenderFactoryImpl;
+import com.gemstone.gemfire.internal.cache.wan.spi.WANFactory;
+
+public class WANFactoryImpl implements WANFactory {
+  
+  @Override
+  public void initialize() {
+    DSFIDFactory.registerDSFID(
+        DataSerializableFixedID.REMOTE_LOCATOR_JOIN_REQUEST,
+        RemoteLocatorJoinRequest.class);
+    DSFIDFactory.registerDSFID(
+        DataSerializableFixedID.REMOTE_LOCATOR_JOIN_RESPONSE,
+        RemoteLocatorJoinResponse.class);
+    DSFIDFactory.registerDSFID(DataSerializableFixedID.REMOTE_LOCATOR_REQUEST,
+        RemoteLocatorRequest.class);
+    DSFIDFactory.registerDSFID(DataSerializableFixedID.LOCATOR_JOIN_MESSAGE,
+        LocatorJoinMessage.class);
+    DSFIDFactory.registerDSFID(
+        DataSerializableFixedID.REMOTE_LOCATOR_PING_REQUEST,
+        RemoteLocatorPingRequest.class);
+    DSFIDFactory.registerDSFID(
+        DataSerializableFixedID.REMOTE_LOCATOR_PING_RESPONSE,
+        RemoteLocatorPingResponse.class);
+    DSFIDFactory.registerDSFID(DataSerializableFixedID.REMOTE_LOCATOR_RESPONSE,
+        RemoteLocatorResponse.class);
+  }
+
+  @Override
+  public GatewaySenderFactory createGatewaySenderFactory(Cache cache) {
+    return new GatewaySenderFactoryImpl(cache);
+  }
+
+  @Override
+  public GatewayReceiverFactory createGatewayReceiverFactory(Cache cache) {
+    return new GatewayReceiverFactoryImpl(cache);
+  }
+
+  @Override
+  public WanLocatorDiscoverer createLocatorDiscoverer() {
+    return new WanLocatorDiscovererImpl();
+  }
+
+  @Override
+  public LocatorMembershipListener createLocatorMembershipListener() {
+    return new LocatorMembershipListenerImpl();
+  }
+  
+  
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/WanLocatorDiscovererImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/WanLocatorDiscovererImpl.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/WanLocatorDiscovererImpl.java
new file mode 100644
index 0000000..e6ef6e0
--- /dev/null
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/locator/wan/WanLocatorDiscovererImpl.java
@@ -0,0 +1,129 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.client.internal.locator.wan;
+
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ThreadFactory;
+
+import org.apache.logging.log4j.Logger;
+
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl;
+import com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorDiscovery;
+import com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListener;
+import com.gemstone.gemfire.cache.client.internal.locator.wan.RemoteLocatorJoinRequest;
+import com.gemstone.gemfire.distributed.internal.WanLocatorDiscoverer;
+import com.gemstone.gemfire.internal.admin.remote.DistributionLocatorId;
+import com.gemstone.gemfire.internal.logging.LogService;
+import com.gemstone.gemfire.internal.logging.LoggingThreadGroup;
+
+public class WanLocatorDiscovererImpl implements WanLocatorDiscoverer{
+
+  private static final Logger logger = LogService.getLogger();
+  
+  private ExecutorService _executor;
+  
+  public WanLocatorDiscovererImpl() {
+    
+  }
+  
+  @Override
+  public void discover(int port, DistributionConfigImpl config, LocatorMembershipListener locatorListener) {
+    final LoggingThreadGroup loggingThreadGroup = LoggingThreadGroup
+        .createThreadGroup("WAN Locator Discovery Logger Group", logger);
+
+    final ThreadFactory threadFactory = new ThreadFactory() {
+      public Thread newThread(final Runnable task) {
+        final Thread thread = new Thread(loggingThreadGroup, task,
+            "WAN Locator Discovery Thread");
+        thread.setDaemon(true);
+        return thread;
+      }
+    };
+
+    this._executor = Executors.newCachedThreadPool(threadFactory);
+    exchangeLocalLocators(port, config, locatorListener);
+    exchangeRemoteLocators(port, config, locatorListener);
+    this._executor.shutdown();
+  }
+  
+  
+  /**
+   * For WAN 70 Exchange the locator information within the distributed system
+   * 
+   * @param config
+   */
+  private void exchangeLocalLocators(int port, DistributionConfigImpl config, LocatorMembershipListener locatorListener) {
+    String localLocator = config.getStartLocator();
+    DistributionLocatorId locatorId = null;
+    if (localLocator.equals(DistributionConfig.DEFAULT_START_LOCATOR)) {
+      locatorId = new DistributionLocatorId(port, config.getBindAddress());
+    }
+    else {
+      locatorId = new DistributionLocatorId(localLocator);
+    }
+    LocatorHelper.addLocator(config.getDistributedSystemId(), locatorId, locatorListener, null);
+
+    RemoteLocatorJoinRequest request = buildRemoteDSJoinRequest(port, config);
+    StringTokenizer locatorsOnThisVM = new StringTokenizer(
+        config.getLocators(), ",");
+    while (locatorsOnThisVM.hasMoreTokens()) {
+      DistributionLocatorId localLocatorId = new DistributionLocatorId(
+          locatorsOnThisVM.nextToken());
+      if (!locatorId.equals(localLocatorId)) {
+        LocatorDiscovery localDiscovery = new LocatorDiscovery(localLocatorId, request, locatorListener);
+        LocatorDiscovery.LocalLocatorDiscovery localLocatorDiscovery = localDiscovery.new LocalLocatorDiscovery();
+        this._executor.execute(localLocatorDiscovery);
+      }
+    }
+  }
+  
+  /**
+   * For WAN 70 Exchange the locator information across the distributed systems
+   * (sites)
+   * 
+   * @param config
+   */
+  private void exchangeRemoteLocators(int port, DistributionConfigImpl config, LocatorMembershipListener locatorListener) {
+    RemoteLocatorJoinRequest request = buildRemoteDSJoinRequest(port, config);
+    String remoteDustributedSystems = config.getRemoteLocators();
+    if (remoteDustributedSystems.length() > 0) {
+      StringTokenizer remoteLocators = new StringTokenizer(
+          remoteDustributedSystems, ",");
+      while (remoteLocators.hasMoreTokens()) {
+        DistributionLocatorId remoteLocatorId = new DistributionLocatorId(
+            remoteLocators.nextToken());
+        LocatorDiscovery localDiscovery = new LocatorDiscovery(remoteLocatorId,
+            request, locatorListener);
+        LocatorDiscovery.RemoteLocatorDiscovery remoteLocatorDiscovery = localDiscovery.new RemoteLocatorDiscovery();
+        this._executor.execute(remoteLocatorDiscovery);
+      }
+    }
+  }
+  
+  private RemoteLocatorJoinRequest buildRemoteDSJoinRequest(int port,
+      DistributionConfigImpl config) {
+    String localLocator = config.getStartLocator();
+    DistributionLocatorId locatorId = null;
+    if (localLocator.equals(DistributionConfig.DEFAULT_START_LOCATOR)) {
+      locatorId = new DistributionLocatorId(port, config.getBindAddress());
+    }
+    else {
+      locatorId = new DistributionLocatorId(localLocator);
+    }
+    RemoteLocatorJoinRequest request = new RemoteLocatorJoinRequest(
+        config.getDistributedSystemId(), locatorId, "");
+    return request;
+  }
+  
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractRemoteGatewaySender.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractRemoteGatewaySender.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractRemoteGatewaySender.java
new file mode 100644
index 0000000..e9a0451
--- /dev/null
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/AbstractRemoteGatewaySender.java
@@ -0,0 +1,153 @@
+package com.gemstone.gemfire.internal.cache.wan;
+
+import java.io.IOException;
+import java.net.ConnectException;
+import java.util.Iterator;
+import java.util.Properties;
+import java.util.StringTokenizer;
+
+import org.apache.logging.log4j.Logger;
+
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.client.PoolManager;
+import com.gemstone.gemfire.cache.client.internal.PoolImpl;
+import com.gemstone.gemfire.cache.client.internal.locator.wan.RemoteLocatorRequest;
+import com.gemstone.gemfire.cache.client.internal.locator.wan.RemoteLocatorResponse;
+import com.gemstone.gemfire.cache.wan.GatewayReceiver;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.distributed.internal.WanLocatorDiscoverer;
+import com.gemstone.gemfire.internal.admin.remote.DistributionLocatorId;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.cache.PoolFactoryImpl;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.internal.logging.LogService;
+import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
+import com.gemstone.gemfire.distributed.internal.tcpserver.TcpClient;
+
+public abstract class AbstractRemoteGatewaySender extends AbstractGatewaySender {
+  private static final Logger logger = LogService.getLogger();
+  
+  public AbstractRemoteGatewaySender() {
+    
+  }
+  public AbstractRemoteGatewaySender(Cache cache, GatewaySenderAttributes attrs){
+    super(cache, attrs);
+  }
+  
+  /** used to reduce warning logs in case remote locator is down (#47634) */ 
+  protected int proxyFailureTries = 0; 
+  
+  public synchronized void initProxy() {
+    // return if it is being used for WBCL or proxy is already created
+    if (this.remoteDSId == DEFAULT_DISTRIBUTED_SYSTEM_ID || this.proxy != null
+        && !this.proxy.isDestroyed()) {
+      return;
+    }
+
+    int locatorCount = 0;
+    PoolFactoryImpl pf = (PoolFactoryImpl) PoolManager.createFactory();
+    pf.setPRSingleHopEnabled(false);
+    if (this.locatorDiscoveryCallback != null) {
+      pf.setLocatorDiscoveryCallback(locatorDiscoveryCallback);
+    }
+    pf.setReadTimeout(this.socketReadTimeout);
+    pf.setIdleTimeout(connectionIdleTimeOut);
+    pf.setSocketBufferSize(socketBufferSize);
+    pf.setServerGroup(GatewayReceiver.RECEIVER_GROUP);
+    RemoteLocatorRequest request = new RemoteLocatorRequest(this.remoteDSId, pf
+        .getPoolAttributes().getServerGroup());
+    String locators = ((GemFireCacheImpl) this.cache).getDistributedSystem()
+        .getConfig().getLocators();
+    if (logger.isDebugEnabled()) {
+      logger.debug("Gateway Sender is attempting to configure pool with remote locator information");
+    }
+    StringTokenizer locatorsOnThisVM = new StringTokenizer(locators, ",");
+    while (locatorsOnThisVM.hasMoreTokens()) {
+      String localLocator = locatorsOnThisVM.nextToken();
+      DistributionLocatorId locatorID = new DistributionLocatorId(localLocator);
+      try {
+        RemoteLocatorResponse response = (RemoteLocatorResponse) TcpClient
+            .requestToServer(locatorID.getHost(), locatorID.getPort(), request,
+                WanLocatorDiscoverer.WAN_LOCATOR_CONNECTION_TIMEOUT);
+
+        if (response != null) {
+          if (response.getLocators() == null) {
+            if (logProxyFailure()) {
+              logger.warn(LocalizedMessage.create(
+                  LocalizedStrings.AbstractGatewaySender_REMOTE_LOCATOR_FOR_REMOTE_SITE_0_IS_NOT_AVAILABLE_IN_LOCAL_LOCATOR_1,
+                      new Object[] { remoteDSId, localLocator }));
+            }
+            continue;
+          }
+          if (logger.isDebugEnabled()) {
+            logger.debug("Received the remote site {} location information:", this.remoteDSId, response.getLocators());
+          }
+          StringBuffer strBuffer = new StringBuffer();
+          Iterator<String> itr = response.getLocators().iterator();
+          while (itr.hasNext()) {
+            DistributionLocatorId locatorId = new DistributionLocatorId(itr.next());
+            pf.addLocator(locatorId.getHost().getHostName(), locatorId.getPort());
+            locatorCount++;
+          }
+          break;
+        }
+      } catch (IOException ioe) {
+        if (logProxyFailure()) {
+          // don't print stack trace for connection failures
+          String ioeStr = "";
+          if (!logger.isDebugEnabled() && ioe instanceof ConnectException) {
+            ioeStr = ": " + ioe.toString();
+            ioe = null;
+          }
+        logger.warn(LocalizedMessage.create(
+            LocalizedStrings.AbstractGatewaySender_SENDER_0_IS_NOT_ABLE_TO_CONNECT_TO_LOCAL_LOCATOR_1,
+                new Object[] { this.id, localLocator + ioeStr  }), ioe);        
+        }
+        continue;
+      } catch (ClassNotFoundException e) {
+        if (logProxyFailure()) {
+          logger.warn(LocalizedMessage.create(
+              LocalizedStrings.AbstractGatewaySender_SENDER_0_IS_NOT_ABLE_TO_CONNECT_TO_LOCAL_LOCATOR_1,
+                  new Object[] { this.id, localLocator }), e);
+        }
+        continue;
+      }
+    }
+
+    if (locatorCount == 0) {
+      if (logProxyFailure()) {
+        logger.fatal(LocalizedMessage.create(
+            LocalizedStrings.AbstractGatewaySender_SENDER_0_COULD_NOT_GET_REMOTE_LOCATOR_INFORMATION_FOR_SITE_1,
+                new Object[] { this.id, this.remoteDSId }));
+      }
+      this.proxyFailureTries++;
+      throw new GatewaySenderConfigurationException(
+          LocalizedStrings.AbstractGatewaySender_SENDER_0_COULD_NOT_GET_REMOTE_LOCATOR_INFORMATION_FOR_SITE_1
+              .toLocalizedString(new Object[] { this.id, this.remoteDSId}));
+    }
+    pf.init(this);
+    this.proxy = ((PoolImpl) pf.create(this.getId()));
+    if (this.proxyFailureTries > 0) {
+      logger.info(LocalizedMessage.create(LocalizedStrings.AbstractGatewaySender_SENDER_0_GOT_REMOTE_LOCATOR_INFORMATION_FOR_SITE_1,
+              new Object[] { this.id, this.remoteDSId, this.proxyFailureTries }));
+      this.proxyFailureTries = 0;
+    }
+  }
+  
+  protected boolean logProxyFailure() {
+    assert Thread.holdsLock(this);
+    // always log the first failure
+    if (logger.isDebugEnabled() || this.proxyFailureTries == 0) {
+      return true;
+    } else {
+      // subsequent failures will be logged on 30th, 300th, 3000th try
+      // each try is at 100millis from higher layer so this accounts for logging
+      // after 3s, 30s and then every 5mins
+      if (this.proxyFailureTries >= 3000) {
+        return (this.proxyFailureTries % 3000) == 0;
+      } else {
+        return (this.proxyFailureTries == 30 || this.proxyFailureTries == 300);
+      }
+    }
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverFactoryImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverFactoryImpl.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverFactoryImpl.java
new file mode 100644
index 0000000..f3e03a8
--- /dev/null
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverFactoryImpl.java
@@ -0,0 +1,140 @@
+/*
+ * =========================================================================
+ * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved. 
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ * ========================================================================
+ */
+
+package com.gemstone.gemfire.internal.cache.wan;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.wan.GatewayReceiver;
+import com.gemstone.gemfire.cache.wan.GatewayReceiverFactory;
+import com.gemstone.gemfire.cache.wan.GatewayTransportFilter;
+import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.distributed.internal.ResourceEvent;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation;
+import com.gemstone.gemfire.internal.cache.xmlcache.GatewayReceiverCreation;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+
+/**
+ * @author Suranjan Kumar
+ * @author Yogesh Mahajan
+ * 
+ * @since 7.0
+ */
+public class GatewayReceiverFactoryImpl implements GatewayReceiverFactory {
+
+  private int startPort = GatewayReceiver.DEFAULT_START_PORT;
+  
+  private int endPort = GatewayReceiver.DEFAULT_END_PORT;
+  
+  private int timeBetPings = GatewayReceiver.DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS;
+
+  private int socketBuffSize = GatewayReceiver.DEFAULT_SOCKET_BUFFER_SIZE;
+
+  private String bindAdd= GatewayReceiver.DEFAULT_BIND_ADDRESS; 
+  
+  private String hostnameForSenders = GatewayReceiver.DEFAULT_HOSTNAME_FOR_SENDERS;  
+  
+  private boolean manualStart = GatewayReceiver.DEFAULT_MANUAL_START;
+
+  private List<GatewayTransportFilter> filters = new ArrayList<GatewayTransportFilter>();
+  
+  private Cache cache;
+
+  public GatewayReceiverFactoryImpl() {
+    
+  }
+  public GatewayReceiverFactoryImpl(Cache cache) {
+   this.cache = cache;
+  }
+  
+  public GatewayReceiverFactory addGatewayTransportFilter(
+      GatewayTransportFilter filter) {
+    this.filters.add(filter);
+    return this;
+  }
+
+  public GatewayReceiverFactory removeGatewayTransportFilter(
+      GatewayTransportFilter filter) {
+    this.filters.remove(filter);
+    return this;
+  }
+
+  public GatewayReceiverFactory setMaximumTimeBetweenPings(int time) {
+    this.timeBetPings = time;
+    return this;
+  }
+
+  public GatewayReceiverFactory setStartPort(int port) {
+    this.startPort = port;
+    return this;
+  }
+  
+  public GatewayReceiverFactory setEndPort(int port) {
+    this.endPort = port;
+    return this;
+  }
+  
+  public GatewayReceiverFactory setSocketBufferSize(int size) {
+    this.socketBuffSize = size;
+    return this;
+  }
+
+  public GatewayReceiverFactory setBindAddress(String address) {
+    this.bindAdd = address;
+    return this;
+  }
+  
+  public GatewayReceiverFactory setHostnameForSenders(String address) {
+    this.hostnameForSenders = address;
+    return this;
+  } 
+
+  public GatewayReceiverFactory setManualStart(boolean start) {
+    this.manualStart = start;
+    return this;
+  }
+  
+  public GatewayReceiver create() {
+    if (this.startPort > this.endPort) {
+      throw new IllegalStateException(
+          "Please specify either start port a value which is less than end port.");
+    }
+    GatewayReceiver recv = null;
+    if (this.cache instanceof GemFireCacheImpl) {
+      recv = new GatewayReceiverImpl(this.cache, this.startPort, this.endPort,
+          this.timeBetPings, this.socketBuffSize, this.bindAdd, this.filters,
+          this.hostnameForSenders, this.manualStart);
+      ((GemFireCacheImpl)cache).addGatewayReceiver(recv);
+      InternalDistributedSystem system = (InternalDistributedSystem) this.cache
+      .getDistributedSystem();
+      system.handleResourceEvent(ResourceEvent.GATEWAYRECEIVER_CREATE, recv);
+      if (!this.manualStart) {
+        try {
+          recv.start();
+        }
+        catch (IOException ioe) {
+          throw new GatewayReceiverException(
+              LocalizedStrings.GatewayReceiver_EXCEPTION_WHILE_STARTING_GATEWAY_RECEIVER
+                  .toLocalizedString(), ioe);
+        }
+      }
+    } else if (this.cache instanceof CacheCreation) {
+      recv = new GatewayReceiverCreation(this.cache, this.startPort, this.endPort,
+          this.timeBetPings, this.socketBuffSize, this.bindAdd, this.filters,
+          this.hostnameForSenders, this.manualStart);
+      ((CacheCreation)cache).addGatewayReceiver(recv);
+    }
+    return recv;
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverImpl.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverImpl.java
new file mode 100644
index 0000000..0a14e2e
--- /dev/null
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewayReceiverImpl.java
@@ -0,0 +1,245 @@
+/*
+ * =========================================================================
+ * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved. 
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ * ========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.wan;
+
+import java.io.IOException;
+import java.net.BindException;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.logging.log4j.Logger;
+
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.cache.wan.GatewayReceiver;
+import com.gemstone.gemfire.cache.wan.GatewayTransportFilter;
+import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.distributed.internal.ResourceEvent;
+import com.gemstone.gemfire.internal.AvailablePort;
+import com.gemstone.gemfire.internal.SocketCreator;
+import com.gemstone.gemfire.internal.cache.CacheServerImpl;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.internal.logging.LogService;
+import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
+
+/**
+ * @author Suranjan Kumar
+ * @author Yogesh Mahajan
+ * 
+ * @since 7.0
+ */
+public class GatewayReceiverImpl implements GatewayReceiver {
+
+  private static final Logger logger = LogService.getLogger();
+  
+  private String host;
+
+  private int startPort;
+  
+  private int endPort;
+  
+  private int port;
+
+  private int timeBetPings;
+
+  private int socketBufferSize;
+  
+  private boolean manualStart;
+
+  private final List<GatewayTransportFilter> filters;
+
+  private String bindAdd;
+  
+  private CacheServer receiver;
+
+  private final GemFireCacheImpl cache;
+  
+  public GatewayReceiverImpl(Cache cache, int startPort,
+      int endPort, int timeBetPings, int buffSize, String bindAdd,
+      List<GatewayTransportFilter> filters, String hostnameForSenders, boolean manualStart) {
+    this.cache = (GemFireCacheImpl)cache;
+    
+    /*
+     * If user has set hostNameForSenders then it should take precedence over
+     * bindAddress. If user hasn't set either hostNameForSenders or bindAddress
+     * then getLocalHost().getHostName() should be used.
+     */
+    if (hostnameForSenders == null || hostnameForSenders.isEmpty()) {
+      if (bindAdd == null || bindAdd.isEmpty()) {
+        try {
+          logger.warn(LocalizedMessage.create(LocalizedStrings.GatewayReceiverImpl_USING_LOCAL_HOST));
+          this.host = SocketCreator.getLocalHost().getHostName();
+        } catch (UnknownHostException e) {
+          throw new IllegalStateException(
+              LocalizedStrings.GatewayReceiverImpl_COULD_NOT_GET_HOST_NAME
+                  .toLocalizedString(),
+              e);
+        }
+      } else {
+        this.host = bindAdd;
+      }
+    } else {
+      this.host = hostnameForSenders;
+    }
+
+    this.startPort = startPort;
+    this.endPort = endPort;
+    this.timeBetPings = timeBetPings;
+    this.socketBufferSize = buffSize;
+    this.bindAdd = bindAdd;
+    this.filters = filters;
+    this.manualStart = manualStart;
+  }
+
+  public List<GatewayTransportFilter> getGatewayTransportFilters() {
+    return this.filters;
+  }
+
+  public int getMaximumTimeBetweenPings() {
+    return this.timeBetPings;
+  }
+
+  public int getPort() {
+    return this.port;
+  }
+
+  public int getStartPort() {
+    return this.startPort;
+  }
+  
+  public int getEndPort() {
+    return this.endPort;
+  }
+  
+  public int getSocketBufferSize() {
+    return this.socketBufferSize;
+  }
+
+  public boolean isManualStart() {
+    return this.manualStart;
+  }
+  
+  public CacheServer getServer() {
+    return receiver;
+  }
+  
+  public void start() throws IOException {
+    if (receiver == null) {
+      receiver = this.cache.addCacheServer(true);
+    }
+    if (receiver.isRunning()) {
+      logger.warn(LocalizedMessage.create(LocalizedStrings.GatewayReceiver_IS_ALREADY_RUNNING));
+      return;
+    }
+    boolean started = false;
+    this.port = getPortToStart();
+    while (!started && this.port != -1) {
+      receiver.setPort(this.port);
+      receiver.setSocketBufferSize(socketBufferSize);
+      receiver.setMaximumTimeBetweenPings(timeBetPings);
+      receiver.setHostnameForClients(host);
+      receiver.setBindAddress(bindAdd);
+      receiver.setGroups(new String[] { GatewayReceiverImpl.RECEIVER_GROUP });
+      ((CacheServerImpl)receiver).setGatewayTransportFilter(this.filters);
+      try {
+        ((CacheServerImpl)receiver).start();
+        started = true;
+      } catch (BindException be) {
+        if (be.getCause() != null
+            && be.getCause().getMessage()
+                .contains("assign requested address")) {
+          throw new GatewayReceiverException(
+              LocalizedStrings.SocketCreator_FAILED_TO_CREATE_SERVER_SOCKET_ON_0_1
+                  .toLocalizedString(new Object[] { bindAdd,
+                      Integer.valueOf(this.port) }));
+        }
+        // ignore as this port might have been used by other threads.
+        logger.warn(LocalizedMessage.create(LocalizedStrings.GatewayReceiver_Address_Already_In_Use, this.port));
+        this.port = getPortToStart();
+      } catch (SocketException se) {
+        if (se.getMessage().contains("Address already in use")) {
+          logger.warn(LocalizedMessage.create(LocalizedStrings.GatewayReceiver_Address_Already_In_Use, this.port));
+          this.port = getPortToStart();
+
+        } else {
+          throw se;
+        }
+      }
+      
+    }
+    if (!started) {
+      throw new IllegalStateException(
+          "No available free port found in the given range.");
+    }
+    logger.info(LocalizedMessage.create(LocalizedStrings.GatewayReceiver_STARTED_ON_PORT, this.port));
+
+    InternalDistributedSystem system = this.cache.getDistributedSystem();
+    system.handleResourceEvent(ResourceEvent.GATEWAYRECEIVER_START, this);
+
+  }
+  
+  private int getPortToStart(){
+    // choose a random port from the given port range
+    int rPort;
+    if (this.startPort == this.endPort) {
+      rPort = this.startPort;
+    } else {
+      rPort = AvailablePort.getRandomAvailablePortInRange(this.startPort,
+          this.endPort, AvailablePort.SOCKET);
+    }
+    return rPort;
+  }
+  
+  public void stop() {
+    if(!isRunning()){
+      throw new GatewayReceiverException(LocalizedStrings.GatewayReceiver_IS_NOT_RUNNING.toLocalizedString());
+    }
+    receiver.stop();
+
+//    InternalDistributedSystem system = ((GemFireCacheImpl) this.cache)
+//        .getDistributedSystem();
+//    system.handleResourceEvent(ResourceEvent.GATEWAYRECEIVER_STOP, this);
+
+  }
+
+  public String getHost() {
+    return this.host;
+  }
+
+  public String getBindAddress() {
+    return this.bindAdd;
+  }
+
+  public boolean isRunning() {
+    if (this.receiver != null) {
+      return this.receiver.isRunning();
+    }
+    return false;
+  }
+  
+  public String toString() {
+    return new StringBuffer()
+      .append("Gateway Receiver")
+      .append("@").append(Integer.toHexString(hashCode()))
+      .append(" [")
+      .append("host='").append(getHost())
+      .append("'; port=").append(getPort())
+      .append("; bindAddress=").append(getBindAddress())
+      .append("; maximumTimeBetweenPings=").append(getMaximumTimeBetweenPings())
+      .append("; socketBufferSize=").append(getSocketBufferSize())
+      .append("; isManualStart=").append(isManualStart())
+      .append("; group=").append(Arrays.toString(new String[]{GatewayReceiverImpl.RECEIVER_GROUP}))
+      .append("]")
+      .toString();
+  }
+   
+}


[41/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
new file mode 100644
index 0000000..c58e02c
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
@@ -0,0 +1,42 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.query.cq.dunit;
+
+import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
+
+import dunit.SerializableRunnable;
+
+/**
+ * Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
+ *
+ */
+public class CqQueryUsingPoolOptimizedExecuteDUnitTest extends CqQueryUsingPoolDUnitTest{
+
+  public CqQueryUsingPoolOptimizedExecuteDUnitTest(String name) {
+    super(name);
+   }
+
+  public void setUp() throws Exception {
+    super.setUp();
+    invokeInEveryVM(new SerializableRunnable("getSystem") {
+      public void run() {
+        CqServiceImpl.EXECUTE_QUERY_DURING_INIT = false;
+      }
+    });
+  }
+  
+  @Override
+  public void tearDown2() throws Exception {
+    invokeInEveryVM(new SerializableRunnable("getSystem") {
+      public void run() {
+        CqServiceImpl.EXECUTE_QUERY_DURING_INIT = true;
+      }
+    });
+    super.tearDown2();
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
new file mode 100644
index 0000000..e7f3e0e
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
@@ -0,0 +1,1131 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.query.cq.dunit;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.data.Portfolio;
+import com.gemstone.gemfire.cache.query.internal.DefaultQueryService;
+import com.gemstone.gemfire.cache.query.internal.cq.InternalCqQuery;
+import com.gemstone.gemfire.cache.query.internal.cq.ServerCQImpl;
+import com.gemstone.gemfire.cache.query.internal.cq.CqService;
+import com.gemstone.gemfire.cache.query.internal.index.IndexManager;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.cache30.CacheTestCase;
+import com.gemstone.gemfire.internal.AvailablePortHelper;
+
+import dunit.Host;
+import dunit.SerializableRunnable;
+import dunit.VM;
+
+/**
+ * This class tests the ContiunousQuery mechanism in GemFire.
+ *
+ * @author anil
+ */
+public class CqResultSetUsingPoolDUnitTest extends CacheTestCase {
+
+  protected CqQueryUsingPoolDUnitTest cqDUnitTest = new CqQueryUsingPoolDUnitTest("CqResultSetUsingPoolDUnitTest");
+  
+  private final String selStr = "SELECT * FROM /root/regionA";
+  
+  /** Supported queries */
+  public final String[] condition = new String [] {
+    /* 0  */ " p WHERE p.ID > 3",
+    /* 1  */ " p WHERE p.ID < 3",
+    /* 2  */ "   WHERE   ID = 3",
+    /* 3  */ " p WHERE p.ID >= 3",
+    /* 4  */ " p WHERE p.ID <= 3",
+    /* 5  */ " p WHERE p.ID > 3 AND p.status = 'active'",
+    /* 6  */ "   WHERE   status = 'active' AND ID < 3",
+    /* 7  */ " p WHERE p.names[0] = 'aaa'",
+    /* 8  */ " p WHERE p.status LIKE 'active'",
+    /* 9  */ " p WHERE p.collectionHolderMap.get('1').arr[0] = '0'",
+    /* 10 */ " p WHERE p.position1.portfolioId > 3",
+    /* 11 */ " p where p.position3[1].portfolioId = 2",
+    /* 12 */ " p where NOT(SELECT DISTINCT * FROM positions.values pos " +
+             " WHERE pos.secId in SET('YHOO', 'SUN', 'IBM', 'YHOO', 'GOOG', " +
+             " 'MSFT', 'AOL', 'APPL', 'ORCL', 'SAP', 'DELL', 'RHAT', 'NOVL', 'HP')).isEmpty",
+    /* 13  */ " p WHERE p.ID != 3 AND p.ID !=4",
+    /* 14  */ " p WHERE (p.ID = 2 OR p.ID = 4) AND p.status = 'active'",
+
+  };
+
+  /** For intial size of 5 */
+  public final int[] resultSize = new int [] {
+    /* 0  */ 2,
+    /* 1  */ 2,
+    /* 2  */ 1,
+    /* 3  */ 3,
+    /* 4  */ 3,
+    /* 5  */ 1,
+    /* 6  */ 1,
+    /* 7  */ 5,
+    /* 8  */ 2,
+    /* 9  */ 5,
+    /* 10 */ 2,
+    /* 11 */ 5,
+    /* 12 */ 5,
+    /* 13 */ 3,
+    /* 14 */ 2,
+  };
+
+  /** For intial size of 5 */
+  public final String[][] expectedKeys = new String [][] {
+    /* 0  */ {"key-4", "key-5"},
+    /* 1  */ {"key-1", "key-2"},
+    /* 2  */ {"key-3"},
+    /* 3  */ {"key-3", "key-4", "key-5"},
+    /* 4  */ {"key-1", "key-2", "key-3"},
+    /* 5  */ {"key-4"},
+    /* 6  */ {"key-2"},
+    /* 7  */ {"key-1", "key-2", "key-3","key-4", "key-5"},
+    /* 8  */ {"key-2", "key-4"},
+    /* 9  */ {"key-1", "key-2", "key-3","key-4", "key-5"},
+    /* 10 */ {"key-4", "key-5"},
+    /* 11 */ {"key-1", "key-2", "key-3","key-4", "key-5"},
+    /* 12 */ {"key-1", "key-2", "key-3","key-4", "key-5"},
+    /* 13 */ {"key-1", "key-2", "key-5"},
+    /* 14  */ {"key-2", "key-4"},
+  };
+
+
+  
+  /** Unsupported queries */
+  public final String[] condition2 = new String [] {
+    /* 0  */ " p1, /root/regionB p2 WHERE p1.status = p2.status",
+    /* 1  */ " p, p.positions.values p1 WHERE p1.secId = 'IBM'",
+    /* 2  */ " p, p.positions.values AS pos WHERE pos.secId != '1'",
+    /* 3  */ " p WHERE p.ID in (SELECT p1.ID FROM /root/regionA p1 WHERE p1.ID > 3)",
+    /* 4  */ ".entries entry WHERE entry.key = '1'",
+    /* 5  */ ".entries entry WHERE entry.value.ID > '3'",
+    /* 6  */ ".values p WHERE p.ID > '3' and p.status = 'active'",
+    /* 7  */ " p, p.position3 pos where pos.portfolioId  = 1",
+  };
+  
+
+  public CqResultSetUsingPoolDUnitTest(String name) {
+    super(name);
+  }
+  
+  public void setUp() throws Exception {
+    super.setUp();
+    
+    // avoid IllegalStateException from HandShake by connecting all vms tor
+    // system before creating ConnectionPools
+    getSystem();
+    invokeInEveryVM(new SerializableRunnable("getSystem") {
+      public void run() {
+        getSystem();
+      }
+    });
+    
+  }
+  
+  
+  /**
+   * Tests CQ Result Set.
+   * 
+   * @throws Exception
+   */
+  public void testCqResults() throws Exception
+  {
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+
+    cqDUnitTest.createServer(server);
+
+    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+
+    String poolName = "testCqResults";
+    cqDUnitTest.createPool(client, poolName, host0, port);
+    
+    // Create client.
+    cqDUnitTest.createClient(client, port, host0);
+
+    // Put 5 entries into the region.
+    cqDUnitTest.createValues(server, "regionA", 5);
+    
+    // Test for supported queries.
+    String cqQuery = "";
+    for (int queryCnt=0; queryCnt < condition.length; queryCnt++) {
+      cqQuery = selStr + condition[queryCnt];
+      cqDUnitTest.createCQ(client, poolName, "testCqResultsP_" + queryCnt, cqQuery);
+      cqDUnitTest.executeCQ(client, "testCqResultsP_" + queryCnt, true, resultSize[queryCnt], expectedKeys[queryCnt], null);
+    }
+        
+    // Test unsupported queries.
+    for (int queryCnt=0; queryCnt < condition2.length; queryCnt++) {
+      cqQuery = selStr + condition2[queryCnt];
+      
+      try {
+        cqDUnitTest.createCQ(client, poolName, "testCqResultsF_" + queryCnt, cqQuery);
+        //cqDUnitTest.executeCQ(client, "testCqResultsF_" + queryCnt, true, cqDUnitTest.noTest, null);
+        fail("UnSupported CQ Query, Expected to fail. " +
+            " CQ :" + "testCqResultsF_" + queryCnt +
+            " Query : " + cqQuery);
+      } catch (Exception ex) {
+        // Expected.
+      }
+    }
+    
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server); 
+  }
+
+
+  /**
+   * Tests CQ Result Set with Compact Range Index.
+   * 
+   * @throws Exception
+   */
+  public void testCqResultsWithCompactRangeIndex() throws Exception
+  {
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+
+    cqDUnitTest.createServer(server);
+
+    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+
+    String poolName = "testCqResults";
+    cqDUnitTest.createPool(client, poolName, host0, port);
+    
+    // Create client.
+    cqDUnitTest.createClient(client, port, host0);
+
+    // Create index.
+    cqDUnitTest.createFunctionalIndex(server, "IdIndex", "p.ID", "/root/regionA p");
+    cqDUnitTest.createFunctionalIndex(server, "statusIndex", "p.status", "/root/regionA p");
+    cqDUnitTest.createFunctionalIndex(server, "portfolioIdIndex", "p.position1.portfolioId", "/root/regionA p");
+    
+    // Put 5 entries into the region.
+    cqDUnitTest.createValues(server, "regionA", 5);
+    
+    // Test for supported queries.
+    String cqQuery = "";
+    for (int queryCnt=0; queryCnt < condition.length; queryCnt++) {
+      cqQuery = selStr + condition[queryCnt];
+      cqDUnitTest.createCQ(client, poolName, "testCqResultsP_" + queryCnt, cqQuery);
+      cqDUnitTest.executeCQ(client, "testCqResultsP_" + queryCnt, true, resultSize[queryCnt], expectedKeys[queryCnt], null);
+    }
+        
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server); 
+  }
+
+  /**
+   * Tests CQ Result Set with Range Index.
+   * 
+   * @throws Exception
+   */
+  public void testCqResultsWithRangeIndex() throws Exception
+  {
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+
+    cqDUnitTest.createServer(server);
+
+    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+
+    String poolName = "testCqResults";
+    cqDUnitTest.createPool(client, poolName, host0, port);
+    
+    // Create client.
+    cqDUnitTest.createClient(client, port, host0);
+
+    // Create index.
+    server.invoke(new CacheSerializableRunnable("Set RangeIndex Falg") {
+      public void run2() throws CacheException {
+        IndexManager.TEST_RANGEINDEX_ONLY = true;
+      }
+    });
+
+    cqDUnitTest.createFunctionalIndex(server, "IdIndex", "p.ID", "/root/regionA p");
+    cqDUnitTest.createFunctionalIndex(server, "statusIndex", "p.status", "/root/regionA p");
+    cqDUnitTest.createFunctionalIndex(server, "portfolioIdIndex", "p.position1.portfolioId", "/root/regionA p");
+    
+    // Put 5 entries into the region.
+    cqDUnitTest.createValues(server, "regionA", 5);
+    
+    // Test for supported queries.
+    String cqQuery = "";
+    for (int queryCnt=0; queryCnt < condition.length; queryCnt++) {
+      cqQuery = selStr + condition[queryCnt];
+      cqDUnitTest.createCQ(client, poolName, "testCqResultsP_" + queryCnt, cqQuery);
+      cqDUnitTest.executeCQ(client, "testCqResultsP_" + queryCnt, true, resultSize[queryCnt], expectedKeys[queryCnt], null);
+    }
+
+    // Unset the flag.
+    server.invoke(new CacheSerializableRunnable("Set RangeIndex Falg") {
+      public void run2() throws CacheException {
+        IndexManager.TEST_RANGEINDEX_ONLY = false;
+      }
+    });
+        
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server); 
+  }
+
+  /**
+   * Tests CQ Result Set.
+   * 
+   * @throws Exception
+   */
+  public void testCqResultsOnPR() throws Exception
+  {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+
+    cqDUnitTest.createServerWithPR(server1, 0, false, 0);
+    cqDUnitTest.createServerWithPR(server2, 0, false, 0);
+    
+    final int port = server1.invokeInt(CqQueryUsingPoolDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+
+    String poolName = "testCqResults";
+    cqDUnitTest.createPool(client, poolName, host0, port);
+    
+    // Create client.
+    cqDUnitTest.createClient(client, port, host0);
+
+    // Put 5 entries into the region.
+    cqDUnitTest.createValues(server1, "regionA", 5);
+    
+    // Test for supported queries.
+    String cqQuery = "";
+    for (int queryCnt=0; queryCnt < condition.length; queryCnt++) {
+      cqQuery = selStr + condition[queryCnt];
+      cqDUnitTest.createCQ(client, poolName, "testCqResultsP_" + queryCnt, cqQuery);
+      cqDUnitTest.executeCQ(client, "testCqResultsP_" + queryCnt, true, resultSize[queryCnt], expectedKeys[queryCnt], null);
+    }
+        
+    // Test unsupported queries.
+    for (int queryCnt=0; queryCnt < condition2.length; queryCnt++) {
+      cqQuery = selStr + condition2[queryCnt];
+      
+      try {
+        cqDUnitTest.createCQ(client, poolName, "testCqResultsF_" + queryCnt, cqQuery);
+        //cqDUnitTest.executeCQ(client, "testCqResultsF_" + queryCnt, true, cqDUnitTest.noTest, null);
+        fail("UnSupported CQ Query, Expected to fail. " +
+            " CQ :" + "testCqResultsF_" + queryCnt +
+            " Query : " + cqQuery);
+      } catch (Exception ex) {
+        // Expected.
+      }
+    }
+    
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server1);
+    cqDUnitTest.closeServer(server2);
+  }
+
+  /**
+   * Tests CQ Result Set with Compact Range Index.
+   * 
+   * @throws Exception
+   */
+  public void testCqResultsWithCompactRangeIndexOnPR() throws Exception
+  {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+
+    cqDUnitTest.createServerWithPR(server1, 0, false, 0);
+    cqDUnitTest.createServerWithPR(server2, 0, false, 0);
+
+    final int port = server1.invokeInt(CqQueryUsingPoolDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+
+    String poolName = "testCqResults";
+    cqDUnitTest.createPool(client, poolName, host0, port);
+    
+    // Create client.
+    cqDUnitTest.createClient(client, port, host0);
+
+    // Create index.
+    cqDUnitTest.createFunctionalIndex(server1, "IdIndex", "p.ID", "/root/regionA p");
+    cqDUnitTest.createFunctionalIndex(server1, "statusIndex", "p.status", "/root/regionA p");
+    cqDUnitTest.createFunctionalIndex(server1, "portfolioIdIndex", "p.position1.portfolioId", "/root/regionA p");
+    
+    // Put 5 entries into the region.
+    cqDUnitTest.createValues(server1, "regionA", 5);
+    
+    // Test for supported queries.
+    String cqQuery = "";
+    for (int queryCnt=0; queryCnt < condition.length; queryCnt++) {
+      cqQuery = selStr + condition[queryCnt];
+      cqDUnitTest.createCQ(client, poolName, "testCqResultsP_" + queryCnt, cqQuery);
+      cqDUnitTest.executeCQ(client, "testCqResultsP_" + queryCnt, true, resultSize[queryCnt], expectedKeys[queryCnt], null);
+    }
+        
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server1); 
+    cqDUnitTest.closeServer(server2); 
+
+  }
+
+  /**
+   * Tests CQ Result Set with Range Index.
+   * 
+   * @throws Exception
+   */
+  public void testCqResultsWithRangeIndexOnPR() throws Exception
+  {
+    
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+
+    cqDUnitTest.createServerWithPR(server1, 0, false, 0);
+    cqDUnitTest.createServerWithPR(server2, 0, false, 0);
+
+    final int port = server1.invokeInt(CqQueryUsingPoolDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+
+    String poolName = "testCqResults";
+    cqDUnitTest.createPool(client, poolName, host0, port);
+    
+    // Create client.
+    cqDUnitTest.createClient(client, port, host0);
+
+    // Create index.
+    server1.invoke(new CacheSerializableRunnable("Set RangeIndex Falg") {
+      public void run2() throws CacheException {
+        IndexManager.TEST_RANGEINDEX_ONLY = true;
+      }
+    });
+
+    server2.invoke(new CacheSerializableRunnable("Set RangeIndex Falg") {
+      public void run2() throws CacheException {
+        IndexManager.TEST_RANGEINDEX_ONLY = true;
+      }
+    });
+
+    cqDUnitTest.createFunctionalIndex(server1, "IdIndex", "p.ID", "/root/regionA p");
+    cqDUnitTest.createFunctionalIndex(server1, "statusIndex", "p.status", "/root/regionA p");
+    cqDUnitTest.createFunctionalIndex(server1, "portfolioIdIndex", "p.position1.portfolioId", "/root/regionA p");
+    
+    // Put 5 entries into the region.
+    cqDUnitTest.createValues(server1, "regionA", 5);
+    
+    // Test for supported queries.
+    String cqQuery = "";
+    for (int queryCnt=0; queryCnt < condition.length; queryCnt++) {
+      cqQuery = selStr + condition[queryCnt];
+      cqDUnitTest.createCQ(client, poolName, "testCqResultsP_" + queryCnt, cqQuery);
+      cqDUnitTest.executeCQ(client, "testCqResultsP_" + queryCnt, true, resultSize[queryCnt], expectedKeys[queryCnt], null);
+    }
+        
+    // Create index.
+    server1.invoke(new CacheSerializableRunnable("Set RangeIndex Falg") {
+      public void run2() throws CacheException {
+        IndexManager.TEST_RANGEINDEX_ONLY = false;
+      }
+    });
+
+    server2.invoke(new CacheSerializableRunnable("Set RangeIndex Falg") {
+      public void run2() throws CacheException {
+        IndexManager.TEST_RANGEINDEX_ONLY = false;
+      }
+    });
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server1); 
+    cqDUnitTest.closeServer(server2); 
+  }
+
+  /**
+   * Tests CQ Result Set.
+   * 
+   * @throws Exception
+   */
+  public void testCqResultsCaching() throws Exception
+  {
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+
+    cqDUnitTest.createServer(server);
+
+    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+
+    String poolName = "testCqResults";
+    final String cqName = "testCqResultsP_0";
+    
+    cqDUnitTest.createPool(client, poolName, host0, port);
+    
+    // Create client.
+    cqDUnitTest.createClient(client, port, host0);
+
+    // create CQ.
+    cqDUnitTest.createCQ(client, poolName, cqName, cqDUnitTest.cqs[0]);
+    
+    final int numObjects = 300;
+    final int totalObjects = 500;
+    
+    // initialize Region.
+    server.invoke(new CacheSerializableRunnable("Update Region"){
+      public void run2()throws CacheException {
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        for (int i = 1; i <= numObjects; i++) {
+          Portfolio p = new Portfolio(i);
+          region.put(""+i, p);
+        }
+      }
+    });
+    
+    // Keep updating region (async invocation).
+    server.invokeAsync(new CacheSerializableRunnable("Update Region"){
+      public void run2()throws CacheException {
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        // Update (totalObjects - 1) entries.
+        for (int i = 1; i < totalObjects; i++) {
+          // Destroy entries.
+          if (i > 25 && i < 201) {
+            region.destroy(""+i);
+            continue;
+          }
+          Portfolio p = new Portfolio(i);
+          region.put(""+i, p);
+        }
+        // recreate destroyed entries.
+        for (int j = 26; j < 201; j++) {
+          Portfolio p = new Portfolio(j);
+          region.put(""+j, p);
+        }
+        // Add the last key.
+        Portfolio p = new Portfolio(totalObjects);
+        region.put(""+totalObjects, p);
+      }
+    });
+
+    // Execute CQ.
+    // While region operation is in progress execute CQ.
+    cqDUnitTest.executeCQ(client, cqName, true, null);
+    
+    // Verify CQ Cache results.
+    server.invoke(new CacheSerializableRunnable("Verify CQ Cache results"){
+      public void run2()throws CacheException {
+        CqService cqService = null;
+        try {
+          cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
+        } catch (Exception ex) {
+          getLogWriter().info("Failed to get the internal CqService.", ex);
+          fail ("Failed to get the internal CqService.", ex);
+        }
+        
+        // Wait till all the region update is performed.
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        while(true){
+          if (region.get(""+ totalObjects) == null){
+            try {
+              Thread.sleep(50);
+            } catch (Exception ex){
+              //ignore.
+            }
+            continue;
+          }
+          break;
+        }
+        Collection<? extends InternalCqQuery> cqs = cqService.getAllCqs();
+        for (InternalCqQuery cq: cqs){
+          ServerCQImpl cqQuery = (ServerCQImpl)cq;
+          if (cqQuery.getName().equals(cqName)) {
+            int size = cqQuery.getCqResultKeysSize();
+            if (size != totalObjects) {
+              getLogWriter().info("The number of Cached events " + size + 
+                  " is not equal to the expected size " + totalObjects);
+              HashSet expectedKeys = new HashSet();
+              for (int i = 1; i < totalObjects; i++) {
+                expectedKeys.add("" + i);
+              }
+              Set cachedKeys = cqQuery.getCqResultKeyCache();
+              expectedKeys.removeAll(cachedKeys);
+              getLogWriter().info("Missing keys from the Cache : " + expectedKeys);
+            }
+            assertEquals("The number of keys cached for cq " + cqName + " is wrong.", 
+                totalObjects, cqQuery.getCqResultKeysSize());              
+          }
+        }
+      }
+    });
+    
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server); 
+  }
+
+  /**
+   * Tests CQ Result Set.
+   * 
+   * @throws Exception
+   */
+  public void testCqResultsCachingForMultipleCQs() throws Exception
+  {
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client1 = host.getVM(1);
+    VM client2 = host.getVM(2);
+
+    cqDUnitTest.createServer(server);
+
+    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+
+    String poolName = "testCqResults";
+    final String cqName1 = "testCqResultsP_0";
+    final String cqName2 = "testCqResultsP_1";
+    
+    cqDUnitTest.createPool(client1, poolName, host0, port);
+    cqDUnitTest.createPool(client2, poolName, host0, port);
+    
+    // Create client.
+    cqDUnitTest.createClient(client1, port, host0);
+    cqDUnitTest.createClient(client2, port, host0);
+    
+    // create CQ.
+    cqDUnitTest.createCQ(client1, poolName, cqName1, cqDUnitTest.cqs[0]);
+    cqDUnitTest.createCQ(client2, poolName, cqName2, cqDUnitTest.cqs[0]);
+    
+    final int numObjects = 300;
+    final int totalObjects = 500;
+    
+    // initialize Region.
+    server.invoke(new CacheSerializableRunnable("Update Region"){
+      public void run2()throws CacheException {
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        for (int i = 1; i <= numObjects; i++) {
+          Portfolio p = new Portfolio(i);
+          region.put(""+i, p);
+        }
+      }
+    });
+    
+    // Keep updating region (async invocation).
+    server.invokeAsync(new CacheSerializableRunnable("Update Region"){
+      public void run2()throws CacheException {
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        // Update (totalObjects - 1) entries.
+        for (int i = 1; i < totalObjects; i++) {
+          // Destroy entries.
+          if (i > 25 && i < 201) {
+            region.destroy(""+i);
+            continue;
+          }
+          Portfolio p = new Portfolio(i);
+          region.put(""+i, p);
+        }
+        // recreate destroyed entries.
+        for (int j = 26; j < 201; j++) {
+          Portfolio p = new Portfolio(j);
+          region.put(""+j, p);
+        }
+        // Add the last key.
+        Portfolio p = new Portfolio(totalObjects);
+        region.put(""+totalObjects, p);
+      }
+    });
+
+    // Execute CQ.
+    // While region operation is in progress execute CQ.
+    cqDUnitTest.executeCQ(client1, cqName1, true, null);
+    cqDUnitTest.executeCQ(client2, cqName2, true, null);
+    
+    // Verify CQ Cache results.
+    server.invoke(new CacheSerializableRunnable("Verify CQ Cache results"){
+      public void run2()throws CacheException {
+        CqService cqService = null;
+        try {
+          cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
+        } catch (Exception ex) {
+          getLogWriter().info("Failed to get the internal CqService.", ex);
+          fail ("Failed to get the internal CqService.", ex);
+        }
+        
+        // Wait till all the region update is performed.
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        while(true){
+          if (region.get(""+ totalObjects) == null){
+            try {
+              Thread.sleep(50);
+            } catch (Exception ex){
+              //ignore.
+            }
+            continue;
+          }
+          break;
+        }
+        Collection<? extends InternalCqQuery> cqs = cqService.getAllCqs();
+        for (InternalCqQuery cq: cqs){
+          ServerCQImpl cqQuery = (ServerCQImpl)cq;
+          int size = cqQuery.getCqResultKeysSize();
+          if (size != totalObjects) {
+            getLogWriter().info("The number of Cached events " + size + 
+                " is not equal to the expected size " + totalObjects);
+            HashSet expectedKeys = new HashSet();
+            for (int i = 1; i < totalObjects; i++) {
+              expectedKeys.add("" + i);
+            }
+            Set cachedKeys = cqQuery.getCqResultKeyCache();
+            expectedKeys.removeAll(cachedKeys);
+            getLogWriter().info("Missing keys from the Cache : " + expectedKeys);
+          }
+          assertEquals("The number of keys cached for cq " + cqQuery.getName() + " is wrong.", 
+              totalObjects, cqQuery.getCqResultKeysSize());              
+        }
+      }
+    });
+    
+    // Close.
+    cqDUnitTest.closeClient(client1);
+    cqDUnitTest.closeClient(client2);
+    cqDUnitTest.closeServer(server); 
+  }
+
+  /**
+   * Tests CQ Result Set.
+   * 
+   * @throws Exception
+   */
+  public void testCqResultsCachingForPR() throws Exception
+  {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+
+    cqDUnitTest.createServerWithPR(server1, 0, false, 0);
+    cqDUnitTest.createServerWithPR(server2, 0, false, 0);
+    
+    final int port = server1.invokeInt(CqQueryUsingPoolDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+
+    String poolName = "testCqResults";
+    final String cqName = "testCqResultsP_0";
+    
+    cqDUnitTest.createPool(client, poolName, host0, port);
+    
+    // Create client.
+    cqDUnitTest.createClient(client, port, host0);
+
+    // create CQ.
+    cqDUnitTest.createCQ(client, poolName, cqName, cqDUnitTest.cqs[0]);
+    
+    final int numObjects = 300;
+    final int totalObjects = 500;
+    
+    // initialize Region.
+    server1.invoke(new CacheSerializableRunnable("Update Region"){
+      public void run2()throws CacheException {
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        for (int i = 1; i <= numObjects; i++) {
+          Portfolio p = new Portfolio(i);
+          region.put(""+i, p);
+        }
+      }
+    });
+    
+    // Keep updating region (async invocation).
+    server2.invokeAsync(new CacheSerializableRunnable("Update Region"){
+      public void run2()throws CacheException {
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        // Update (totalObjects - 1) entries.
+        for (int i = 1; i < totalObjects; i++) {
+          // Destroy entries.
+          if (i > 25 && i < 201) {
+            region.destroy(""+i);
+            continue;
+          }
+          Portfolio p = new Portfolio(i);
+          region.put(""+i, p);
+        }
+        // recreate destroyed entries.
+        for (int j = 26; j < 201; j++) {
+          Portfolio p = new Portfolio(j);
+          region.put(""+j, p);
+        }
+        // Add the last key.
+        Portfolio p = new Portfolio(totalObjects);
+        region.put(""+totalObjects, p);
+      }
+    });
+
+    // Execute CQ.
+    // While region operation is in progress execute CQ.
+    cqDUnitTest.executeCQ(client, cqName, true, null);
+    
+    // Verify CQ Cache results.
+    server1.invoke(new CacheSerializableRunnable("Verify CQ Cache results"){
+      public void run2()throws CacheException {
+        CqService cqService = null;
+        try {
+          cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
+        } catch (Exception ex) {
+          getLogWriter().info("Failed to get the internal CqService.", ex);
+          fail ("Failed to get the internal CqService.", ex);
+        }
+        
+        // Wait till all the region update is performed.
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        while(true){
+          if (region.get(""+ totalObjects) == null){
+            try {
+              Thread.sleep(50);
+            } catch (Exception ex){
+              //ignore.
+            }
+            continue;
+          }
+          break;
+        }
+        Collection<? extends InternalCqQuery> cqs = cqService.getAllCqs();
+        for (InternalCqQuery cq: cqs){
+          ServerCQImpl cqQuery = (ServerCQImpl)cq;
+          if (cqQuery.getCqResultKeysSize() <= 0) {
+            fail("The Result Cache for CQ on PR is not working. CQ :" + cqName);              
+          }
+        }
+      }
+    });
+    
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server1);
+    cqDUnitTest.closeServer(server2);
+  }
+
+  /**
+   * Tests CQ Result Set caching for destroy events.
+   * 
+   * @throws Exception
+   */
+  public void testCqResultsCachingForDestroyEventsOnPR() throws Exception
+  {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+
+    cqDUnitTest.createServerWithPR(server1, 0, false, 0);
+    cqDUnitTest.createServerWithPR(server2, 0, false, 0);
+    
+    final int port = server1.invokeInt(CqQueryUsingPoolDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+
+    String poolName = "testCqResults";
+    final String cqName = "testCqResultsCachingForDestroyEventsOnPR_0";
+    
+    cqDUnitTest.createPool(client, poolName, host0, port);
+    
+    // Create client.
+    cqDUnitTest.createClient(client, port, host0);
+
+    // create CQ.
+    cqDUnitTest.createCQ(client, poolName, cqName, cqDUnitTest.cqs[0]);
+
+    // Execute CQ.
+    cqDUnitTest.executeCQ(client, cqName, true, null);
+
+    final int numObjects = 50;
+    
+    // initialize Region.
+    server1.invoke(new CacheSerializableRunnable("Update Region"){
+      public void run2()throws CacheException {
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        for (int i = 1; i <= numObjects; i++) {
+          Portfolio p = new Portfolio(i);
+          region.put(""+i, p);
+        }
+      }
+    });
+
+    // Update from server2.
+    server2.invoke(new CacheSerializableRunnable("Update Region"){
+      public void run2()throws CacheException {
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        for (int i = 1; i <= numObjects; i++) {
+          Portfolio p = new Portfolio(i);
+          region.put(""+i, p);
+        }
+      }
+    });
+
+    // Destroy entries.
+    server2.invoke(new CacheSerializableRunnable("Update Region"){
+      public void run2()throws CacheException {
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        for (int i = 1; i <= numObjects; i++) {
+          Portfolio p = new Portfolio(i);
+          region.destroy(""+i);
+        }
+      }
+    });
+    
+    // Wait for events to be sent.
+    cqDUnitTest.waitForDestroyed(client, cqName, "" + numObjects);
+    
+    // Verify CQ Cache results.
+    server1.invoke(new CacheSerializableRunnable("Verify CQ Cache results"){
+      public void run2()throws CacheException {
+        CqService cqService = null;
+        try {
+          cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
+        } catch (Exception ex) {
+          getLogWriter().info("Failed to get the internal CqService.", ex);
+          fail ("Failed to get the internal CqService.", ex);
+        }
+        
+        Collection<? extends InternalCqQuery> cqs = cqService.getAllCqs();
+        for (InternalCqQuery cq: cqs){
+          ServerCQImpl cqQuery = (ServerCQImpl)cq;
+          if (cqQuery.getCqResultKeysSize() > 0) {
+            fail("The CQ Result Cache on PR should have been empty for CQ :" + cqName + " keys=" + cqQuery.getCqResultKeyCache());              
+          }
+        }
+      }
+    });
+
+    server2.invoke(new CacheSerializableRunnable("Verify CQ Cache results"){
+      public void run2()throws CacheException {
+        CqService cqService = null;
+        try {
+          cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
+        } catch (Exception ex) {
+          getLogWriter().info("Failed to get the internal CqService.", ex);
+          fail ("Failed to get the internal CqService.", ex);
+        }
+        
+        Collection<? extends InternalCqQuery> cqs = cqService.getAllCqs();
+        for (InternalCqQuery cq: cqs){
+          ServerCQImpl cqQuery = (ServerCQImpl)cq;
+          if (cqQuery.getCqResultKeysSize() > 0) {
+            fail("The CQ Result Cache on PR should have been empty for CQ :" + cqName);              
+          }
+        }
+      }
+    });
+
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server1);
+    cqDUnitTest.closeServer(server2);
+  }
+
+
+  /**
+   * Tests CQ Result Caching with CQ Failover.
+   * 
+   * @throws Exception
+   */
+  public void testCqResultsCachingWithFailOver() throws Exception
+  {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+    
+    cqDUnitTest.createServer(server1);
+    
+    final int port1 = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+    final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(1);
+    
+    String poolName = "testCQFailOver";
+    final String cqName = "testCQFailOver_0";
+    
+    cqDUnitTest.createPool(client, poolName, new String[] {host0, host0}, new int[] {port1, ports[0]});
+
+    // create CQ.
+    cqDUnitTest.createCQ(client, poolName, cqName, cqDUnitTest.cqs[0]);
+    
+    final int numObjects = 300;
+    final int totalObjects = 500;
+    
+    // initialize Region.
+    server1.invoke(new CacheSerializableRunnable("Update Region"){
+      public void run2()throws CacheException {
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        for (int i = 1; i <= numObjects; i++) {
+          Portfolio p = new Portfolio(i);
+          region.put(""+i, p);
+        }
+      }
+    });
+    
+    // Keep updating region (async invocation).
+    server1.invokeAsync(new CacheSerializableRunnable("Update Region"){
+      public void run2()throws CacheException {
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        // Update (totalObjects - 1) entries.
+        for (int i = 1; i < totalObjects; i++) {
+          // Destroy entries.
+          if (i > 25 && i < 201) {
+            region.destroy(""+i);
+            continue;
+          }
+          Portfolio p = new Portfolio(i);
+          region.put(""+i, p);
+        }
+        // recreate destroyed entries.
+        for (int j = 26; j < 201; j++) {
+          Portfolio p = new Portfolio(j);
+          region.put(""+j, p);
+        }
+        // Add the last key.
+        Portfolio p = new Portfolio(totalObjects);
+        region.put(""+totalObjects, p);
+      }
+    });
+
+    // Execute CQ.
+    // While region operation is in progress execute CQ.
+    cqDUnitTest.executeCQ(client, cqName, true, null);
+    
+    // Verify CQ Cache results.
+    server1.invoke(new CacheSerializableRunnable("Verify CQ Cache results"){
+      public void run2()throws CacheException {
+        CqService cqService = null;
+        try {
+          cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
+        } catch (Exception ex) {
+          getLogWriter().info("Failed to get the internal CqService.", ex);
+          fail ("Failed to get the internal CqService.", ex);
+        }
+        
+        // Wait till all the region update is performed.
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        while(true){
+          if (region.get(""+ totalObjects) == null){
+            try {
+              Thread.sleep(50);
+            } catch (Exception ex){
+              //ignore.
+            }
+            continue;
+          }
+          break;
+        }
+        Collection<? extends InternalCqQuery> cqs = cqService.getAllCqs();
+        for (InternalCqQuery cq: cqs){
+          ServerCQImpl cqQuery = (ServerCQImpl)cq;
+          if (cqQuery.getName().equals(cqName)) {
+            int size = cqQuery.getCqResultKeysSize();
+            if (size != totalObjects) {
+              getLogWriter().info("The number of Cached events " + size + 
+                  " is not equal to the expected size " + totalObjects);
+              HashSet expectedKeys = new HashSet();
+              for (int i = 1; i < totalObjects; i++) {
+                expectedKeys.add("" + i);
+              }
+              Set cachedKeys = cqQuery.getCqResultKeyCache();
+              expectedKeys.removeAll(cachedKeys);
+              getLogWriter().info("Missing keys from the Cache : " + expectedKeys);
+            }
+            assertEquals("The number of keys cached for cq " + cqName + " is wrong.", 
+                totalObjects, cqQuery.getCqResultKeysSize());              
+          }
+        }
+      }
+    });
+    
+    cqDUnitTest.createServer(server2, ports[0]);
+    final int thePort2 = server2.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    System.out.println("### Port on which server1 running : " + port1 + 
+        " Server2 running : " + thePort2);
+    pause(3 * 1000);
+    
+    // Close server1 for CQ fail over to server2.
+    cqDUnitTest.closeServer(server1); 
+    pause(3 * 1000);
+    
+    // Verify CQ Cache results.
+    server2.invoke(new CacheSerializableRunnable("Verify CQ Cache results"){
+      public void run2()throws CacheException {
+        CqService cqService = null;
+        try {
+          cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
+        } catch (Exception ex) {
+          getLogWriter().info("Failed to get the internal CqService.", ex);
+          fail ("Failed to get the internal CqService.", ex);
+        }
+        
+        // Wait till all the region update is performed.
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        while(true){
+          if (region.get(""+ totalObjects) == null){
+            try {
+              Thread.sleep(50);
+            } catch (Exception ex){
+              //ignore.
+            }
+            continue;
+          }
+          break;
+        }
+        Collection<? extends InternalCqQuery> cqs = cqService.getAllCqs();
+        for (InternalCqQuery cq: cqs){
+          ServerCQImpl cqQuery = (ServerCQImpl)cq;
+          if (cqQuery.getName().equals(cqName)) {
+            int size = cqQuery.getCqResultKeysSize();
+            if (size != totalObjects) {
+              getLogWriter().info("The number of Cached events " + size + 
+                  " is not equal to the expected size " + totalObjects);
+              HashSet expectedKeys = new HashSet();
+              for (int i = 1; i < totalObjects; i++) {
+                expectedKeys.add("" + i);
+              }
+              Set cachedKeys = cqQuery.getCqResultKeyCache();
+              expectedKeys.removeAll(cachedKeys);
+              getLogWriter().info("Missing keys from the Cache : " + expectedKeys);
+            }
+            assertEquals("The number of keys cached for cq " + cqName + " is wrong.", 
+                totalObjects, cqQuery.getCqResultKeysSize());              
+          }
+        }
+      }
+    });    
+        
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server2); 
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
new file mode 100644
index 0000000..6d465f0
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
@@ -0,0 +1,223 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.query.cq.dunit;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.data.Portfolio;
+import com.gemstone.gemfire.cache.query.internal.DefaultQueryService;
+import com.gemstone.gemfire.cache.query.internal.cq.InternalCqQuery;
+import com.gemstone.gemfire.cache.query.internal.cq.ServerCQImpl;
+import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.internal.AvailablePortHelper;
+
+import dunit.Host;
+import dunit.SerializableRunnable;
+import dunit.VM;
+
+public class CqResultSetUsingPoolOptimizedExecuteDUnitTest extends CqResultSetUsingPoolDUnitTest{
+
+  public CqResultSetUsingPoolOptimizedExecuteDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+    invokeInEveryVM(new SerializableRunnable("getSystem") {
+      public void run() {
+        CqServiceImpl.EXECUTE_QUERY_DURING_INIT = false;
+      }
+    });
+  }
+  
+  @Override
+  public void tearDown2() throws Exception {
+    invokeInEveryVM(new SerializableRunnable("getSystem") {
+      public void run() {
+        CqServiceImpl.EXECUTE_QUERY_DURING_INIT = true;
+      }
+    });
+    super.tearDown2();
+  }
+  
+  /**
+   * Tests CQ Result Caching with CQ Failover.
+   * When EXECUTE_QUERY_DURING_INIT is false and new server calls 
+   * execute during HA the results cache is not initialized.
+   * @throws Exception
+   */
+  @Override
+  public void testCqResultsCachingWithFailOver() throws Exception
+  {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+    
+    cqDUnitTest.createServer(server1);
+    
+    final int port1 = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+    final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(1);
+    
+    String poolName = "testCQFailOver";
+    final String cqName = "testCQFailOver_0";
+    
+    cqDUnitTest.createPool(client, poolName, new String[] {host0, host0}, new int[] {port1, ports[0]});
+
+    // create CQ.
+    cqDUnitTest.createCQ(client, poolName, cqName, cqDUnitTest.cqs[0]);
+    
+    final int numObjects = 300;
+    final int totalObjects = 500;
+    
+    // initialize Region.
+    server1.invoke(new CacheSerializableRunnable("Update Region"){
+      public void run2()throws CacheException {
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        for (int i = 1; i <= numObjects; i++) {
+          Portfolio p = new Portfolio(i);
+          region.put(""+i, p);
+        }
+      }
+    });
+    
+    // Keep updating region (async invocation).
+    server1.invokeAsync(new CacheSerializableRunnable("Update Region"){
+      public void run2()throws CacheException {
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        // Update (totalObjects - 1) entries.
+        for (int i = 1; i < totalObjects; i++) {
+          // Destroy entries.
+          if (i > 25 && i < 201) {
+            region.destroy(""+i);
+            continue;
+          }
+          Portfolio p = new Portfolio(i);
+          region.put(""+i, p);
+        }
+        // recreate destroyed entries.
+        for (int j = 26; j < 201; j++) {
+          Portfolio p = new Portfolio(j);
+          region.put(""+j, p);
+        }
+        // Add the last key.
+        Portfolio p = new Portfolio(totalObjects);
+        region.put(""+totalObjects, p);
+      }
+    });
+
+    // Execute CQ.
+    // While region operation is in progress execute CQ.
+    cqDUnitTest.executeCQ(client, cqName, true, null);
+    
+    // Verify CQ Cache results.
+    server1.invoke(new CacheSerializableRunnable("Verify CQ Cache results"){
+      public void run2()throws CacheException {
+        CqServiceImpl CqServiceImpl = null;
+        try {
+          CqServiceImpl = (com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl) ((DefaultQueryService)getCache().getQueryService()).getCqService();
+        } catch (Exception ex) {
+          getLogWriter().info("Failed to get the internal CqServiceImpl.", ex);
+          fail ("Failed to get the internal CqServiceImpl.", ex);
+        }
+        
+        // Wait till all the region update is performed.
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        while(true){
+          if (region.get(""+ totalObjects) == null){
+            try {
+              Thread.sleep(50);
+            } catch (Exception ex){
+              //ignore.
+            }
+            continue;
+          }
+          break;
+        }
+        Collection<? extends InternalCqQuery> cqs = CqServiceImpl.getAllCqs();
+        for (InternalCqQuery cq: cqs){
+          ServerCQImpl cqQuery = (ServerCQImpl)cq;
+          if (cqQuery.getName().equals(cqName)) {
+            int size = cqQuery.getCqResultKeysSize();
+            if (size != totalObjects) {
+              getLogWriter().info("The number of Cached events " + size + 
+                  " is not equal to the expected size " + totalObjects);
+              HashSet expectedKeys = new HashSet();
+              for (int i = 1; i < totalObjects; i++) {
+                expectedKeys.add("" + i);
+              }
+              Set cachedKeys = cqQuery.getCqResultKeyCache();
+              expectedKeys.removeAll(cachedKeys);
+              getLogWriter().info("Missing keys from the Cache : " + expectedKeys);
+            }
+            assertEquals("The number of keys cached for cq " + cqName + " is wrong.", 
+                totalObjects, cqQuery.getCqResultKeysSize());              
+          }
+        }
+      }
+    });
+    
+    cqDUnitTest.createServer(server2, ports[0]);
+    final int thePort2 = server2.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    System.out.println("### Port on which server1 running : " + port1 + 
+        " Server2 running : " + thePort2);
+    pause(3 * 1000);
+    
+    // Close server1 for CQ fail over to server2.
+    cqDUnitTest.closeServer(server1); 
+    pause(3 * 1000);
+    
+    // Verify CQ Cache results.
+    server2.invoke(new CacheSerializableRunnable("Verify CQ Cache results"){
+      public void run2()throws CacheException {
+        CqServiceImpl CqServiceImpl = null;
+        try {
+          CqServiceImpl = (CqServiceImpl) ((DefaultQueryService)getCache().getQueryService()).getCqService();
+        } catch (Exception ex) {
+          getLogWriter().info("Failed to get the internal CqServiceImpl.", ex);
+          fail ("Failed to get the internal CqServiceImpl.", ex);
+        }
+        
+        // Wait till all the region update is performed.
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        while(true){
+          if (region.get(""+ totalObjects) == null){
+            try {
+              Thread.sleep(50);
+            } catch (Exception ex){
+              //ignore.
+            }
+            continue;
+          }
+          break;
+        }
+        Collection<? extends InternalCqQuery> cqs = CqServiceImpl.getAllCqs();
+        for (InternalCqQuery cq: cqs){
+          ServerCQImpl cqQuery = (ServerCQImpl)cq;
+          if (cqQuery.getName().equals(cqName)) {
+            int size = cqQuery.getCqResultKeysSize();
+            assertEquals("The number of keys cached for cq " + cqName + " is wrong.", 
+                0, size);              
+          }
+        }
+      }
+    });    
+        
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server2); 
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
new file mode 100644
index 0000000..29ed0a4
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
@@ -0,0 +1,119 @@
+package com.gemstone.gemfire.cache.query.cq.dunit;
+
+import java.util.Properties;
+
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.dunit.HelperTestCase;
+import com.gemstone.gemfire.internal.AvailablePortHelper;
+
+import dunit.AsyncInvocation;
+import dunit.DistributedTestCase;
+import dunit.Host;
+import dunit.SerializableCallable;
+import dunit.VM;
+
+public class CqStateDUnitTest extends HelperTestCase {
+
+  
+  public CqStateDUnitTest(String name) {
+    super(name);
+  }
+  
+  public void testNothingBecauseBug51953() {
+    // remove when bug #51953 is fixed
+  }
+  
+  // this test is disabled due to a 25% failure rate in
+  // CI testing.  See internal ticket #52229
+  public void disabledtestBug51222() throws Exception {
+    //The client can log this when the server shuts down.
+    addExpectedException("Could not find any server");
+    addExpectedException("java.net.ConnectException");
+    final String cqName = "theCqInQuestion";
+    final String regionName = "aattbbss";
+    final Host host = Host.getHost(0);
+    VM serverA = host.getVM(1);
+    VM serverB = host.getVM(2);
+    VM client = host.getVM(3);
+    
+    final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(2);
+    startCacheServer(serverA, ports[0], getAuthenticatedServerProperties());
+    createReplicatedRegion(serverA, regionName, null);
+
+    final String host0 = getServerHostName(serverA.getHost());
+    startClient(client, new VM[]{ serverA, serverB }, ports, 1, getClientProperties());
+    createCQ(client, cqName, "select * from /"+ regionName, null);
+    
+    //create the cacheserver but regions must be present first or else cq execute will fail with no region found
+    createCacheServer(serverB, ports[1], getServerProperties(0));
+    createReplicatedRegion(serverB, regionName, null);
+    startCacheServers(serverB);
+    
+    AsyncInvocation async = executeCQ(client, cqName);
+    DistributedTestCase.join(async, 10000, getLogWriter());
+
+    Boolean clientRunning = (Boolean) client.invoke(new SerializableCallable() {
+      @Override
+      public Object call() throws Exception {
+        final CqQuery cq = getCache().getQueryService().getCq(cqName);
+        waitForCriterion(new WaitCriterion() {
+          @Override
+          public boolean done() {
+            return cq.getState().isRunning();
+          }
+          @Override
+          public String description() {
+            return "waiting for Cq to be in a running state: " + cq;
+          }
+        },  30000, 1000, false);
+        return cq.getState().isRunning();
+      }
+    });
+    assertTrue("Client was not running", clientRunning);
+    
+    //hope that server 2 comes up before num retries is exhausted by the execute cq command
+    //hope that the redundancy satisfier sends message and is executed after execute cq has been executed
+    //This is the only way bug 51222 would be noticed
+    //verify that the cq on the server is still in RUNNING state;
+    Boolean isRunning = (Boolean) serverB.invoke(new SerializableCallable() {
+      @Override
+      public Object call() throws Exception {
+        CqQuery cq = getCache().getQueryService().getCqs()[0];
+        return cq.getState().isRunning();
+      }
+      
+    });
+    
+    assertTrue("Cq was not running on server" , isRunning);
+  }
+  
+  public Properties getAuthenticatedServerProperties() {
+    Properties props = new Properties();
+    props.put("mcast-port", "0");
+    props.put("security-client-accessor",
+        "com.gemstone.gemfire.cache.query.dunit.CloseCacheAuthorization.create");
+    props.put("security-client-accessor-pp",
+        "com.gemstone.gemfire.cache.query.dunit.CloseCacheAuthorization.create");
+    props.put("security-client-authenticator",
+        "templates.security.DummyAuthenticator.create");
+    return props;
+  }
+  
+  public Properties getServerProperties() {
+    Properties props = new Properties();
+    props.put("mcast-port", "0");
+    return props;
+  }
+  
+  public Properties getClientProperties() {
+    Properties props = new Properties();
+    props.put("security-client-auth-init",
+        "templates.security.UserPasswordAuthInit.create");
+    
+    props.put("security-username", "root");
+    props.put("security-password", "root");
+    return props;
+  }  
+  
+}
+

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
new file mode 100644
index 0000000..b66228e
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
@@ -0,0 +1,433 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.query.cq.dunit;
+
+import java.util.Collection;
+
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.query.CqException;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.CqServiceStatistics;
+import com.gemstone.gemfire.cache.query.CqStatistics;
+import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.cache.query.internal.CqQueryVsdStats;
+import com.gemstone.gemfire.cache.query.internal.CqStateImpl;
+import com.gemstone.gemfire.cache.query.internal.DefaultQueryService;
+import com.gemstone.gemfire.cache.query.internal.cq.CqQueryImpl;
+import com.gemstone.gemfire.cache.query.internal.cq.CqService;
+import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
+import com.gemstone.gemfire.cache.query.internal.cq.CqServiceVsdStats;
+import com.gemstone.gemfire.cache.query.internal.cq.InternalCqQuery;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.cache30.CacheTestCase;
+
+import dunit.Host;
+import dunit.SerializableRunnable;
+import dunit.VM;
+
+/**
+ * This class tests the ContiunousQuery mechanism in GemFire.
+ * This includes the test with different data activities.
+ *
+ * @author Rao
+ */
+public class CqStatsDUnitTest extends CacheTestCase {
+
+  private CqQueryDUnitTest cqDUnitTest = new CqQueryDUnitTest("CqStatsDUnitTest");
+  
+  public CqStatsDUnitTest(String name) {
+    super(name);
+  }
+  
+  public void setUp() throws Exception {
+    super.setUp();
+    
+    // avoid IllegalStateException from HandShake by connecting all vms to
+    // system before creating pool
+    getSystem();
+    invokeInEveryVM(new SerializableRunnable("getSystem") {
+      public void run() {
+        getSystem();
+      }
+    });
+    
+  }
+  
+  public void validateCQStats(VM vm, final String cqName,
+      final int creates,
+      final int updates,
+      final int deletes,
+      final int totalEvents,
+      final int cqListenerInvocations) {
+    vm.invoke(new CacheSerializableRunnable("Validate CQs") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Validating CQ Stats. ### " + cqName);
+//      Get CQ Service.
+        QueryService qService = null;
+        try {          
+          qService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to get query service.");
+        }
+        
+        CqService cqService = null;
+        try {
+          cqService = ((DefaultQueryService)qService).getCqService();
+        }
+        catch (CqException e) {
+          // TODO Auto-generated catch block
+          e.printStackTrace();
+          fail("Failed to get CqService, CQ : " + cqName);
+        }
+        Collection<? extends InternalCqQuery> cqs = cqService.getAllCqs();
+        if (cqs.size() == 0) {
+          fail("Failed to get CqQuery for CQ : " + cqName);
+        }
+        CqQueryImpl cQuery = (CqQueryImpl) cqs.iterator().next();
+        
+        CqStatistics cqStats = cQuery.getStatistics();
+        CqQueryVsdStats cqVsdStats = cQuery.getVsdStats();
+        if (cqStats == null || cqVsdStats == null) {
+          fail("Failed to get CqQuery Stats for CQ : " + cqName);
+        }
+        
+        getCache().getLogger().info("#### CQ stats for " + cQuery.getName() + ": " + 
+            " Events Total: " + cqStats.numEvents() +
+            " Events Created: " + cqStats.numInserts() +
+            " Events Updated: " + cqStats.numUpdates() +
+            " Events Deleted: " + cqStats.numDeletes() +
+            " CQ Listener invocations: " + cqVsdStats.getNumCqListenerInvocations() +
+            " Initial results time (nano sec): " + cqVsdStats.getCqInitialResultsTime());
+        
+        
+//      Check for totalEvents count.
+        if (totalEvents != CqQueryDUnitTest.noTest) {
+//        Result size validation.
+          assertEquals("Total Event Count mismatch", totalEvents, cqStats.numEvents());
+        }
+        
+//      Check for create count.
+        if (creates != CqQueryDUnitTest.noTest) {
+          assertEquals("Create Event mismatch", creates, cqStats.numInserts());
+        }
+        
+//      Check for update count.
+        if (updates != CqQueryDUnitTest.noTest) {
+          assertEquals("Update Event mismatch", updates, cqStats.numUpdates());
+        }
+        
+//      Check for delete count.
+        if (deletes != CqQueryDUnitTest.noTest) {
+          assertEquals("Delete Event mismatch", deletes, cqStats.numDeletes());
+        }
+        
+//      Check for CQ listener invocations.
+        if (cqListenerInvocations != CqQueryDUnitTest.noTest) {
+          assertEquals("CQ Listener invocations mismatch", cqListenerInvocations, cqVsdStats.getNumCqListenerInvocations());
+        }
+////      Check for initial results time.
+//        if (initialResultsTime != CqQueryDUnitTest.noTest && cqVsdStats.getCqInitialResultsTime() <= 0) {
+//          assertEquals("Initial results time mismatch", initialResultsTime, cqVsdStats.getCqInitialResultsTime());
+//        }
+      }
+    });
+  }
+  
+  private void validateCQServiceStats(VM vm,
+      final int created,
+      final int activated,
+      final int stopped,
+      final int closed,
+      final int cqsOnClient,
+      final int cqsOnRegion,
+      final int clientsWithCqs) {
+    vm.invoke(new CacheSerializableRunnable("Validate CQ Service Stats") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Validating CQ Service Stats. ### ");
+//      Get CQ Service.
+        QueryService qService = null;
+        try {          
+          qService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+        CqServiceStatistics cqServiceStats = null;        
+        cqServiceStats = qService.getCqStatistics();
+        CqServiceVsdStats cqServiceVsdStats = null;
+        try {
+          cqServiceVsdStats = ((CqServiceImpl) ((DefaultQueryService)qService).getCqService()).stats;
+        }
+        catch (CqException e) {
+          // TODO Auto-generated catch block
+          e.printStackTrace();
+        }
+        if (cqServiceStats == null) {
+          fail("Failed to get CQ Service Stats");
+        }
+        
+        getCache().getLogger().info("#### CQ Service stats: " + 
+            " CQs created: " + cqServiceStats.numCqsCreated() +
+            " CQs active: " + cqServiceStats.numCqsActive() +
+            " CQs stopped: " + cqServiceStats.numCqsStopped() +
+            " CQs closed: " + cqServiceStats.numCqsClosed() +
+            " CQs on Client: " + cqServiceStats.numCqsOnClient() +
+            " CQs on region /root/regionA : " + cqServiceVsdStats.numCqsOnRegion("/root/regionA") +
+            " Clients with CQs: " + cqServiceVsdStats.getNumClientsWithCqs());
+        
+        
+        //        Check for created count.
+        if (created != CqQueryDUnitTest.noTest) {
+          assertEquals("Number of CQs created mismatch", created, cqServiceStats.numCqsCreated());
+        }
+        
+        //        Check for activated count.
+        if (activated != CqQueryDUnitTest.noTest) {
+          assertEquals("Number of CQs activated mismatch", activated, cqServiceStats.numCqsActive());
+        }
+        
+        //        Check for stopped count.
+        if (stopped != CqQueryDUnitTest.noTest) {
+          assertEquals("Number of CQs stopped mismatch", stopped, cqServiceStats.numCqsStopped());
+        }
+        
+        //        Check for closed count.
+        if (closed != CqQueryDUnitTest.noTest) {
+          assertEquals("Number of CQs closed mismatch", closed, cqServiceStats.numCqsClosed());
+        }
+        
+        // Check for CQs on client count.
+        if (cqsOnClient != CqQueryDUnitTest.noTest) {
+          assertEquals("Number of CQs on client mismatch", cqsOnClient, cqServiceStats.numCqsOnClient());
+        }
+        
+        // Check for CQs on region.
+        if (cqsOnRegion != CqQueryDUnitTest.noTest) {
+          assertEquals("Number of CQs on region /root/regionA mismatch", 
+              cqsOnRegion, cqServiceVsdStats.numCqsOnRegion("/root/regionA"));
+        }
+        
+        // Check for clients with CQs count.
+        if (clientsWithCqs != CqQueryDUnitTest.noTest) {
+          assertEquals("Clints with CQs mismatch", 
+              clientsWithCqs, cqServiceVsdStats.getNumClientsWithCqs());
+        }
+      }
+    });
+  }
+  
+  private static final int PAUSE = 8 * 1000; // 5 * 1000
+  
+  /**
+   * Test for CQ and CQ Service Statistics
+   * @throws Exception
+   */
+  public void testCQStatistics() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    
+    /* Init Server and Client */
+    cqDUnitTest.createServer(server);
+    final int port = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    cqDUnitTest.createClient(client, port, host0);
+    
+    /* Create CQs. */
+    cqDUnitTest.createCQ(client, "testCQStatistics_0", cqDUnitTest.cqs[0]);
+    
+    /* Init values at server. */
+    int size = 100;
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], size);
+    
+    cqDUnitTest.executeCQ(client, "testCQStatistics_0", true, null);
+    
+    // Wait for CQ to be executed.
+    cqDUnitTest.waitForCqState(client, "testCQStatistics_0", CqStateImpl.RUNNING);    
+
+    // Test CQ stats
+    validateCQStats(client, "testCQStatistics_0", 0, 0, 0, 0, 0);
+    
+    // The stat would have not updated yet.
+    // Commenting out the following check; the check for resultset initialization 
+    // is anyway done in the next validation. 
+    // validateCQStats(server, "testCQStatistics_0", 0, 0, 0, 0, CqQueryDUnitTest.noTest, 1);
+    
+    /* Init values at server. */
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], 200);
+    // Wait for client to Synch.
+    cqDUnitTest.waitForCreated(client, "testCQStatistics_0", CqQueryDUnitTest.KEY+200);
+    pause(PAUSE);
+    size = 200;
+    
+    // validate CQs.
+    cqDUnitTest.validateCQ(client, "testCQStatistics_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ 100,
+        /* updates: */ 100,
+        /* deletes; */ 0,
+        /* queryInserts: */ 100,
+        /* queryUpdates: */ 100,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ 200);
+    
+    // Test CQ stats
+    validateCQStats(client, "testCQStatistics_0", 100, 100, 0, 200, 200);
+    //We don't have serverside CQ name
+    validateCQStats(server, "testCQStatistics_0", 100, 100, 0, 200, CqQueryDUnitTest.noTest);
+    
+    /* Delete values at server. */
+    cqDUnitTest.deleteValues(server, cqDUnitTest.regions[0], 100);
+    // Wait for client to Synch.
+    cqDUnitTest.waitForDestroyed(client, "testCQStatistics_0", CqQueryDUnitTest.KEY+100);
+    size = 10;
+    pause(PAUSE);
+    
+    cqDUnitTest.validateCQ(client, "testCQStatistics_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */100,
+        /* updates: */ 100,
+        /* deletes; */ 100,
+        /* queryInserts: */ 100,
+        /* queryUpdates: */ 100,
+        /* queryDeletes: */ 100,
+        /* totalEvents: */ 300);
+    
+    // Test CQ stats
+    validateCQStats(client, "testCQStatistics_0", 100, 100, 100, 300, 300);
+    //We don't have serverside CQ name
+    validateCQStats(server, "testCQStatistics_0", 100, 100, 100, 300, CqQueryDUnitTest.noTest);
+    
+    // Test  CQ Close
+    cqDUnitTest.closeCQ(client, "testCQStatistics_0");
+    pause(PAUSE);
+    
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server);
+  }
+  /**
+   * Test for CQ Service Statistics
+   * @throws Exception
+   */
+  public void testCQServiceStatistics() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client1 = host.getVM(1);
+    VM client2 = host.getVM(2);
+    
+    
+    /* Init Server and Client */
+    cqDUnitTest.createServer(server);
+    final int port = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    cqDUnitTest.createClient(client1, port, host0);
+    cqDUnitTest.createClient(client2, port, host0);
+    
+    /* Create CQs. */
+    String cqName = new String("testCQServiceStatistics_0");
+    String cqName10 = new String("testCQServiceStatistics_10");   
+    cqDUnitTest.createCQ(client1, cqName, cqDUnitTest.cqs[0]);
+    cqDUnitTest.createCQ(client2, cqName10, cqDUnitTest.cqs[2]); 
+    pause(PAUSE);
+    // Test CQ Service stats
+    getCache().getLogger().info("Validating CQ Service stats on clients: #1");
+    validateCQServiceStats(client1, 1, 0, 1, 0, 1, 1, CqQueryDUnitTest.noTest);
+    validateCQServiceStats(server, 0, 0, 0, 0, CqQueryDUnitTest.noTest, 0, 0);
+    
+    cqDUnitTest.executeCQ(client1, cqName, false, null);
+    cqDUnitTest.executeCQ(client2, cqName10, false, null);
+    pause(PAUSE);
+    
+    getCache().getLogger().info("Validating CQ Service stats on clients: #2");
+    validateCQServiceStats(client1, 1, 1, 0, 0, 1, 1, CqQueryDUnitTest.noTest);
+    validateCQServiceStats(client2, 1, 1, 0, 0, 1, CqQueryDUnitTest.noTest, CqQueryDUnitTest.noTest);
+    
+    getCache().getLogger().info("Validating CQ Service stats on server: #1");
+    validateCQServiceStats(server, 2, 2, 0, 0, CqQueryDUnitTest.noTest, 1, 2);
+    
+    /* Init values at server. */
+    int size = 10;
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], size);
+    // Wait for client to Synch.
+    cqDUnitTest.waitForCreated(client1, "testCQServiceStatistics_0", CqQueryDUnitTest.KEY+size);
+    
+    // validate CQs.
+    cqDUnitTest.validateCQ(client1, cqName,
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    pause(PAUSE);
+    
+    // Test CQ Service stats
+    getCache().getLogger().info("Validating CQ Service stats on clients: #3");
+    validateCQServiceStats(client1, 1, 1, 0, 0, 1, 1, CqQueryDUnitTest.noTest);
+    validateCQServiceStats(client2, 1, 1, 0, 0, 1, CqQueryDUnitTest.noTest, CqQueryDUnitTest.noTest);
+    
+    getCache().getLogger().info("Validating CQ Service stats on server: #1");
+    validateCQServiceStats(server, 2, 2, 0, 0, CqQueryDUnitTest.noTest, 1, 2);
+    
+    
+    //Create CQs with no name, execute, and close. 
+    cqDUnitTest.createAndExecCQNoName(client1, cqDUnitTest.cqs[0]); 
+    pause(PAUSE);      
+    
+    // Test CQ Service stats
+    getCache().getLogger().info("Validating CQ Service stats on client: #4");
+    validateCQServiceStats(client1, 21, 1, 0, 20, 1, 1, CqQueryDUnitTest.noTest);
+    
+    getCache().getLogger().info("Validating CQ Service stats on server: #2");
+    validateCQServiceStats(server, 22, 2, 0, 20, CqQueryDUnitTest.noTest, 1, 2);
+    
+    // Test  CQ Close
+    cqDUnitTest.closeCQ(client1, cqName);
+    pause(PAUSE);      
+    
+    // Test CQ Service stats
+    getCache().getLogger().info("Validating CQ Service stats on client: #5");
+    validateCQServiceStats(client1, 21, 0, 0, 21, 0, 0, CqQueryDUnitTest.noTest);
+    
+    getCache().getLogger().info("Validating CQ Service stats on server: #3");
+    validateCQServiceStats(server, 22, 1, 0, 21, CqQueryDUnitTest.noTest, 0, 1);
+    
+    //Test stop CQ
+    cqDUnitTest.stopCQ(client2, cqName10);
+    pause(PAUSE);
+    
+    // Test CQ Service stats
+    getCache().getLogger().info("Validating CQ Service stats on client: #6");
+    validateCQServiceStats(client2, 1, 0, 1, 0, 1, CqQueryDUnitTest.noTest, CqQueryDUnitTest.noTest);
+    getCache().getLogger().info("Validating CQ Service stats on server: #4");
+    validateCQServiceStats(server, 22, 0, 1, 21, CqQueryDUnitTest.noTest, CqQueryDUnitTest.noTest, 1);
+    
+    // Test  CQ Close
+    cqDUnitTest.closeCQ(client2, cqName10);
+    pause(PAUSE);
+    
+    // Test CQ Service stats
+    getCache().getLogger().info("Validating CQ Service stats on client: #7");
+    validateCQServiceStats(client1, 21, 0, 0, 21, 0, 0, CqQueryDUnitTest.noTest);
+    validateCQServiceStats(client2, 1, 0, 0, 1, 0, 0, CqQueryDUnitTest.noTest);
+    getCache().getLogger().info("Validating CQ Service stats on server: #5");
+    validateCQServiceStats(server, 22, 0, 0, 22, CqQueryDUnitTest.noTest, 0, 0);
+    
+    // Close.
+    cqDUnitTest.closeClient(client1);
+    cqDUnitTest.closeClient(client2);
+    cqDUnitTest.closeServer(server);
+  }
+
+} 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
new file mode 100644
index 0000000..b7eaaa2
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
@@ -0,0 +1,43 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.query.cq.dunit;
+
+import com.gemstone.gemfire.cache.query.internal.cq.CqService;
+import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
+
+import dunit.SerializableRunnable;
+
+/**
+ * Test class for testing {@link CqService#EXECUTE_QUERY_DURING_INIT} flag
+ *
+ */
+public class CqStatsOptimizedExecuteDUnitTest extends CqStatsDUnitTest{
+
+  public CqStatsOptimizedExecuteDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+    invokeInEveryVM(new SerializableRunnable("getSystem") {
+      public void run() {
+        CqServiceImpl.EXECUTE_QUERY_DURING_INIT = false;
+      }
+    });
+  }
+  
+  @Override
+  public void tearDown2() throws Exception {
+    invokeInEveryVM(new SerializableRunnable("getSystem") {
+      public void run() {
+        CqServiceImpl.EXECUTE_QUERY_DURING_INIT = true;
+      }
+    });
+    super.tearDown2();
+  }
+}


[31/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
new file mode 100755
index 0000000..096c831
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
@@ -0,0 +1,778 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.tier.sockets;
+
+import java.util.Iterator;
+import java.util.Properties;
+
+import javax.naming.InitialContext;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionAttributes;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.client.Pool;
+import com.gemstone.gemfire.cache.client.PoolManager;
+import com.gemstone.gemfire.cache.client.internal.PoolImpl;
+import com.gemstone.gemfire.cache.query.CqAttributes;
+import com.gemstone.gemfire.cache.query.CqAttributesFactory;
+import com.gemstone.gemfire.cache.query.CqClosedException;
+import com.gemstone.gemfire.cache.query.CqException;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.distributed.DistributedSystem;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.internal.AvailablePort;
+import com.gemstone.gemfire.internal.cache.CacheServerImpl;
+
+import dunit.DistributedTestCase;
+import dunit.Host;
+import dunit.VM;
+import dunit.DistributedTestCase.WaitCriterion;
+/**
+ * This tests the flag setting for region ( DataPolicy as Empty ) for
+ * Delta propogation for a client while registering CQ
+ * 
+ * @author aingle
+ */
+public class DeltaToRegionRelationCQRegistrationDUnitTest extends DistributedTestCase {
+  private static Cache cache = null;
+
+  VM server = null;
+
+  VM client = null;
+ 
+  VM server2 = null;
+  
+  VM client2 = null;
+ 
+  private static  int PORT1 ;
+  
+  private static  int PORT2 ;
+  
+  private static PoolImpl p = null; 
+  /*
+   * name of the region with data policy empty
+   */
+  private static final String REGION_NAME1 = "DeltaToRegionRelationCQRegistration_region1";
+  
+  /*
+   * name of the region whose data policy is not empty
+   */
+  private static final String REGION_NAME2 = "DeltaToRegionRelationCQRegistration_region2";
+  /*
+   * to detect primary server
+   */
+  private static Integer primary = null;
+  
+  /*
+   * cq 1
+   */
+  private static final String CQ1 = "SELECT * FROM "+Region.SEPARATOR+REGION_NAME1;
+  
+  /*
+   * cq 2
+   */
+  private static final String CQ2 = "SELECT * FROM "+Region.SEPARATOR+REGION_NAME2;
+  
+  /*
+   * cq 3
+   */
+  private static final String CQ3 = "SELECT ALL * FROM "+Region.SEPARATOR+REGION_NAME1;
+  
+  /*
+   * cq 4
+   */
+  private static final String CQ4 = "SELECT ALL * FROM "+Region.SEPARATOR+REGION_NAME2;
+    
+  private static final String cqName1="cqNameFirst";
+  private static final String cqName2="cqNameSecond";
+  private static final String cqName3="cqNamethird";
+  private static final String cqName4="cqNameFourth";
+  
+  /** constructor */
+  public DeltaToRegionRelationCQRegistrationDUnitTest(String name) {
+    super(name);
+  }
+  
+  public void setUp() throws Exception
+  {
+    disconnectAllFromDS();
+    pause(5000);
+    final Host host = Host.getHost(0);
+    server = host.getVM(0);
+    client = host.getVM(1);
+    server2 = host.getVM(2);
+    client2 = host.getVM(3);
+  }
+  
+  /**
+   * This test does the following for single cq registration(<b>with out initial resultset</b>):<br>
+   * 1)Verifies create entry for region with data policy as Empty; in map stored in CacheCleintProxy <br>
+   * 2)Verifies no create happens for region with data policy other then Empty; in map <br>
+   * 3)Verifies multiple and different interest registration (key/list) should not create multiple entries in map <br>
+   */
+  public void testDeltaToRegionForRegisterCQ(){
+    
+    intialSetUp();
+    
+    // Register CQ on region with data policy as EMPTY
+    // CQ registration
+    client.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCq",
+        new Object[] {cqName1, CQ1, new Boolean(false)});
+    
+    // Register CQ on region with data policy other then EMPTY
+    // CQ registration
+    client.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCq",
+        new Object[] {cqName2, CQ2, new Boolean(false)});
+    
+    // validation on server side
+    server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "validationOnServer");
+   
+    //  check for multiple time cq registration 
+    //  Register CQ on region with data policy as EMPTY
+    //  CQ registration
+    client.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCq",
+        new Object[] {cqName3, CQ3, new Boolean(false)});
+    
+    // Register CQ on region with data policy as EMPTY
+    // CQ registration
+    client.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCq",
+        new Object[] {cqName4, CQ4, new Boolean(true)});
+    
+    // validation on server side
+    server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "validationOnServer");
+    
+    tearDownforSimpleCase();
+  }
+  
+  /**
+   * This test does the following for single cq registration(<b>with initial resultset</b>):<br>
+   * 1)Verifies create entry for region with data policy as Empty; in map stored in CacheCleintProxy <br>
+   * 2)Verifies no create happens for region with data policy other then Empty; in map <br>
+   * 3)Verifies multiple and different interest registration (key/list) should not create multiple entries in map <br>
+   */
+  public void testDeltaToRegionForRegisterCQIR(){
+    
+    intialSetUp();
+    
+    // Register CQ on region with data policy as EMPTY
+    // CQ registration
+    client.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCq",
+        new Object[] {cqName1, CQ1, new Boolean(true)});
+    
+    // Register CQ on region with data policy other then EMPTY
+    // CQ registration
+    client.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCq",
+        new Object[] {cqName2, CQ2, new Boolean(true)});
+    
+    // validation on server side
+    server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "validationOnServer");
+   
+    //  check for multiple time registration Interest
+    
+    //  Register CQ on region with data policy as EMPTY
+    //  CQ registration
+    client.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCq",
+        new Object[] {cqName3, CQ3, new Boolean(true) });
+    
+    // Register CQ on region with data policy as EMPTY
+    // CQ registration
+    client.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCq",
+        new Object[] {cqName4, CQ4, new Boolean(false)});
+    
+    // validation on server side
+    server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "validationOnServer");
+    
+    tearDownforSimpleCase();
+  }
+  
+  /**
+   * This test does the following for single cq registration from pool (<b>with initial resultset</b>):<br>
+   * 1)Verifies create entry for region in map stored in CacheCleintProxy <br>
+   * 2)Verifies multiple and different interest registration (key/list) should not create multiple entries in map <br>
+   */
+  public void testDeltaToRegionForRegisterCQIRThroughPool(){
+    
+    intialSetUpClientWithNoRegion();
+    
+    // Register CQ on region
+    // CQ registration
+    client.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCqThroughPool",
+        new Object[] {cqName1, CQ1, new Boolean(true)});
+    
+    // Register CQ on region 
+    // CQ registration
+    client.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCqThroughPool",
+        new Object[] {cqName2, CQ2, new Boolean(true)});
+    
+    // validation on server side
+    server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "validationOnServerForCqRegistrationFromPool");
+   
+    //  check for multiple time registration cq
+    
+    //  Register CQ on region 
+    //  CQ registration
+    client.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCqThroughPool",
+        new Object[] {cqName3, CQ3, new Boolean(true) });
+    
+    // Register CQ on region
+    // CQ registration
+    client.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCqThroughPool",
+        new Object[] {cqName4, CQ4, new Boolean(false)});
+    
+    // validation on server side
+    server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "validationOnServerForCqRegistrationFromPool");
+    
+    tearDownforSimpleCase();
+  }
+  
+  
+  /**
+   * This test does the following for cq registration when <b>failover</b>(<b>cq registration</b>):<br>
+   * 1)Verifies when primary goes down, cq registration happen <br>
+   * 2)Verifies create entry for region with data policy as Empty; in map stored in CacheCleintProxy <br>
+   * 3)Verifies no create happens for region with data policy other then Empty; in map <br>
+   */
+  public void testDeltaToRegionForRegisterCQFailover(){
+    
+    intialSetUpForFailOver();
+    // Register CQ on region with data policy as EMPTY
+    client2.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCq",
+        new Object[] {cqName1, CQ1, new Boolean(false)});
+    // Register CQ on region with data policy other then EMPTY
+    client2.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCq",
+        new Object[] {cqName2, CQ2, new Boolean(false)});
+        
+    validationForFailOver();
+    tearDownForFailOver();
+  }
+  
+  /**
+   * This test does the following for cq registration with initial result set when <b>failover</b>(<b>cq registration</b>):<br>
+   * 1)Verifies when primary goes down, cq registration happen <br>
+   * 2)Verifies create entry for region with data policy as Empty; in map stored in CacheCleintProxy <br>
+   * 3)Verifies no create happens for region with data policy other then Empty; in map <br>
+   */
+  public void testDeltaToRegionForRegisterCQIRFaliover() {
+    intialSetUpForFailOver();
+    // Register CQ on region with data policy as EMPTY
+    client2.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCq",
+        new Object[] {cqName1, CQ1, new Boolean(true)});
+
+    // Register CQ on region with data policy other then EMPTY
+    client2.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCq",
+        new Object[] {cqName2, CQ2, new Boolean(true)});
+
+    validationForFailOver();
+    tearDownForFailOver();
+  }
+
+  /**
+   * This test does the following for cq registration with initial result set through pool when <b>failover</b>(<b>cq registration</b>):<br>
+   * 1)Verifies when primary goes down, cq registration happen <br>
+   * 2)Verifies create entry for region in map stored in CacheCleintProxy <br>
+   */
+  public void testDeltaToRegionForRegisterCQIRFromPoolFaliover() {
+    intialSetUpNoRegiononClientForFailOver();
+    // Register CQ on region
+    client2.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCqThroughPool",
+        new Object[] {cqName1, CQ1, new Boolean(true)});
+    
+    //  Register CQ on region 
+    client2.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "registerCqThroughPool",
+        new Object[] {cqName2, CQ2, new Boolean(true)});
+    
+    validationForCQFiredFromPoolFailOver();
+    tearDownForFailOver();
+  }
+ 
+  /*
+   * register cq 
+   */
+  public static void registerCq(String name, String Cquery, Boolean cqWithIR){
+    QueryService cqService = null;
+    //get cq service
+    try {          
+      cqService = cache.getQueryService();
+    } catch (Exception cqe) {
+      cqe.printStackTrace();
+      fail("Failed to getCqService.");
+    }
+    
+    // Create CQ Attributes.
+    // do not attach any listiner lets see its response
+    CqAttributesFactory cqf = new CqAttributesFactory();
+    CqAttributes cqa = cqf.create();
+    
+//  Create and Execute CQ.
+    try {
+      CqQuery cq1 = cqService.newCq(name, Cquery, cqa);
+      assertTrue("newCq() state mismatch", cq1.getState().isStopped());
+      if(cqWithIR)
+        cq1.executeWithInitialResults();
+      else  
+        cq1.execute();
+    } catch (Exception ex){
+      getLogWriter().info("CqService is :" + cqService);
+      ex.printStackTrace();
+      AssertionError err = new AssertionError("Failed to create CQ " + cqName1 + " . ");
+      err.initCause(ex);
+      throw err;
+    }
+    
+    CqQuery cQuery = cqService.getCq(name);
+    if (cQuery == null) {
+      fail("Failed to get CqQuery for CQ : " + cqName1);
+    }
+  }
+
+  
+  /*
+   * register cq from pool
+   */
+  public static void registerCqThroughPool(String name, String Cquery, Boolean cqWithIR){
+    QueryService cqService = null;
+    //get cq service
+    try {          
+      cqService = p.getQueryService();
+    } catch (Exception cqe) {
+      cqe.printStackTrace();
+      fail("Failed to getCqService.");
+    }
+    
+    // Create CQ Attributes.
+    // do not attach any listiner lets see its response
+    CqAttributesFactory cqf = new CqAttributesFactory();
+    CqAttributes cqa = cqf.create();
+    
+//  Create and Execute CQ.
+    try {
+      CqQuery cq1 = cqService.newCq(name, Cquery, cqa);
+      assertTrue("newCq() state mismatch", cq1.getState().isStopped());
+      if(cqWithIR)
+        cq1.executeWithInitialResults();
+      else  
+        cq1.execute();
+    } catch (Exception ex){
+      getLogWriter().info("CqService is :" + cqService);
+      ex.printStackTrace();
+      AssertionError err = new AssertionError("Failed to create CQ " + cqName1 + " . ");
+      err.initCause(ex);
+      throw err;
+    }
+    
+    CqQuery cQuery = cqService.getCq(name);
+    if (cQuery == null) {
+      fail("Failed to get CqQuery for CQ : " + cqName1);
+    }
+  }
+  
+  public static void validationOnServer() throws Exception{
+    checkNumberOfClientProxies(1);
+    CacheClientProxy proxy = getClientProxy();
+    assertNotNull(proxy);
+//  wait
+    WaitCriterion wc = new WaitCriterion() {
+      public boolean done() {
+        return DeltaToRegionRelationCQRegistrationDUnitTest.getClientProxy()
+            .getRegionsWithEmptyDataPolicy().containsKey(
+                Region.SEPARATOR + REGION_NAME1);
+      }
+
+      public String description() {
+        return "Wait Expired";
+      }
+    };
+    DistributedTestCase.waitForCriterion(wc, 5 * 1000, 100, true);
+    
+    assertTrue(REGION_NAME1
+        + " not present in cache client proxy : Delta is enable", proxy
+        .getRegionsWithEmptyDataPolicy().containsKey(Region.SEPARATOR+REGION_NAME1)); /*
+                                                               * Empty data
+                                                               * policy
+                                                               */
+    assertFalse(REGION_NAME2
+        + " present in cache client proxy : Delta is disable", proxy
+        .getRegionsWithEmptyDataPolicy().containsKey(Region.SEPARATOR+REGION_NAME2)); /*
+                                                               * other then Empty data
+                                                               * policy
+                                                               */
+    assertTrue("Multiple entries for a region", proxy.getRegionsWithEmptyDataPolicy().size()==1);
+    assertTrue("Wrong ordinal stored for empty data policy", ((Integer)proxy
+        .getRegionsWithEmptyDataPolicy().get(Region.SEPARATOR+REGION_NAME1)).intValue() == 0);
+  
+  }
+  
+  public static void validationOnServerForCqRegistrationFromPool()
+      throws Exception {
+    checkNumberOfClientProxies(1);
+    CacheClientProxy proxy = getClientProxy();
+    assertNotNull(proxy);
+
+//  wait
+    WaitCriterion wc = new WaitCriterion() {
+      public boolean done() {
+        return DeltaToRegionRelationCQRegistrationDUnitTest.getClientProxy()
+            .getRegionsWithEmptyDataPolicy().containsKey(
+                Region.SEPARATOR + REGION_NAME1)
+            && DeltaToRegionRelationCQRegistrationDUnitTest.getClientProxy()
+                .getRegionsWithEmptyDataPolicy().containsKey(
+                    Region.SEPARATOR + REGION_NAME2);
+      }
+
+      public String description() {
+        return "Wait Expired";
+      }
+    };
+    DistributedTestCase.waitForCriterion(wc, 5 * 1000, 100, true);
+    
+    assertTrue("Multiple entries for a region", proxy
+        .getRegionsWithEmptyDataPolicy().size() == 2);
+
+    assertTrue("Wrong ordinal stored for empty data policy", ((Integer)proxy
+        .getRegionsWithEmptyDataPolicy().get(Region.SEPARATOR + REGION_NAME1))
+        .intValue() == 0);
+
+    assertTrue("Wrong ordinal stored for empty data policy", ((Integer)proxy
+        .getRegionsWithEmptyDataPolicy().get(Region.SEPARATOR + REGION_NAME2))
+        .intValue() == 0);
+
+  }
+  /*
+   * create server cache
+   */
+  public static Integer createServerCache() throws Exception
+  {
+    new DeltaToRegionRelationCQRegistrationDUnitTest("temp").createCache(new Properties());
+    AttributesFactory factory = new AttributesFactory();
+    factory.setScope(Scope.DISTRIBUTED_ACK);
+    factory.setDataPolicy(DataPolicy.REPLICATE);
+    RegionAttributes attrs = factory.create();
+    cache.createRegion(REGION_NAME1, attrs);
+    cache.createRegion(REGION_NAME2, attrs);
+
+    CacheServer server = cache.addCacheServer();
+    int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET) ;
+    server.setPort(port);
+    // ensures updates to be sent instead of invalidations
+    server.setNotifyBySubscription(true);
+    server.start();
+    return new Integer(server.getPort());
+
+  }
+  /*
+   * create client cache
+   */
+  public static void createClientCache(String host, Integer port)
+      throws Exception {
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "");
+    new DeltaToRegionRelationCQRegistrationDUnitTest("temp").createCache(props);
+    Pool p = PoolManager.createFactory().addServer(host, port.intValue())
+        .setThreadLocalConnections(true).setMinConnections(3)
+        .setSubscriptionEnabled(true).setSubscriptionRedundancy(0)
+        .setReadTimeout(10000).setSocketBufferSize(32768)
+        // .setRetryInterval(10000)
+        // .setRetryAttempts(5)
+        .create("DeltaToRegionRelationCQRegistrationTestPool");
+    AttributesFactory factory = new AttributesFactory();
+    factory.setScope(Scope.DISTRIBUTED_ACK);
+    factory.setDataPolicy(DataPolicy.EMPTY);
+    factory.setPoolName(p.getName());
+    factory.setCloningEnabled(false);
+
+    // region with empty data policy
+    RegionAttributes attrs = factory.create();
+    cache.createRegion(REGION_NAME1, attrs);
+
+    assertFalse(cache.getRegion(REGION_NAME1).getAttributes().getCloningEnabled());
+    factory.setDataPolicy(DataPolicy.NORMAL);
+    attrs = factory.create();
+    // region with non empty data policy
+    cache.createRegion(REGION_NAME2, attrs);
+    assertFalse(cache.getRegion(REGION_NAME2).getAttributes().getCloningEnabled());
+    cache.getRegion(REGION_NAME2).getAttributesMutator().setCloningEnabled(true);
+    assertTrue(cache.getRegion(REGION_NAME2).getAttributes().getCloningEnabled());
+  }
+  
+  /*
+   * create client cache
+   */
+  public static void createClientCacheWithNoRegion(String host, Integer port)
+      throws Exception {
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "");
+    new DeltaToRegionRelationCQRegistrationDUnitTest("temp").createCache(props);
+    p = (PoolImpl)PoolManager.createFactory().addServer(host, port.intValue())
+        .setThreadLocalConnections(true).setMinConnections(3)
+        .setSubscriptionEnabled(true).setSubscriptionRedundancy(0)
+        .setReadTimeout(10000).setSocketBufferSize(32768)
+        // .setRetryInterval(10000)
+        // .setRetryAttempts(5)
+        .create("DeltaToRegionRelationCQRegistrationTestPool");
+  }
+  /*
+   * create client cache and return's primary server location object (primary)
+   */
+  public static Integer createClientCache2(String host1, String host2,
+      Integer port1, Integer port2) throws Exception {
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "");
+    new DeltaToRegionRelationCQRegistrationDUnitTest("temp").createCache(props);
+    PoolImpl p = (PoolImpl)PoolManager.createFactory().addServer(host1,
+        port1.intValue()).addServer(host2, port2.intValue())
+        .setThreadLocalConnections(true).setMinConnections(3)
+        .setSubscriptionEnabled(true).setSubscriptionRedundancy(0)
+        .setReadTimeout(10000).setSocketBufferSize(32768)
+        // .setRetryInterval(10000)
+        // .setRetryAttempts(5)
+        .create("DeltaToRegionRelationCQRegistrationTestPool");
+    AttributesFactory factory = new AttributesFactory();
+    factory.setScope(Scope.DISTRIBUTED_ACK);
+    factory.setDataPolicy(DataPolicy.EMPTY);
+    factory.setPoolName(p.getName());
+
+    // region with empty data policy
+    RegionAttributes attrs = factory.create();
+    cache.createRegion(REGION_NAME1, attrs);
+
+    factory.setDataPolicy(DataPolicy.NORMAL);
+    attrs = factory.create();
+    // region with non empty data policy
+    cache.createRegion(REGION_NAME2, attrs);
+
+    return new Integer(p.getPrimaryPort());
+  }
+
+  
+  /*
+   * create client cache and return's primary server location object (primary)
+   * no region created on client
+   */
+  public static Integer createClientCache3(String host1, String host2,
+      Integer port1, Integer port2) throws Exception {
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "");
+    new DeltaToRegionRelationCQRegistrationDUnitTest("temp").createCache(props);
+    p = (PoolImpl)PoolManager.createFactory().addServer(host1,
+        port1.intValue()).addServer(host2, port2.intValue())
+        .setThreadLocalConnections(true).setMinConnections(3)
+        .setSubscriptionEnabled(true).setSubscriptionRedundancy(0)
+        .setReadTimeout(10000).setSocketBufferSize(32768)
+        // .setRetryInterval(10000)
+        // .setRetryAttempts(5)
+        .create("DeltaToRegionRelationCQRegistrationTestPool");
+    return new Integer(p.getPrimaryPort());
+  }
+  
+  public void tearDown2() throws Exception
+  {
+    // donot do any thing as we handling closing cache in test case
+  }
+
+  /*
+   * close cache
+   */
+  public static void closeCache()
+  {
+    if (cache != null && !cache.isClosed()) {
+      cache.close();
+      cache.getDistributedSystem().disconnect();
+    }
+  }
+  
+  /*
+   * get cache client proxy object
+   */
+  public static CacheClientProxy getClientProxy() {
+    // Get the CacheClientNotifier
+    CacheClientNotifier notifier = getBridgeServer().getAcceptor()
+        .getCacheClientNotifier();
+    
+    // Get the CacheClientProxy or not (if proxy set is empty)
+    CacheClientProxy proxy = null;
+    Iterator i = notifier.getClientProxies().iterator();
+    if (i.hasNext()) {
+      proxy = (CacheClientProxy) i.next();
+    }
+    return proxy;
+  }
+  
+  /*
+   * get cache server / bridge server attacted to cache
+   */
+  private static CacheServerImpl getBridgeServer() {
+    CacheServerImpl bridgeServer = (CacheServerImpl)cache.getCacheServers()
+        .iterator().next();
+    assertNotNull(bridgeServer);
+    return bridgeServer;
+  }
+  /*
+   * number of client proxies are presert
+   */
+  private static int getNumberOfClientProxies() {
+    return getBridgeServer().getAcceptor().getCacheClientNotifier()
+        .getClientProxies().size();
+  }
+  /*
+   * if expected number of proxies are not present and wait
+   */
+  private static void checkNumberOfClientProxies(int expected) {
+    int current = getNumberOfClientProxies();
+    int tries = 1;
+    while (expected != current && tries++ < 60) {
+      try {
+        Thread.sleep(250);
+      } catch (InterruptedException ignore) {
+        Thread.currentThread().interrupt(); // reset bit
+      }
+      current = getNumberOfClientProxies();
+    }
+    assertEquals(expected, current);
+  }
+  
+  /*
+   * stop bridge server
+   */
+  public static void stopCacheServer(){
+    getBridgeServer().stop();
+  }
+  /*
+   * initial setup required for testcase with out failover
+   */
+  public void intialSetUp() {
+    PORT1 = ((Integer)server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class,
+        "createServerCache")).intValue();
+    client
+        .invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "createClientCache",
+            new Object[] { getServerHostName(server.getHost()),
+                new Integer(PORT1) });
+  }
+  
+  /*
+   * initial setup required for testcase with out failover
+   */
+  public void intialSetUpClientWithNoRegion() {
+    PORT1 = ((Integer)server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class,
+        "createServerCache")).intValue();
+    client
+        .invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "createClientCacheWithNoRegion",
+            new Object[] { getServerHostName(server.getHost()),
+                new Integer(PORT1) });
+  }
+  /*
+   * kind of teardown for testcase without failover
+   */
+  public void tearDownforSimpleCase() {
+    //  close the clients first
+    client.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "closeCache");
+    // then close the servers
+    server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "closeCache");
+  }  
+  /*
+   * initial setup required for testcase with failover
+   */
+  public void intialSetUpForFailOver() {
+    PORT1 = ((Integer)server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class,
+        "createServerCache")).intValue();
+    // used only in failover tests
+    PORT2 = ((Integer)server2.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class,
+        "createServerCache")).intValue();
+    primary = (Integer)client2.invoke(
+        DeltaToRegionRelationCQRegistrationDUnitTest.class, "createClientCache2",
+        new Object[] { getServerHostName(server.getHost()),
+            getServerHostName(server2.getHost()), new Integer(PORT1),
+            new Integer(PORT2) });
+  }
+  
+  /*
+   * initial setup required for testcase with failover where we don't need region on client
+   */
+  public void intialSetUpNoRegiononClientForFailOver() {
+    PORT1 = ((Integer)server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class,
+        "createServerCache")).intValue();
+    // used only in failover tests
+    PORT2 = ((Integer)server2.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class,
+        "createServerCache")).intValue();
+    primary = (Integer)client2.invoke(
+        DeltaToRegionRelationCQRegistrationDUnitTest.class, "createClientCache3",
+        new Object[] { getServerHostName(server.getHost()),
+            getServerHostName(server2.getHost()), new Integer(PORT1),
+            new Integer(PORT2) });
+  }
+  
+  /*
+   * find out primary and stop it
+   * register CQ whould happened on other server
+   */
+  public void validationForFailOver(){
+    assertTrue(" primary server is not detected ",primary.intValue() != -1);
+    if (primary.intValue() == PORT1) {
+      server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "validationOnServer");
+      server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "stopCacheServer");
+      server2
+          .invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "validationOnServer");
+    }
+    else {
+      server2
+          .invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "validationOnServer");
+      server2.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "stopCacheServer");
+      server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "validationOnServer");
+    }
+  }
+  
+  /*
+   * find out primary and stop it
+   * register CQ whould happened on other server
+   */
+  public void validationForCQFiredFromPoolFailOver(){
+    assertTrue(" primary server is not detected ",primary.intValue() != -1);
+    if (primary.intValue() == PORT1) {
+      server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "validationOnServerForCqRegistrationFromPool");
+      server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "stopCacheServer");
+      server2
+          .invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "validationOnServerForCqRegistrationFromPool");
+    }
+    else {
+      server2
+          .invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "validationOnServerForCqRegistrationFromPool");
+      server2.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "stopCacheServer");
+      server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "validationOnServerForCqRegistrationFromPool");
+    }
+  }
+  /*
+   * kind of teardown for testcase with failover
+   */
+  public void tearDownForFailOver() {
+    // close the clients first
+    client2.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "closeCache");
+    // then close the servers
+    server.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "closeCache");
+    server2.invoke(DeltaToRegionRelationCQRegistrationDUnitTest.class, "closeCache");
+  }
+  /*
+   * create cache with properties
+   */
+  private void createCache(Properties props) throws Exception
+  {
+    DistributedSystem ds = getSystem(props);
+    cache = CacheFactory.create(ds);
+    assertNotNull(cache);
+  }
+  
+ 
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java
new file mode 100755
index 0000000..4755767
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientCrashDUnitTest.java
@@ -0,0 +1,90 @@
+/*=========================================================================
+ * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.tier.sockets;
+
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+
+/**
+ * Class <code>DurableClientCrashDUnitTest</code> tests durable client
+ * functionality when clients crash.
+ * 
+ * @author Abhijit Bhaware
+ * 
+ * @since 5.2
+ */
+public class DurableClientCrashDUnitTest extends DurableClientTestCase {
+
+  public DurableClientCrashDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+    configureClientStop1();
+  }
+  
+  public void configureClientStop1()
+  {
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "setClientCrash", new Object[] {new Boolean(true)});    
+  }
+  
+  public void tearDown2() throws Exception {
+    configureClientStop2();
+    super.tearDown2();
+  }
+  
+  public void configureClientStop2()
+  {
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "setClientCrash", new Object[] {new Boolean(false)});    
+  }
+  
+  public void verifySimpleDurableClient() {
+    this.server1VM
+        .invoke(new CacheSerializableRunnable("Verify durable client") {
+          public void run2() throws CacheException {
+            // Find the proxy
+            checkNumberOfClientProxies(1);
+            CacheClientProxy proxy = getClientProxy();
+            assertNotNull(proxy);
+          }
+        });
+  }
+  
+  public void verifySimpleDurableClientMultipleServers() 
+  {
+    // Verify the durable client is no longer on server1
+    this.server1VM
+        .invoke(new CacheSerializableRunnable("Verify durable client") {
+          public void run2() throws CacheException {
+            // Find the proxy
+            checkNumberOfClientProxies(1);
+            CacheClientProxy proxy = getClientProxy();
+            assertNotNull(proxy);
+          }
+        });
+
+    // Verify the durable client is no longer on server2
+    this.server2VM
+        .invoke(new CacheSerializableRunnable("Verify durable client") {
+          public void run2() throws CacheException {
+            // Find the proxy
+            checkNumberOfClientProxies(1);
+            CacheClientProxy proxy = getClientProxy();
+            assertNotNull(proxy);
+          }
+        });
+  }
+  
+  // AB: Following tests are not relevant for client crash case.
+  
+  public void testCqCloseExceptionDueToActiveConnection() throws Exception {}
+
+  public void testCloseCacheProxy() throws Exception {}
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java
new file mode 100644
index 0000000..cabee47
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientNetDownDUnitTest.java
@@ -0,0 +1,71 @@
+/*=========================================================================
+ * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.tier.sockets;
+
+
+/**
+ * Class <code>DurableClientCrashDUnitTest</code> tests durable client
+ * functionality when clients are disconnected from servers.
+ * 
+ * @author Abhijit Bhaware
+ * 
+ * @since 5.2
+ */
+public class DurableClientNetDownDUnitTest extends DurableClientCrashDUnitTest {
+
+  public DurableClientNetDownDUnitTest(String name) {
+    super(name);
+  }
+  
+  @Override
+  public void tearDown2() throws Exception {
+    //ensure that the test flag is no longer set in this vm
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "reconnectClient");
+    super.tearDown2();
+  }
+
+  public void setPrimaryRecoveryCheck() {}
+  
+  public void checkPrimaryRecovery() {}
+  
+  public void configureClientStop1() {}
+  
+  public void configureClientStop2() {}
+  
+  public void closeDurableClient()
+  {
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "reconnectClient");
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+  }
+  
+  public void disconnectDurableClient()
+  {
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "disconnectClient");
+  }
+
+  public void disconnectDurableClient(boolean keepAlive)
+  {
+    this.disconnectDurableClient();
+  }
+  
+  public void restartDurableClient(Object[] args)
+  {
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "reconnectClient");  
+  }
+  
+  public void verifyListenerUpdatesDisconnected(int numberOfEntries)
+  {
+    this.verifyListenerUpdates(numberOfEntries);
+  }
+
+  public void verifyListenerUpdates(int numEntries, int numEntriesBeforeDisconnect)
+  {
+    this.verifyListenerUpdatesEntries(numEntries, numEntriesBeforeDisconnect);
+  }
+  
+}



[14/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java
new file mode 100644
index 0000000..6566152
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java
@@ -0,0 +1,608 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.wan.misc;
+
+import static org.junit.Assert.*;
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.junit.After;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionAttributes;
+import com.gemstone.gemfire.cache.RegionFactory;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener;
+import com.gemstone.gemfire.cache.wan.GatewayEventFilter;
+import com.gemstone.gemfire.cache.wan.GatewayReceiver;
+import com.gemstone.gemfire.cache.wan.GatewayReceiverFactory;
+import com.gemstone.gemfire.cache.wan.GatewaySender;
+import com.gemstone.gemfire.cache.wan.GatewaySenderFactory;
+import com.gemstone.gemfire.cache.wan.GatewayTransportFilter;
+import com.gemstone.gemfire.cache30.MyGatewayEventFilter1;
+import com.gemstone.gemfire.cache30.MyGatewayTransportFilter1;
+import com.gemstone.gemfire.cache30.MyGatewayTransportFilter2;
+import com.gemstone.gemfire.internal.AvailablePort;
+import com.gemstone.gemfire.internal.cache.LocalRegion;
+import com.gemstone.gemfire.internal.cache.wan.GatewayReceiverException;
+import com.gemstone.gemfire.internal.cache.wan.GatewaySenderException;
+import com.gemstone.gemfire.internal.cache.wan.InternalGatewaySenderFactory;
+import com.gemstone.gemfire.internal.cache.wan.MyGatewaySenderEventListener;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+
+@Category(IntegrationTest.class)
+public class WANConfigurationJUnitTest {
+
+  private Cache cache;
+
+  /**
+   * Test to validate that the sender can not be started without configuring
+   * locator
+   * @throws IOException 
+   * 
+   * @throws IOException
+   */
+  @Test
+  public void test_GatewaySender_without_Locator() throws IOException {
+    try {
+      cache = new CacheFactory().set("mcast-port", "0").create();
+      GatewaySenderFactory fact = cache.createGatewaySenderFactory();
+      fact.setParallel(true);
+      GatewaySender sender1 = fact.create("NYSender", 2);
+      sender1.start();
+      fail("Expectd IllegalStateException but not thrown");
+    }
+    catch (Exception e) {
+      if ((e instanceof IllegalStateException && e
+          .getMessage()
+          .startsWith(
+              LocalizedStrings.AbstractGatewaySender_LOCATOR_SHOULD_BE_CONFIGURED_BEFORE_STARTING_GATEWAY_SENDER
+                  .toLocalizedString()))) {
+      }
+      else {
+        fail("Expectd IllegalStateException but received :" + e);
+      }
+    }
+  }
+
+  /**
+   * Test to validate that sender with same Id can not be added to cache.
+   */
+  @Test
+  public void test_SameGatewaySenderCreatedTwice() {
+    cache = new CacheFactory().set("mcast-port", "0").create();
+    try {
+      GatewaySenderFactory fact = cache.createGatewaySenderFactory();
+      fact.setParallel(true);
+      fact.setManualStart(true);
+      fact.create("NYSender", 2);
+      fact.create("NYSender", 2);
+      fail("Expectd IllegalStateException but not thrown");
+    }
+    catch (Exception e) {
+      if (e instanceof IllegalStateException
+          && e.getMessage().contains("A GatewaySender with id")) {
+
+      }
+      else {
+        fail("Expectd IllegalStateException but received :" + e);
+      }
+    }
+  }
+  
+  /**
+   * Test to validate that same gatewaySender Id can not be added to the region attributes.
+   */
+  @Test
+  public void test_SameGatewaySenderIdAddedTwice() {
+    try {
+      cache = new CacheFactory().set("mcast-port", "0").create();
+      GatewaySenderFactory fact = cache.createGatewaySenderFactory();
+      fact.setParallel(true);
+      fact.setManualStart(true);
+      GatewaySender sender1 = fact.create("NYSender", 2);
+      AttributesFactory factory = new AttributesFactory();
+      factory.addGatewaySenderId(sender1.getId());
+      factory.addGatewaySenderId(sender1.getId());
+      fail("Expectd IllegalArgumentException but not thrown");
+    }
+    catch (Exception e) {
+      if (e instanceof IllegalArgumentException
+          && e.getMessage().contains("is already added")) {
+
+      }
+      else {
+        fail("Expectd IllegalStateException but received :" + e);
+      }
+    }
+  }
+  
+  @Test
+  public void test_GatewaySenderIdAndAsyncEventId() {
+      cache = new CacheFactory().set("mcast-port", "0").create();
+      AttributesFactory factory = new AttributesFactory();
+      factory.addGatewaySenderId("ln");
+      factory.addGatewaySenderId("ny");
+      factory.addAsyncEventQueueId("Async_LN");
+      RegionAttributes attrs = factory.create();
+      
+      Set<String> senderIds = new HashSet<String>();
+      senderIds.add("ln");
+      senderIds.add("ny");
+      Set<String> attrsSenderIds = attrs.getGatewaySenderIds();
+      assertEquals(senderIds, attrsSenderIds);
+      Region r = cache.createRegion("Customer", attrs);
+      assertEquals(senderIds, ((LocalRegion)r).getGatewaySenderIds());
+  }
+
+  /**
+   * Test to validate that distributed region can not have the gateway sender
+   * with parallel distribution policy
+   * 
+   */
+  public void DIABLEB_DUE_TO_BUG51491_test_GatewaySender_Parallel_DistributedRegion() {
+    cache = new CacheFactory().set("mcast-port", "0").create();
+    GatewaySenderFactory fact = cache.createGatewaySenderFactory();
+    fact.setParallel(true);
+    fact.setManualStart(true);
+    GatewaySender sender1 = fact.create("NYSender", 2);
+    AttributesFactory factory = new AttributesFactory();
+    factory.addGatewaySenderId(sender1.getId());
+    factory.setScope(Scope.DISTRIBUTED_ACK);
+    factory.setDataPolicy(DataPolicy.REPLICATE);
+    try {
+      RegionFactory regionFactory = cache.createRegionFactory(factory.create());
+      Region region = regionFactory
+          .create("test_GatewaySender_Parallel_DistributedRegion");
+    }
+    catch (Exception e) {
+      fail("Unexpectd Exception :" + e);
+    }
+  }
+  
+  @Test
+  public void test_GatewaySender_Parallel_MultipleDispatherThread() {
+    cache = new CacheFactory().set("mcast-port", "0").create();
+    GatewaySenderFactory fact = cache.createGatewaySenderFactory();
+    fact.setParallel(true);
+    fact.setManualStart(true);
+    fact.setDispatcherThreads(4);
+    try {
+      GatewaySender sender1 = fact.create("NYSender", 2);
+    }
+    catch (GatewaySenderException e) {
+       fail("UnExpectd Exception " + e);
+    }
+  }
+  
+  @Test
+  public void test_GatewaySender_Serial_ZERO_DispatherThread() {
+    cache = new CacheFactory().set("mcast-port", "0").create();
+    GatewaySenderFactory fact = cache.createGatewaySenderFactory();
+    fact.setManualStart(true);
+    fact.setDispatcherThreads(0);
+    try {
+      GatewaySender sender1 = fact.create("NYSender", 2);
+      fail("Expectd GatewaySenderException but not thrown");
+    }
+    catch (GatewaySenderException e) {
+      if (e.getMessage().contains("can not be created with dispatcher threads less than 1")) {
+      }
+      else {
+        fail("Expectd IllegalStateException but received :" + e);
+      }
+    }
+  }
+
+  /**
+   * Test to validate the gateway receiver attributes are correctly set
+   */
+  @Test
+  public void test_ValidateGatewayReceiverAttributes() {
+    cache = new CacheFactory().set("mcast-port", "0").create();
+    int port1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    int port2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    
+    GatewayReceiverFactory fact = cache.createGatewayReceiverFactory();
+    if(port1 < port2){
+      fact.setStartPort(port1);
+      fact.setEndPort(port2);  
+    }else{
+      fact.setStartPort(port2);
+      fact.setEndPort(port1);
+    }
+    
+    fact.setMaximumTimeBetweenPings(2000);
+    fact.setSocketBufferSize(200);
+    GatewayTransportFilter myStreamfilter1 = new MyGatewayTransportFilter1();
+    GatewayTransportFilter myStreamfilter2 = new MyGatewayTransportFilter2();
+    fact.addGatewayTransportFilter(myStreamfilter2);
+    fact.addGatewayTransportFilter(myStreamfilter1);
+    GatewayReceiver receiver1 = fact.create();
+    
+
+    Region region = cache.createRegionFactory().create(
+        "test_ValidateGatewayReceiverAttributes");
+    Set<GatewayReceiver> receivers = cache.getGatewayReceivers();
+    GatewayReceiver rec = receivers.iterator().next();
+    assertEquals(receiver1.getHost(), rec.getHost());
+    assertEquals(receiver1.getStartPort(), rec.getStartPort());
+    assertEquals(receiver1.getEndPort(), rec.getEndPort());
+    assertEquals(receiver1.getBindAddress(), rec.getBindAddress());
+    assertEquals(receiver1.getMaximumTimeBetweenPings(), rec
+        .getMaximumTimeBetweenPings());
+    assertEquals(receiver1.getSocketBufferSize(), rec
+        .getSocketBufferSize());
+    assertEquals(receiver1.getGatewayTransportFilters().size(), rec
+        .getGatewayTransportFilters().size());
+
+  }
+
+  @Test
+  public void test_ValidateGatewayReceiverStatus() {
+    cache = new CacheFactory().set("mcast-port", "0").create();
+    int port1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    int port2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    
+    GatewayReceiverFactory fact = cache.createGatewayReceiverFactory();
+    if(port1 < port2){
+      fact.setStartPort(port1);
+      fact.setEndPort(port2);  
+    }else{
+      fact.setStartPort(port2);
+      fact.setEndPort(port1);
+    }
+    
+    fact.setMaximumTimeBetweenPings(2000);
+    fact.setSocketBufferSize(200);
+    GatewayTransportFilter myStreamfilter1 = new MyGatewayTransportFilter1();
+    GatewayTransportFilter myStreamfilter2 = new MyGatewayTransportFilter2();
+    fact.addGatewayTransportFilter(myStreamfilter2);
+    fact.addGatewayTransportFilter(myStreamfilter1);
+    GatewayReceiver receiver1 = fact.create();
+    assertTrue(receiver1.isRunning());
+  }
+  
+  /**
+   * Test to validate that serial gateway sender attributes are correctly set
+   * 
+   * @throws IOException
+   */
+  @Test
+  public void test_ValidateSerialGatewaySenderAttributes() {
+    cache = new CacheFactory().set("mcast-port", "0").create();
+    GatewaySenderFactory fact = cache.createGatewaySenderFactory();
+    fact.setManualStart(true);
+    fact.setBatchConflationEnabled(true);
+    fact.setBatchSize(200);
+    fact.setBatchTimeInterval(300);
+    fact.setPersistenceEnabled(false);
+    fact.setDiskStoreName("FORNY");
+    fact.setMaximumQueueMemory(200);
+    fact.setAlertThreshold(1200);
+    GatewayEventFilter myeventfilter1 = new MyGatewayEventFilter1();
+    fact.addGatewayEventFilter(myeventfilter1);
+    GatewayTransportFilter myStreamfilter1 = new MyGatewayTransportFilter1();
+    fact.addGatewayTransportFilter(myStreamfilter1);
+    GatewayTransportFilter myStreamfilter2 = new MyGatewayTransportFilter2();
+    fact.addGatewayTransportFilter(myStreamfilter2);
+    GatewaySender sender1 = fact.create("TKSender", 2);
+    
+
+    AttributesFactory factory = new AttributesFactory();
+    factory.addGatewaySenderId(sender1.getId());
+    factory.setDataPolicy(DataPolicy.PARTITION);
+    Region region = cache.createRegionFactory(factory.create()).create(
+        "test_ValidateGatewaySenderAttributes");
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    assertEquals(senders.size(), 1);
+    GatewaySender gatewaySender = senders.iterator().next();
+    assertEquals(sender1.getRemoteDSId(), gatewaySender
+        .getRemoteDSId());
+    assertEquals(sender1.isManualStart(), gatewaySender.isManualStart());
+    assertEquals(sender1.isBatchConflationEnabled(), gatewaySender
+        .isBatchConflationEnabled());
+    assertEquals(sender1.getBatchSize(), gatewaySender.getBatchSize());
+    assertEquals(sender1.getBatchTimeInterval(), gatewaySender
+        .getBatchTimeInterval());
+    assertEquals(sender1.isPersistenceEnabled(), gatewaySender
+        .isPersistenceEnabled());
+    assertEquals(sender1.getDiskStoreName(), gatewaySender.getDiskStoreName());
+    assertEquals(sender1.getMaximumQueueMemory(), gatewaySender
+        .getMaximumQueueMemory());
+    assertEquals(sender1.getAlertThreshold(), gatewaySender
+        .getAlertThreshold());
+    assertEquals(sender1.getGatewayEventFilters().size(), gatewaySender
+        .getGatewayEventFilters().size());
+    assertEquals(sender1.getGatewayTransportFilters().size(), gatewaySender
+        .getGatewayTransportFilters().size());
+
+  }
+  
+  /**
+   * Test to validate that parallel gateway sender attributes are correctly set
+   * 
+   * @throws IOException
+   */
+  @Test
+  public void test_ValidateParallelGatewaySenderAttributes() {
+    cache = new CacheFactory().set("mcast-port", "0").create();
+    GatewaySenderFactory fact = cache.createGatewaySenderFactory();
+    fact.setParallel(true);
+    fact.setManualStart(true);
+    fact.setBatchConflationEnabled(true);
+    fact.setBatchSize(200);
+    fact.setBatchTimeInterval(300);
+    fact.setPersistenceEnabled(false);
+    fact.setDiskStoreName("FORNY");
+    fact.setMaximumQueueMemory(200);
+    fact.setAlertThreshold(1200);
+    GatewayEventFilter myeventfilter1 = new MyGatewayEventFilter1();
+    fact.addGatewayEventFilter(myeventfilter1);
+    GatewayTransportFilter myStreamfilter1 = new MyGatewayTransportFilter1();
+    fact.addGatewayTransportFilter(myStreamfilter1);
+    GatewayTransportFilter myStreamfilter2 = new MyGatewayTransportFilter2();
+    fact.addGatewayTransportFilter(myStreamfilter2);
+    GatewaySender sender1 = fact.create("TKSender", 2);
+    
+
+    AttributesFactory factory = new AttributesFactory();
+    factory.addGatewaySenderId(sender1.getId());
+    factory.setDataPolicy(DataPolicy.PARTITION);
+    Region region = cache.createRegionFactory(factory.create()).create(
+        "test_ValidateGatewaySenderAttributes");
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    assertEquals(1, senders.size());
+    GatewaySender gatewaySender = senders.iterator().next();
+    assertEquals(sender1.getRemoteDSId(), gatewaySender
+        .getRemoteDSId());
+    assertEquals(sender1.isManualStart(), gatewaySender.isManualStart());
+    assertEquals(sender1.isBatchConflationEnabled(), gatewaySender
+        .isBatchConflationEnabled());
+    assertEquals(sender1.getBatchSize(), gatewaySender.getBatchSize());
+    assertEquals(sender1.getBatchTimeInterval(), gatewaySender
+        .getBatchTimeInterval());
+    assertEquals(sender1.isPersistenceEnabled(), gatewaySender
+        .isPersistenceEnabled());
+    assertEquals(sender1.getDiskStoreName(), gatewaySender.getDiskStoreName());
+    assertEquals(sender1.getMaximumQueueMemory(), gatewaySender
+        .getMaximumQueueMemory());
+    assertEquals(sender1.getAlertThreshold(), gatewaySender
+        .getAlertThreshold());
+    assertEquals(sender1.getGatewayEventFilters().size(), gatewaySender
+        .getGatewayEventFilters().size());
+    assertEquals(sender1.getGatewayTransportFilters().size(), gatewaySender
+        .getGatewayTransportFilters().size());
+
+  }
+  
+  @Test
+  public void test_GatewaySenderWithGatewaySenderEventListener1() {
+    cache = new CacheFactory().set("mcast-port", "0").create();
+    InternalGatewaySenderFactory fact = (InternalGatewaySenderFactory)cache.createGatewaySenderFactory();
+    AsyncEventListener listener = new MyGatewaySenderEventListener();
+    ((InternalGatewaySenderFactory)fact).addAsyncEventListener(listener);
+    try {
+      fact.create("ln", 2);
+      fail("Expected GatewaySenderException. When a sender is added , remoteDSId should not be provided.");
+    } catch (Exception e) {
+      if (e instanceof GatewaySenderException
+          && e.getMessage()
+              .contains(
+                  "cannot define a remote site because at least AsyncEventListener is already added.")) {
+
+      } else {
+        fail("Expected GatewaySenderException but received :" + e);
+      }
+    }
+  }  
+  
+  @Test
+  public void test_GatewaySenderWithGatewaySenderEventListener2() {
+    cache = new CacheFactory().set("mcast-port", "0").create();
+    GatewaySenderFactory fact = cache.createGatewaySenderFactory();
+    AsyncEventListener listener = new MyGatewaySenderEventListener();
+    ((InternalGatewaySenderFactory)fact).addAsyncEventListener(listener);
+    try {
+      ((InternalGatewaySenderFactory)fact).create("ln");
+    } catch (Exception e) {
+      fail("Received Exception :" + e);
+    }
+  }
+  
+  @Test
+  public void test_ValidateGatwayReceiverAttributes() {
+    cache = new CacheFactory().set("mcast-port", "0").create();
+    GatewayReceiverFactory fact = cache.createGatewayReceiverFactory();
+    fact.setStartPort(50504);
+    fact.setMaximumTimeBetweenPings(1000);
+    fact.setSocketBufferSize(4000);
+    fact.setEndPort(70707);
+    fact.setManualStart(true);
+    GatewayTransportFilter myStreamfilter1 = new MyGatewayTransportFilter1();
+    fact.addGatewayTransportFilter(myStreamfilter1);
+    
+    GatewayReceiver receiver = fact.create();
+    try {
+      receiver.start();
+    }
+    catch (IOException e) {
+      fail("The test failed with IOException");
+    }
+
+    assertEquals(50504, receiver.getStartPort());
+    assertEquals(1000, receiver.getMaximumTimeBetweenPings());
+    assertEquals(4000,receiver.getSocketBufferSize());
+    assertEquals(70707, receiver.getEndPort());
+  }
+
+  /**
+   * This test takes a minimum of 120s to execute. It is known to hang on Mac OS
+   * X Yosemite do to changes in the the message string checked in
+   * GatewayRecieverImpl around line 167. Expects
+   * "Cannot assign requested address" but gets
+   * "Can't assign requested address". Timout after 150s to safeguard against
+   * hanging on other platforms that may differ.
+   * 
+   * @see <a
+   *      href="https://svn.gemstone.com/trac/gemfire/ticket/51536">https://svn
+   *      .gemstone.com/trac/gemfire/ticket/51536<a>
+   */
+  @Test(timeout = 150000)
+  public void test_ValidateGatwayReceiverAttributes_WrongBindAddress() {
+    if (System.getProperty("os.name").equals("Mac OS X")) {
+     fail("Failing to avoid known hang on Mac OS X.");
+    }
+    cache = new CacheFactory().set("mcast-port", "0").create();
+    GatewayReceiverFactory fact = cache.createGatewayReceiverFactory();
+    fact.setStartPort(50504);
+    fact.setMaximumTimeBetweenPings(1000);
+    fact.setSocketBufferSize(4000);
+    fact.setEndPort(70707);
+    fact.setManualStart(true);
+    fact.setBindAddress("200.112.204.10");
+    GatewayTransportFilter myStreamfilter1 = new MyGatewayTransportFilter1();
+    fact.addGatewayTransportFilter(myStreamfilter1);
+    
+    GatewayReceiver receiver = fact.create();
+    try {
+      receiver.start();
+      fail("Expected GAtewayReceiverException");
+    }
+    catch (GatewayReceiverException gRE){
+      assertTrue(gRE.getMessage().contains("Failed to create server socket on"));
+    }
+    catch (IOException e) {
+      e.printStackTrace();
+      fail("The test failed with IOException");
+    }
+  }
+  
+  @Test
+  public void test_ValidateGatwayReceiverDefaultStartPortAndDefaultEndPort() {
+    cache = new CacheFactory().set("mcast-port", "0").create();
+    GatewayReceiverFactory fact = cache.createGatewayReceiverFactory();
+    fact.setMaximumTimeBetweenPings(1000);
+    fact.setSocketBufferSize(4000);
+    fact.setManualStart(true);
+    GatewayTransportFilter myStreamfilter1 = new MyGatewayTransportFilter1();
+    fact.addGatewayTransportFilter(myStreamfilter1);
+    
+    GatewayReceiver receiver = fact.create();
+    try {
+      receiver.start();
+    }
+    catch (IOException e) {
+      fail("The test failed with IOException");
+    }
+    int port = receiver.getPort();
+    System.out.println("SKSKSK The port of receiver is " + port);
+    if((port < 5000) || (port > 5500)) {
+      fail("GatewayReceiver started on out of range port");
+    }
+  }
+  
+  @Test
+  public void test_ValidateGatwayReceiverDefaultStartPortAndEndPortProvided() {
+    cache = new CacheFactory().set("mcast-port", "0").create();
+    GatewayReceiverFactory fact = cache.createGatewayReceiverFactory();
+    fact.setMaximumTimeBetweenPings(1000);
+    fact.setSocketBufferSize(4000);
+    fact.setEndPort(50707);
+    fact.setManualStart(true);
+    GatewayTransportFilter myStreamfilter1 = new MyGatewayTransportFilter1();
+    fact.addGatewayTransportFilter(myStreamfilter1);
+    
+    GatewayReceiver receiver = fact.create();
+    try {
+      receiver.start();
+    }
+    catch (IOException e) {
+      fail("The test failed with IOException");
+    }
+    int port = receiver.getPort();
+    if((port < GatewayReceiver.DEFAULT_START_PORT) || (port > 50707)) {
+      fail("GatewayReceiver started on out of range port");
+    }
+  }
+  
+  @Test
+  public void test_ValidateGatwayReceiverWithManualStartFALSE() {
+    cache = new CacheFactory().set("mcast-port", "0").create();
+    GatewayReceiverFactory fact = cache.createGatewayReceiverFactory();
+    fact.setMaximumTimeBetweenPings(1000);
+    fact.setSocketBufferSize(4000);
+    fact.setStartPort(5303);
+    fact.setManualStart(false);
+    GatewayTransportFilter myStreamfilter1 = new MyGatewayTransportFilter1();
+    fact.addGatewayTransportFilter(myStreamfilter1);
+    GatewayReceiver receiver = fact.create();
+    int port = receiver.getPort();
+    if ((port < 5303) || (port > GatewayReceiver.DEFAULT_END_PORT)) {
+      fail("GatewayReceiver started on out of range port");
+    }
+  }
+  
+  @Test
+  public void test_ValidateGatwayReceiverWithStartPortAndDefaultEndPort() {
+    cache = new CacheFactory().set("mcast-port", "0").create();
+    GatewayReceiverFactory fact = cache.createGatewayReceiverFactory();
+    fact.setMaximumTimeBetweenPings(1000);
+    fact.setSocketBufferSize(4000);
+    fact.setStartPort(5303);
+    fact.setManualStart(true);
+    GatewayTransportFilter myStreamfilter1 = new MyGatewayTransportFilter1();
+    fact.addGatewayTransportFilter(myStreamfilter1);
+
+    GatewayReceiver receiver = fact.create();
+    try {
+      receiver.start();
+    }
+    catch (IOException e) {
+      fail("The test failed with IOException");
+    }
+    int port = receiver.getPort();
+    if ((port < 5303) || (port > GatewayReceiver.DEFAULT_END_PORT)) {
+      fail("GatewayReceiver started on out of range port");
+    }
+  }
+  
+  @Test
+  public void test_ValidateGatwayReceiverWithWrongEndPortProvided() {
+    cache = new CacheFactory().set("mcast-port", "0").create();
+    try {
+      GatewayReceiverFactory fact = cache.createGatewayReceiverFactory();
+      fact.setMaximumTimeBetweenPings(1000);
+      fact.setSocketBufferSize(4000);
+      fact.setEndPort(4999);
+      GatewayReceiver receiver = fact.create();  
+      fail("wrong end port set in the GatewayReceiver");
+    } catch (IllegalStateException expected) {
+      if(!expected.getMessage().contains("Please specify either start port a value which is less than end port.")){
+        fail("Caught IllegalStateException");
+        expected.printStackTrace();
+      }
+    }
+  }
+  
+  @After
+  public void tearDown() throws Exception {
+    if (this.cache != null) {
+      this.cache.close();
+    }
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
new file mode 100644
index 0000000..365559f
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
@@ -0,0 +1,185 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.wan.misc;
+
+import java.io.IOException;
+import java.util.Properties;
+
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.client.ClientCache;
+import com.gemstone.gemfire.cache.client.ClientCacheFactory;
+import com.gemstone.gemfire.cache.client.PoolManager;
+import com.gemstone.gemfire.cache.client.internal.Connection;
+import com.gemstone.gemfire.cache.client.internal.PoolImpl;
+import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.cache.wan.GatewayReceiver;
+import com.gemstone.gemfire.cache.wan.GatewayReceiverFactory;
+import com.gemstone.gemfire.cache.wan.GatewaySender;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.internal.AvailablePortHelper;
+import com.gemstone.gemfire.internal.cache.PoolFactoryImpl;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+
+import dunit.Host;
+
+public class WANLocatorServerDUnitTest extends WANTestBase {
+
+  static PoolImpl proxy;
+
+  public WANLocatorServerDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+    final Host host = Host.getHost(0);
+
+  }
+
+  public void test_3Locators_2Servers() {
+
+    int port1 = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+
+    int port2 = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+
+    int port3 = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+
+    vm0.invoke(WANLocatorServerDUnitTest.class, "createLocator", new Object[] {
+        port1, port2, port3, port1 });
+
+    vm1.invoke(WANLocatorServerDUnitTest.class, "createLocator", new Object[] {
+        port1, port2, port3, port2 });
+
+    vm2.invoke(WANLocatorServerDUnitTest.class, "createLocator", new Object[] {
+        port1, port2, port3, port3 });
+
+    vm3.invoke(WANLocatorServerDUnitTest.class, "createReceiver", new Object[] {
+        port1, port2, port3 });
+    vm5.invoke(WANLocatorServerDUnitTest.class, "createClient", new Object[] {
+        port1, port2, port3 });
+
+    vm0.invoke(WANLocatorServerDUnitTest.class, "disconnect");
+    vm1.invoke(WANLocatorServerDUnitTest.class, "disconnect");
+    vm2.invoke(WANLocatorServerDUnitTest.class, "disconnect");
+
+    vm0.invoke(WANLocatorServerDUnitTest.class, "createLocator", new Object[] {
+        port1, port2, port3, port1 });
+
+    vm1.invoke(WANLocatorServerDUnitTest.class, "createLocator", new Object[] {
+        port1, port2, port3, port2 });
+
+    vm2.invoke(WANLocatorServerDUnitTest.class, "createLocator", new Object[] {
+        port1, port2, port3, port3 });
+
+    vm5.invoke(WANLocatorServerDUnitTest.class, "tryNewConnection");
+
+  }
+
+  public static void createLocator(Integer port1, Integer port2, Integer port3,
+      Integer startingPort) {
+    WANTestBase test = new WANTestBase(testName);
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, "" + 1);
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port1
+        + "],localhost[" + port2 + "],localhost[" + port3 + "]");
+    props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost["
+        + startingPort
+        + "],server=true,peer=true,hostname-for-clients=localhost");
+    test.getSystem(props);
+  }
+
+  public static void createReceiver(Integer port1, Integer port2, Integer port3) {
+    WANTestBase test = new WANTestBase(testName);
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port1
+        + "],localhost[" + port2 + "],localhost[" + port3 + "]");
+
+    InternalDistributedSystem ds = test.getSystem(props);
+    cache = CacheFactory.create(ds);
+    GatewayReceiverFactory fact = cache.createGatewayReceiverFactory();
+    int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    fact.setStartPort(port);
+    fact.setEndPort(port);
+    fact.setManualStart(true);
+    GatewayReceiver receiver = fact.create();
+    try {
+      receiver.start();
+    }
+    catch (IOException e) {
+      e.printStackTrace();
+      fail("Test " + test.getName()
+          + " failed to start GatewayRecevier on port " + port);
+    }
+  }
+
+  public static void createServer(Integer port1, Integer port2, Integer port3) {
+    WANTestBase test = new WANTestBase(testName);
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port1
+        + "],localhost[" + port2 + "],localhost[" + port3 + "]");
+
+    InternalDistributedSystem ds = test.getSystem(props);
+    cache = CacheFactory.create(ds);
+    CacheServer server = cache.addCacheServer();
+    int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    server.setPort(port);
+    try {
+      server.start();
+    }
+    catch (IOException e) {
+      e.printStackTrace();
+      fail("Test " + test.getName() + " failed to start CacheServer on port "
+          + port);
+    }
+    getLogWriter().info(
+        "Server Started on port : " + port + " : server : " + server);
+  }
+
+  public static void disconnect() {
+    WANTestBase test = new WANTestBase(testName);
+    test.getSystem().disconnect();
+  }
+
+  public static void createClient(Integer port1, Integer port2, Integer port3) {
+    ClientCacheFactory cf = new ClientCacheFactory();
+    cache = (Cache)cf.create();
+    PoolFactoryImpl pf = (PoolFactoryImpl)PoolManager.createFactory();
+    pf.setReadTimeout(0);
+    pf.setIdleTimeout(-1);
+    pf.setMinConnections(4);
+    pf.setServerGroup(GatewayReceiver.RECEIVER_GROUP);
+    pf.addLocator("localhost", port1);
+    pf.addLocator("localhost", port2);
+    pf.addLocator("localhost", port3);
+    pf.init((GatewaySender)null);
+    proxy = ((PoolImpl)pf.create("KISHOR_POOL"));
+    Connection con1 = proxy.acquireConnection();
+    try {
+      con1.close(true);
+    }
+    catch (Exception e) {
+      e.printStackTrace();
+    }
+  }
+
+  public static void tryNewConnection() {
+    Connection con1 = null;
+    try {
+      con1 = proxy.acquireConnection();
+    }
+    catch (Exception e) {
+      fail("No Exception expected", e);
+    }
+
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
new file mode 100644
index 0000000..d242ab9
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
@@ -0,0 +1,136 @@
+package com.gemstone.gemfire.internal.cache.wan.misc;
+
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+
+import dunit.DistributedTestCase;
+
+public class WANSSLDUnitTest extends WANTestBase{
+
+  public WANSSLDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+  }
+ 
+  public void testSenderSSLReceiverSSL(){
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiverWithSSL", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCacheWithSSL", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+  }
+  
+  public void testSenderNoSSLReceiverSSL() {
+    addExpectedException("Unexpected IOException");
+    addExpectedException("SSL Error");
+    addExpectedException("Unrecognized SSL message");
+    try {
+      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+          "createFirstLocatorWithDSId", new Object[] { 1 });
+      Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+          "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+      vm2.invoke(WANTestBase.class, "createReceiverWithSSL",
+          new Object[] { nyPort });
+
+      vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+          false, 100, 10, false, false, null, true });
+
+      vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", null, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", "ln", isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+          1000 });
+
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_RR", 1000 });
+      fail("Expected exception as only Receiver is SSL enabled. Not Sender");
+    }
+    catch (Exception e) {
+      assertTrue(e.getCause().getMessage().contains("Server expecting SSL connection"));
+    }
+  }
+  
+  public void testSenderSSLReceiverNoSSL(){
+    addExpectedException("Acceptor received unknown");
+    addExpectedException("failed accepting client");
+      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+          "createFirstLocatorWithDSId", new Object[] { 1 });
+      Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+          "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+      vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+      vm4.invoke(WANTestBase.class, "createCacheWithSSL",
+          new Object[] { lnPort });
+
+      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+          false, 100, 10, false, false, null, true });
+
+      vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", null, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+          testName + "_RR", "ln", isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+          1 });
+
+      Boolean doesSizeMatch = (Boolean)vm2.invoke(WANSSLDUnitTest.class, "ValidateSSLRegionSize", new Object[] {
+          testName + "_RR", 1 });
+      
+      assertFalse(doesSizeMatch);
+  }
+  
+  public static boolean ValidateSSLRegionSize (String regionName, final int regionSize) {
+      final Region r = cache.getRegion(Region.SEPARATOR + regionName);
+      assertNotNull(r);
+      WaitCriterion wc = new WaitCriterion() {
+        public boolean done() {
+          return false;
+        }
+
+        public String description() {
+          return null;
+        }
+      };
+      DistributedTestCase.waitForCriterion(wc, 2000, 500, false);
+      
+      if(r.size() == regionSize){
+        return true;
+      }
+      return false;
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
new file mode 100644
index 0000000..82cfd62
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
@@ -0,0 +1,549 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.wan.misc;
+
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import com.gemstone.gemfire.GemFireConfigException;
+import com.gemstone.gemfire.IncompatibleSystemException;
+import com.gemstone.gemfire.internal.AvailablePortHelper;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+
+import dunit.AsyncInvocation;
+import dunit.Host;
+
+public class WanAutoDiscoveryDUnitTest extends WANTestBase {
+
+  
+  public WanAutoDiscoveryDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+    final Host host = Host.getHost(0);
+
+  }
+  
+  /**
+   * Test to validate that sender can not be started without locator started.
+   * else GemFireConfigException will be thrown.
+   */
+  public void test_GatewaySender_Started_Before_Locator() {
+    try {
+      int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+      vm0.invoke(WANTestBase.class, "createCache", new Object[]{port});      
+      vm0.invoke(WANTestBase.class, "createSender", new Object[]{"ln",2,false,100,10,false,false, null, false});
+      fail("Expected GemFireConfigException but not thrown");
+    }
+    catch (Exception e) {
+      if (!(e.getCause() instanceof GemFireConfigException)) {
+        fail("Expected GemFireConfigException but received :", e);
+      }
+    }
+  }
+  
+  /**
+   * Test to validate that all locators in one DS should have same name. Though
+   * this test passes, it causes other below tests to fail. In this test, VM1 is
+   * throwing IncompatibleSystemException after startInitLocator. I think, after
+   * throwing this exception, locator is not stopped properly and hence other
+   * tests are failing.
+   * 
+   * @throws Exception
+   */
+  public void __test_AllLocatorsinDSShouldHaveDistributedSystemId() throws Exception {
+    try {
+      Integer lnLocPort1 = (Integer)vm0.invoke(
+          WANTestBase.class, "createFirstLocatorWithDSId",
+          new Object[] {1});
+
+      Integer lnLocPort2 = (Integer)vm1.invoke(
+          WANTestBase.class, "createSecondLocator", new Object[] { 2,
+              lnLocPort1 });
+      fail("Expected IncompatibleSystemException but not thrown");
+    }
+    catch (Exception e) {
+      if (!(e.getCause()instanceof IncompatibleSystemException)) {
+        fail("Expected IncompatibleSystemException but received :", e);
+      }
+    }
+  }
+  
+  /**
+   * Test to validate that multiple locators added on LN site and multiple
+   * locators on Ny site recognizes each other
+   * @throws Exception 
+   */
+  public void test_NY_Recognises_ALL_LN_Locators() throws Exception {
+    ArrayList<Integer> locatorPorts = new ArrayList<Integer>();
+    Map<Integer, ArrayList<Integer>> dsVsPort = new HashMap<Integer, ArrayList<Integer>>();
+    dsVsPort.put(1, locatorPorts);
+
+    Integer lnLocPort1 = (Integer)vm0.invoke(
+        WANTestBase.class, "createFirstLocatorWithDSId",
+        new Object[] {1});
+    locatorPorts.add(lnLocPort1);
+
+    Integer lnLocPort2 = (Integer)vm1.invoke(WANTestBase.class,
+        "createSecondLocator", new Object[] { 1, lnLocPort1 });
+    locatorPorts.add(lnLocPort2);
+    
+    locatorPorts = new ArrayList<Integer>();
+    dsVsPort.put(2, locatorPorts);
+    Integer nyLocPort1 = (Integer)vm2.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnLocPort1 });
+    locatorPorts.add(nyLocPort1);
+    
+    Integer nyLocPort2 = (Integer)vm3.invoke(
+        WANTestBase.class, "createSecondRemoteLocator", new Object[] {
+            2, nyLocPort1, lnLocPort1});
+    locatorPorts.add(nyLocPort2);
+    
+    vm0.invoke(WANTestBase.class, "checkAllSiteMetaData",
+        new Object[] { dsVsPort });
+    vm1.invoke(WANTestBase.class, "checkAllSiteMetaData",
+        new Object[] { dsVsPort });
+    vm2.invoke(WANTestBase.class, "checkAllSiteMetaData",
+        new Object[] { dsVsPort });
+    vm3.invoke(WANTestBase.class, "checkAllSiteMetaData",
+        new Object[] { dsVsPort });
+  }
+ 
+  /**
+   * Test to validate that TK site's locator is recognized by LN and NY. Test to
+   * validate that HK site's locator is recognized by LN , NY, TK.
+   */
+  public void test_NY_Recognises_TK_AND_HK_Through_LN_Locator() {
+
+    Map<Integer, ArrayList<Integer>> dsVsPort = new HashMap<Integer, ArrayList<Integer>>();
+
+    ArrayList<Integer> locatorPorts = new ArrayList<Integer>();
+    dsVsPort.put(1, locatorPorts);
+    
+    Integer lnLocPort1 = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    locatorPorts.add(lnLocPort1);
+
+    locatorPorts = new ArrayList<Integer>();
+    dsVsPort.put(2, locatorPorts);
+    Integer nyLocPort1 = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnLocPort1 });
+    locatorPorts.add(nyLocPort1);
+
+    locatorPorts = new ArrayList<Integer>();
+    dsVsPort.put(3, locatorPorts);
+    Integer tkLocPort = (Integer)vm2.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 3, lnLocPort1 });
+    locatorPorts.add(tkLocPort);
+
+    locatorPorts = new ArrayList<Integer>();
+    dsVsPort.put(4, locatorPorts);
+    Integer hkLocPort = (Integer)vm3.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 4, lnLocPort1 });
+    locatorPorts.add(hkLocPort);
+
+    vm0.invoke(WANTestBase.class, "checkAllSiteMetaData",
+        new Object[] { dsVsPort });
+    vm1.invoke(WANTestBase.class, "checkAllSiteMetaData",
+        new Object[] { dsVsPort });
+    vm2.invoke(WANTestBase.class, "checkAllSiteMetaData",
+        new Object[] { dsVsPort });
+    vm3.invoke(WANTestBase.class, "checkAllSiteMetaData",
+        new Object[] { dsVsPort });
+  }
+
+  public void test_TK_Recognises_LN_AND_NY() {
+
+    Map<Integer, ArrayList<Integer>> dsVsPort = new HashMap<Integer, ArrayList<Integer>>();
+
+    ArrayList<Integer> locatorPorts = new ArrayList<Integer>();
+    dsVsPort.put(1, locatorPorts);
+    
+    Integer lnLocPort1 = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    locatorPorts.add(lnLocPort1);
+
+    locatorPorts = new ArrayList<Integer>();
+    dsVsPort.put(2, locatorPorts);
+    Integer nyLocPort1 = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnLocPort1 });
+    locatorPorts.add(nyLocPort1);
+
+    locatorPorts = new ArrayList<Integer>();
+    dsVsPort.put(3, locatorPorts);
+    Integer tkLocPort = (Integer)vm2.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 3, nyLocPort1 });
+    locatorPorts.add(tkLocPort);
+
+
+    vm0.invoke(WANTestBase.class, "checkAllSiteMetaData",
+        new Object[] { dsVsPort });
+    vm1.invoke(WANTestBase.class, "checkAllSiteMetaData",
+        new Object[] { dsVsPort });
+    vm2.invoke(WANTestBase.class, "checkAllSiteMetaData",
+        new Object[] { dsVsPort });
+  }
+  
+  public void test_NY_Recognises_TK_AND_HK_Simeltenously() {
+    Map<Integer, ArrayList<Integer>> dsVsPort = new HashMap<Integer, ArrayList<Integer>>();
+
+    ArrayList<Integer> locatorPortsln = new ArrayList<Integer>();
+    dsVsPort.put(1, locatorPortsln);
+    Integer lnLocPort1 = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    locatorPortsln.add(lnLocPort1);
+
+    ArrayList<Integer> locatorPortsny = new ArrayList<Integer>();
+    dsVsPort.put(2, locatorPortsny);
+    Integer nyLocPort1 = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnLocPort1 });
+    locatorPortsny.add(nyLocPort1);
+
+    int AsyncInvocationArrSize = 4;
+    AsyncInvocation[] async = new AsyncInvocation[AsyncInvocationArrSize];
+
+    ArrayList<Integer> locatorPortstk = new ArrayList<Integer>();
+    dsVsPort.put(3, locatorPortstk);
+    async[0] = vm2.invokeAsync(WANTestBase.class, "createFirstRemoteLocator",
+        new Object[] { 3, lnLocPort1 });
+
+    ArrayList<Integer> locatorPortshk = new ArrayList<Integer>();
+    dsVsPort.put(4, locatorPortshk);
+    async[1] = vm3.invokeAsync(
+        WANTestBase.class, "createFirstRemoteLocator", new Object[] {4, nyLocPort1});
+
+    ArrayList<Integer> locatorPortsln2 = new ArrayList<Integer>();
+    async[2] = vm4.invokeAsync(WANTestBase.class,
+        "createSecondLocator", new Object[] { 1, lnLocPort1 });
+    
+    ArrayList<Integer> locatorPortsny2 = new ArrayList<Integer>();
+    async[3] = vm5.invokeAsync(WANTestBase.class,
+        "createSecondLocator", new Object[] { 2, nyLocPort1 });
+
+    
+    try {
+      async[0].join();
+      async[1].join();
+      async[2].join();
+      async[3].join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+    
+    locatorPortstk.add((Integer)async[0].getReturnValue());
+    locatorPortshk.add((Integer)async[1].getReturnValue());
+    locatorPortsln.add((Integer)async[2].getReturnValue());
+    locatorPortsny.add((Integer)async[3].getReturnValue());
+    
+    vm0.invoke(WANTestBase.class, "checkAllSiteMetaData",
+        new Object[] { dsVsPort });
+    vm1.invoke(WANTestBase.class, "checkAllSiteMetaData",
+        new Object[] { dsVsPort });
+    vm2.invoke(WANTestBase.class, "checkAllSiteMetaData",
+        new Object[] { dsVsPort });
+    vm3.invoke(WANTestBase.class, "checkAllSiteMetaData",
+        new Object[] { dsVsPort });
+  }
+  
+  
+  public void test_LN_Sender_recogises_ALL_NY_Locators() {
+    
+    Integer lnLocPort1 = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    
+    Integer lnLocPort2 = (Integer)vm5.invoke(WANTestBase.class,
+        "createSecondLocator", new Object[] { 1, lnLocPort1 });
+    
+    vm2.invoke(WANTestBase.class, "createCache", new Object[]{lnLocPort1, lnLocPort2});
+    
+    vm2.invoke(WANTestBase.class, "createSender",
+        new Object[] {"ln",2,false,100,10,false,false, null, true});
+    
+    Integer nyLocPort1 = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnLocPort1 });
+    
+    vm2.invoke(WANTestBase.class, "startSender",new Object[]{"ln"});
+
+    //Since to fix Bug#46289, we have moved call to initProxy in getConnection which will be called only when batch is getting dispatched.
+    //So for locator discovery callback to work, its now expected that atleast try to send a batch so that proxy will be initialized
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", isOffHeap() });
+  
+     vm2.invoke(WANTestBase.class, "doPuts",
+      new Object[] { testName + "_RR", 10});
+
+    Integer nyLocPort2 = (Integer)vm3
+        .invoke(WANTestBase.class, "createSecondRemoteLocator", new Object[] {
+            2, nyLocPort1, lnLocPort1 });
+
+    InetSocketAddress locatorToWaitFor = new InetSocketAddress("localhost",
+        nyLocPort2);
+
+    vm2.invoke(WANTestBase.class, "checkLocatorsinSender",
+        new Object[] {"ln", locatorToWaitFor });
+
+    Integer nyLocPort3 = (Integer)vm4
+        .invoke(WANTestBase.class, "createSecondRemoteLocator", new Object[] {
+            2, nyLocPort1, lnLocPort1 });
+    
+    locatorToWaitFor = new InetSocketAddress("localhost", nyLocPort3);
+
+    vm2.invoke(WANTestBase.class, "checkLocatorsinSender",
+        new Object[] {"ln", locatorToWaitFor });
+
+  }
+  
+  
+  public void test_RingTopology() {
+
+    final Set<String> site1LocatorsPort = new HashSet<String>();
+    int site1Port1 = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    site1LocatorsPort.add("localhost["+site1Port1+"]");
+   
+    final Set<String> site2LocatorsPort = new HashSet<String>();
+    int site2Port1 = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    site2LocatorsPort.add("localhost["+site2Port1+"]");
+   
+    final Set<String> site3LocatorsPort = new HashSet<String>();
+    int site3Port1 = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    site3LocatorsPort.add("localhost["+site3Port1+"]");
+   
+    final Set<String> site4LocatorsPort = new HashSet<String>();
+    int site4Port1 = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    site4LocatorsPort.add("localhost["+site4Port1+"]");
+   
+    Map<Integer, Set<String>> dsVsPort = new HashMap<Integer, Set<String>>();
+    dsVsPort.put(1, site1LocatorsPort);
+    dsVsPort.put(2, site2LocatorsPort);
+    dsVsPort.put(3, site3LocatorsPort);
+    dsVsPort.put(4, site4LocatorsPort);
+   
+    int AsyncInvocationArrSize = 9;
+    AsyncInvocation[] async = new AsyncInvocation[AsyncInvocationArrSize];
+   
+    async[0] = vm0.invokeAsync(WANTestBase.class,
+        "createLocator", new Object[] { 1, site1Port1, site1LocatorsPort, site2LocatorsPort});
+   
+    async[1] = vm1.invokeAsync(WANTestBase.class,
+        "createLocator", new Object[] { 2, site2Port1, site2LocatorsPort, site3LocatorsPort});
+   
+    async[2] = vm2.invokeAsync(WANTestBase.class,
+        "createLocator", new Object[] { 3, site3Port1, site3LocatorsPort, site4LocatorsPort});
+   
+    async[3] = vm3.invokeAsync(WANTestBase.class,
+        "createLocator", new Object[] { 4, site4Port1, site4LocatorsPort, site1LocatorsPort});
+   
+   // pause(5000);
+    try {
+      async[0].join();
+      async[1].join();
+      async[2].join();
+      async[3].join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail("Could not join async operations");
+    }
+   
+    vm0.invoke(WANTestBase.class, "checkAllSiteMetaDataFor3Sites",
+        new Object[] { dsVsPort });
+    vm1.invoke(WANTestBase.class, "checkAllSiteMetaDataFor3Sites",
+        new Object[] { dsVsPort });
+    vm2.invoke(WANTestBase.class, "checkAllSiteMetaDataFor3Sites",
+        new Object[] { dsVsPort });
+    vm3.invoke(WANTestBase.class, "checkAllSiteMetaDataFor3Sites",
+        new Object[] { dsVsPort });
+  }
+  
+  public void ___test_3Sites3Locators() {
+    final Set<String> site1LocatorsPort = new HashSet<String>();
+    int site1Port1 = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    site1LocatorsPort.add("localhost["+site1Port1+"]");
+    int site1Port2 = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    site1LocatorsPort.add("localhost["+site1Port2+"]");
+    int site1Port3 = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    site1LocatorsPort.add("localhost["+site1Port3+"]");
+    
+    final Set<String> site2LocatorsPort = new HashSet<String>();
+    int site2Port1 = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    site2LocatorsPort.add("localhost["+site2Port1+"]");
+    int site2Port2 = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    site2LocatorsPort.add("localhost["+site2Port2+"]");
+    int site2Port3 = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    site2LocatorsPort.add("localhost["+site2Port3+"]");
+    
+    final Set<String> site3LocatorsPort = new HashSet<String>();
+    int site3Port1 = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    site3LocatorsPort.add("localhost["+site3Port1+"]");
+    final int site3Port2 = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    site3LocatorsPort.add("localhost["+site3Port2+"]");
+    int site3Port3 = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    site3LocatorsPort.add("localhost["+site3Port3+"]");
+
+    Map<Integer, Set<String>> dsVsPort = new HashMap<Integer, Set<String>>();
+    dsVsPort.put(1, site1LocatorsPort);
+    dsVsPort.put(2, site2LocatorsPort);
+    dsVsPort.put(3, site3LocatorsPort);
+    
+    int AsyncInvocationArrSize = 9;
+    AsyncInvocation[] async = new AsyncInvocation[AsyncInvocationArrSize];
+    
+    async[0] = vm0.invokeAsync(WANTestBase.class,
+        "createLocator", new Object[] { 1, site1Port1, site1LocatorsPort, site2LocatorsPort});
+    
+    async[8] = vm0.invokeAsync(WANTestBase.class,
+        "checkAllSiteMetaDataFor3Sites", new Object[] {dsVsPort});
+    
+    async[1] = vm1.invokeAsync(WANTestBase.class,
+        "createLocator", new Object[] { 1, site1Port2, site1LocatorsPort, site2LocatorsPort});
+    async[2] = vm2.invokeAsync(WANTestBase.class,
+        "createLocator", new Object[] { 1, site1Port3, site1LocatorsPort, site2LocatorsPort});
+    
+    async[3] = vm3.invokeAsync(WANTestBase.class,
+        "createLocator", new Object[] { 2, site2Port1, site2LocatorsPort, site3LocatorsPort});
+    async[4] = vm4.invokeAsync(WANTestBase.class,
+        "createLocator", new Object[] { 2, site2Port2, site2LocatorsPort, site3LocatorsPort});
+    async[5] = vm5.invokeAsync(WANTestBase.class,
+        "createLocator", new Object[] { 2, site2Port3, site2LocatorsPort, site3LocatorsPort});
+    
+    async[6] = vm6.invokeAsync(WANTestBase.class,
+        "createLocator", new Object[] { 3, site3Port1, site3LocatorsPort, site1LocatorsPort});
+    async[7] = vm7.invokeAsync(WANTestBase.class,
+        "createLocator", new Object[] { 3, site3Port2, site3LocatorsPort, site1LocatorsPort});
+    
+    WANTestBase.createLocator(3, site3Port3, site3LocatorsPort, site1LocatorsPort);
+    long startTime = System.currentTimeMillis();
+    
+    try {
+      async[0].join();
+      async[1].join();
+      async[2].join();
+      async[3].join();
+      async[4].join();
+      async[5].join();
+      async[6].join();
+      async[7].join();
+      async[8].join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail("Could not join async operations");
+    }
+    Long endTime = null;
+    try {
+      endTime = (Long)async[8].getResult();
+    }
+    catch (Throwable e) {
+      e.printStackTrace();
+     fail("Could not get end time", e);
+    }
+    
+    getLogWriter().info("Time taken for all 9 locators discovery in 3 sites: " + (endTime.longValue() - startTime));
+    
+    vm0.invoke(WANTestBase.class, "checkAllSiteMetaDataFor3Sites",
+        new Object[] { dsVsPort });
+    vm1.invoke(WANTestBase.class, "checkAllSiteMetaDataFor3Sites",
+        new Object[] { dsVsPort });
+    vm2.invoke(WANTestBase.class, "checkAllSiteMetaDataFor3Sites",
+        new Object[] { dsVsPort });
+    vm3.invoke(WANTestBase.class, "checkAllSiteMetaDataFor3Sites",
+        new Object[] { dsVsPort });
+    vm4.invoke(WANTestBase.class, "checkAllSiteMetaDataFor3Sites",
+        new Object[] { dsVsPort });
+    vm5.invoke(WANTestBase.class, "checkAllSiteMetaDataFor3Sites",
+        new Object[] { dsVsPort });
+    vm6.invoke(WANTestBase.class, "checkAllSiteMetaDataFor3Sites",
+        new Object[] { dsVsPort });
+    vm7.invoke(WANTestBase.class, "checkAllSiteMetaDataFor3Sites",
+        new Object[] { dsVsPort });
+    WANTestBase.checkAllSiteMetaDataFor3Sites(dsVsPort);
+  }
+  
+  
+  public void test_LN_Peer_Locators_Exchange_Information() {
+    ArrayList<Integer> locatorPorts = new ArrayList<Integer>();
+    Map<Integer, ArrayList<Integer>> dsVsPort = new HashMap<Integer, ArrayList<Integer>>();
+    dsVsPort.put(1, locatorPorts);
+
+    Integer lnLocPort1 = (Integer)vm0.invoke(
+        WANTestBase.class, "createFirstPeerLocator",
+        new Object[] {1});
+    locatorPorts.add(lnLocPort1);
+
+    Integer lnLocPort2 = (Integer)vm1.invoke(WANTestBase.class,
+        "createSecondPeerLocator", new Object[] { 1, lnLocPort1 });
+    locatorPorts.add(lnLocPort2);
+    
+    vm0.invoke(WANTestBase.class, "checkAllSiteMetaData",
+        new Object[] { dsVsPort });
+    vm1.invoke(WANTestBase.class, "checkAllSiteMetaData",
+        new Object[] { dsVsPort });
+  }
+  
+  public void test_LN_NY_TK_5_PeerLocators_1_ServerLocator() {
+    Map<Integer, ArrayList<Integer>> dsVsPort = new HashMap<Integer, ArrayList<Integer>>();
+    
+    
+    ArrayList<Integer> locatorPorts = new ArrayList<Integer>();
+    dsVsPort.put(1, locatorPorts);
+    Integer lnLocPort1 = (Integer)vm0.invoke(
+        WANTestBase.class, "createFirstPeerLocator",
+        new Object[] {1});
+    locatorPorts.add(lnLocPort1);
+    Integer lnLocPort2 = (Integer)vm1.invoke(WANTestBase.class,
+        "createSecondPeerLocator", new Object[] { 1, lnLocPort1 });
+    locatorPorts.add(lnLocPort2);
+    
+    locatorPorts = new ArrayList<Integer>();
+    dsVsPort.put(2, locatorPorts);
+    Integer nyLocPort1 = (Integer)vm2.invoke(
+        WANTestBase.class, "createFirstRemotePeerLocator",
+        new Object[] {2, lnLocPort1});
+    locatorPorts.add(nyLocPort1);
+    Integer nyLocPort2 = (Integer)vm3.invoke(WANTestBase.class,
+        "createSecondRemotePeerLocator", new Object[] { 2, nyLocPort1, lnLocPort2});
+    locatorPorts.add(nyLocPort2);
+    
+    locatorPorts = new ArrayList<Integer>();
+    dsVsPort.put(3, locatorPorts);
+    Integer tkLocPort1 = (Integer)vm4.invoke(
+        WANTestBase.class, "createFirstRemotePeerLocator",
+        new Object[] {3, nyLocPort1});
+    locatorPorts.add(tkLocPort1);
+    Integer tkLocPort2 = (Integer)vm5.invoke(WANTestBase.class,
+        "createSecondRemotePeerLocator", new Object[] { 3, tkLocPort1, nyLocPort1});
+    locatorPorts.add(tkLocPort2);
+    Integer tkLocPort3 = (Integer)vm6.invoke(WANTestBase.class,
+        "createSecondRemoteLocator", new Object[] { 3, tkLocPort1, nyLocPort2});
+    locatorPorts.add(tkLocPort3);
+    
+   // pause(5000);
+    
+    vm0.invoke(WANTestBase.class, "checkAllSiteMetaData",
+        new Object[] { dsVsPort });
+    vm1.invoke(WANTestBase.class, "checkAllSiteMetaData",
+        new Object[] { dsVsPort });
+    vm2.invoke(WANTestBase.class, "checkAllSiteMetaData",
+        new Object[] { dsVsPort });
+    vm3.invoke(WANTestBase.class, "checkAllSiteMetaData",
+        new Object[] { dsVsPort });
+    vm4.invoke(WANTestBase.class, "checkAllSiteMetaData",
+        new Object[] { dsVsPort });
+    vm5.invoke(WANTestBase.class, "checkAllSiteMetaData",
+        new Object[] { dsVsPort });
+    vm6.invoke(WANTestBase.class, "checkAllSiteMetaData",
+        new Object[] { dsVsPort });
+        
+  }
+  
+}


[48/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceVsdStats.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceVsdStats.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceVsdStats.java
new file mode 100644
index 0000000..3e932cf
--- /dev/null
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceVsdStats.java
@@ -0,0 +1,402 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.query.internal.cq;
+
+import org.apache.logging.log4j.Logger;
+
+import com.gemstone.gemfire.StatisticDescriptor;
+import com.gemstone.gemfire.Statistics;
+import com.gemstone.gemfire.StatisticsFactory;
+import com.gemstone.gemfire.StatisticsType;
+import com.gemstone.gemfire.StatisticsTypeFactory;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.query.CqException;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.internal.DefaultQueryService;
+import com.gemstone.gemfire.internal.NanoTimer;
+import com.gemstone.gemfire.internal.StatisticsTypeFactoryImpl;
+import com.gemstone.gemfire.internal.cache.FilterProfile;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.cache.LocalRegion;
+import com.gemstone.gemfire.internal.logging.LogService;
+
+/**
+ * This class tracks GemFire statistics related to CqService.
+ * Specifically the following statistics are tracked:
+ *      Number of CQs created
+ *      Number of active CQs
+ *      Number of CQs suspended or stopped
+ *      Number of CQs closed
+ *      Number of CQs on a client 
+ * 
+ * @author Rao Madduri
+ * @since 5.5 
+ */
+public class CqServiceVsdStats
+{
+  private static final Logger logger = LogService.getLogger();
+  
+  /** The <code>StatisticsType</code> of the statistics */
+  private static final StatisticsType _type;
+
+  /** Name of the created CQs statistic */
+  protected static final String CQS_CREATED = "numCqsCreated";
+
+  /** Name of the active CQs statistic */
+  protected static final String CQS_ACTIVE = "numCqsActive";
+
+  /** Name of the stopped CQs statistic */
+  protected static final String CQS_STOPPED = "numCqsStopped";
+
+  /** Name of the closed CQs statistic */
+  protected static final String CQS_CLOSED = "numCqsClosed";
+
+  /** Name of the client's CQs statistic */
+  protected static final String CQS_ON_CLIENT = "numCqsOnClient";
+  
+  /** Number of clients with CQs statistic */
+  protected static final String CLIENTS_WITH_CQS = "numClientsWithCqs";
+
+  
+  /** CQ query execution time. */
+  protected static final String CQ_QUERY_EXECUTION_TIME = "cqQueryExecutionTime";
+
+  /** CQ query execution in progress */
+  protected static final String CQ_QUERY_EXECUTION_IN_PROGRESS = "cqQueryExecutionInProgress";
+
+  /** Completed CQ query executions */
+  protected static final String CQ_QUERY_EXECUTIONS_COMPLETED = "cqQueryExecutionsCompleted";
+
+  /** Unique CQs, number of different CQ queries */
+  protected static final String UNIQUE_CQ_QUERY = "numUniqueCqQuery";
+  
+  /** Id of the CQs created statistic */
+  private static final int _numCqsCreatedId;
+
+  /** Id of the active CQs statistic */
+  private static final int _numCqsActiveId;
+
+  /** Id of the stopped CQs statistic */
+  private static final int _numCqsStoppedId;
+
+  /** Id of the closed CQs statistic */
+  private static final int _numCqsClosedId;
+
+  /** Id of the CQs on client statistic */
+  private static final int _numCqsOnClientId;
+  
+  /** Id of the Clients with Cqs statistic */
+  private static final int _numClientsWithCqsId;
+
+  /** Id for the CQ query execution time. */
+  private static final int _cqQueryExecutionTimeId;
+
+  /** Id for the CQ query execution in progress */
+  private static final int _cqQueryExecutionInProgressId;
+
+  /** Id for completed CQ query executions */
+  private static final int _cqQueryExecutionsCompletedId;
+
+  /** Id for unique CQs, difference in CQ queries */
+  private static final int _numUniqueCqQuery;
+
+  /**
+   * Static initializer to create and initialize the <code>StatisticsType</code>
+   */
+  static {
+    String statName = "CqServiceStats";
+    StatisticsTypeFactory f = StatisticsTypeFactoryImpl.singleton();
+
+    _type = f.createType(statName, statName, new StatisticDescriptor[] {
+        f.createLongCounter(CQS_CREATED, "Number of CQs created.", "operations"),
+        f.createLongCounter(CQS_ACTIVE, "Number of CQS actively executing.", "operations"),
+        f.createLongCounter(CQS_STOPPED, "Number of CQs stopped.", "operations"),
+        f.createLongCounter(CQS_CLOSED, "Number of CQs closed.", "operations"),
+        f.createLongCounter(CQS_ON_CLIENT, "Number of CQs on the client.", "operations"),
+        f.createLongCounter(CLIENTS_WITH_CQS, "Number of Clients with CQs.", "operations"),
+        f.createLongCounter(CQ_QUERY_EXECUTION_TIME, "Time taken for CQ Query Execution.", "nanoseconds"),
+        f.createLongCounter(CQ_QUERY_EXECUTIONS_COMPLETED, "Number of CQ Query Executions.", "operations"),
+        f.createIntGauge(CQ_QUERY_EXECUTION_IN_PROGRESS, "CQ Query Execution In Progress.", "operations"),
+        f.createIntGauge(UNIQUE_CQ_QUERY, "Number of Unique CQ Querys.", "Queries"),
+
+    });
+
+    // Initialize id fields
+    _numCqsCreatedId = _type.nameToId(CQS_CREATED);
+    _numCqsActiveId = _type.nameToId(CQS_ACTIVE);
+    _numCqsStoppedId = _type.nameToId(CQS_STOPPED);
+    _numCqsClosedId = _type.nameToId(CQS_CLOSED);
+    _numCqsOnClientId = _type.nameToId(CQS_ON_CLIENT);
+    _numClientsWithCqsId = _type.nameToId(CLIENTS_WITH_CQS);
+    _cqQueryExecutionTimeId = _type.nameToId(CQ_QUERY_EXECUTION_TIME);    
+    _cqQueryExecutionsCompletedId = _type.nameToId(CQ_QUERY_EXECUTIONS_COMPLETED);
+    _cqQueryExecutionInProgressId = _type.nameToId(CQ_QUERY_EXECUTION_IN_PROGRESS);
+    _numUniqueCqQuery = _type.nameToId(UNIQUE_CQ_QUERY);
+    
+  }
+
+  /** The <code>Statistics</code> instance to which most behavior is delegated */
+  private final Statistics _stats;
+
+  /**
+   * Constructor.
+   * 
+   * @param factory
+   *          The <code>StatisticsFactory</code> which creates the
+   *          <code>Statistics</code> instance
+   */
+  public CqServiceVsdStats(StatisticsFactory factory) {
+    this._stats = factory.createAtomicStatistics(_type, "CqServiceStats");
+  }
+
+  // /////////////////// Instance Methods /////////////////////
+
+  /**
+   * Closes the <code>HARegionQueueStats</code>.
+   */
+  public void close()
+  {
+    this._stats.close();
+  }
+
+  /**
+   * Returns the current value of the "numCqsCreated" stat.
+   * 
+   * @return the current value of the "numCqsCreated" stat
+   */
+  public long getNumCqsCreated()
+  {
+    return this._stats.getLong(_numCqsCreatedId);
+  }
+
+  /**
+   * Increments the "numCqsCreated" stat by 1.
+   */
+  public void incCqsCreated()
+  {
+    this._stats.incLong(_numCqsCreatedId, 1);
+  }
+
+  /**
+   * Returns the current value of the "numCqsActive" stat.
+   * 
+   * @return the current value of the "numCqsActive" stat
+   */
+  public long getNumCqsActive()
+  {
+    return this._stats.getLong(_numCqsActiveId);
+  }
+
+  /**
+   * Increments the "numCqsActive" stat by 1.
+   */
+  public void incCqsActive()
+  {
+    this._stats.incLong(_numCqsActiveId, 1);
+  }
+  
+  /**
+   * Decrements the "numCqsActive" stat by 1.
+   */
+  public void decCqsActive()
+  {
+    this._stats.incLong(_numCqsActiveId, -1);
+  }
+  
+  /**
+   * Returns the current value of the "numCqsStopped" stat.
+   * 
+   * @return the current value of the "numCqsStopped" stat
+   */
+  public long getNumCqsStopped()
+  {
+    return this._stats.getLong(_numCqsStoppedId);
+  }
+
+  /**
+   * Increments the "numCqsStopped" stat by 1.
+   */
+  public void incCqsStopped()
+  {
+    this._stats.incLong(_numCqsStoppedId, 1);
+  }
+
+  /**
+   * Decrements the "numCqsStopped" stat by 1.
+   */
+  public void decCqsStopped()
+  {
+    this._stats.incLong(_numCqsStoppedId, -1);
+  }
+
+  /**
+   * Returns the current value of the "numCqsClosed" stat.
+   * 
+   * @return the current value of the "numCqsClosed" stat
+   */
+  public long getNumCqsClosed()
+  {
+    return this._stats.getLong(_numCqsClosedId);
+  }
+
+  /**
+   * Increments the "numCqsClosed" stat by 1.
+   */
+  public void incCqsClosed()
+  {
+    this._stats.incLong(_numCqsClosedId, 1);
+  }
+
+  /**
+   * Returns the current value of the "numCqsOnClient" stat.
+   * 
+   * @return the current value of the "numCqsOnClient" stat
+   */
+  public long getNumCqsOnClient()
+  {
+    return this._stats.getLong(_numCqsOnClientId);
+  }
+
+  /**
+   * Increments the "numCqsOnClient" stat by 1.
+   */
+  public void incCqsOnClient()
+  {
+    this._stats.incLong(_numCqsOnClientId, 1);
+  }
+  
+  /**
+   * Decrements the "numCqsOnClient" stat by 1.
+   */
+  public void decCqsOnClient()
+  {
+    this._stats.incLong(_numCqsOnClientId, -1);
+  }
+  
+  /**
+   * Returns the current value of the "numClientsWithCqs" stat.
+   * 
+   * @return the current value of the "numClientsWithCqs" stat
+   */
+  public long getNumClientsWithCqs()
+  {
+    return this._stats.getLong(_numClientsWithCqsId);
+  }
+
+  /**
+   * Increments the "numClientsWithCqs" stat by 1.
+   */
+  public void incClientsWithCqs()
+  {
+    this._stats.incLong(_numClientsWithCqsId, 1);
+  }
+  
+  /**
+   * Decrements the "numCqsOnClient" stat by 1.
+   */
+  public void decClientsWithCqs()
+  {
+    this._stats.incLong(_numClientsWithCqsId, -1);
+  }
+  
+  /**
+   * Start the CQ Query Execution time.
+   */
+  public long startCqQueryExecution() {
+    this._stats.incInt(_cqQueryExecutionInProgressId, 1);
+    return NanoTimer.getTime(); 
+  }
+
+  /**
+   * End CQ Query Execution Time.
+   * @param start long time value.
+   */
+  public void endCqQueryExecution(long start) {
+    long ts = NanoTimer.getTime(); 
+    this._stats.incLong(_cqQueryExecutionTimeId, ts-start);
+    this._stats.incInt(_cqQueryExecutionInProgressId, -1);
+    this._stats.incLong(_cqQueryExecutionsCompletedId, 1);
+  }
+  
+  /**
+   * Returns the total time spent executing the CQ Queries.
+   * @return long time spent.
+   */
+  public long getCqQueryExecutionTime(){
+    return this._stats.getLong(_cqQueryExecutionTimeId);
+  }
+
+  /**
+   * Increments number of Unique queries.
+   */
+  public void incUniqueCqQuery()
+  {
+    this._stats.incInt(_numUniqueCqQuery, 1);
+  }
+
+  /**
+   * Decrements number of unique Queries.
+   */
+  public void decUniqueCqQuery()
+  {
+    this._stats.incInt(_numUniqueCqQuery, -1);
+  }
+  
+  
+  /**
+   * This is a test method.  It silently ignores exceptions and should not be
+   * used outside of unit tests.<p>
+   * Returns the number of CQs (active + suspended) on the given region.
+   * @param regionName
+   */
+  public long numCqsOnRegion(String regionName){
+    GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+    if (cache == null) {
+      return 0;
+    }
+    DefaultQueryService queryService = (DefaultQueryService)cache.getQueryService();
+    CqService cqService = null;
+    try {
+      cqService = queryService.getCqService();
+    }
+    catch (CqException e) {
+      if (logger.isDebugEnabled()) {
+        logger.debug("Failed to get CqService {}", e.getLocalizedMessage());
+      }
+      e.printStackTrace();
+      return -1; // We're confused
+    }
+    if (((CqServiceImpl) cqService).isServer()) {
+      //If we are on the server, look at the number of CQs in the filter profile.
+      try {
+        FilterProfile fp = cache.getFilterProfile(regionName);
+        if (fp == null) {
+          return 0;
+        }
+        return fp.getCqCount();
+      }
+      catch (Exception ex) {
+        if (logger.isDebugEnabled()) {
+          logger.debug("Failed to get serverside CQ count for region: {} {}", regionName, ex.getLocalizedMessage());
+        }
+      }
+    }
+    else {
+      try {
+        CqQuery[] cqs = queryService.getCqs(regionName);
+        
+        if (cqs != null) {
+          return cqs.length;
+        }
+      } catch(Exception ex) {
+        // Dont do anything.
+      }
+    }
+    return 0;
+  } 
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqStatisticsImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqStatisticsImpl.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqStatisticsImpl.java
new file mode 100644
index 0000000..492a563
--- /dev/null
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqStatisticsImpl.java
@@ -0,0 +1,67 @@
+/*=========================================================================
+ * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ *========================================================================
+ */
+
+package com.gemstone.gemfire.cache.query.internal.cq;
+
+import com.gemstone.gemfire.cache.query.CqStatistics;
+
+/**
+ * Provides statistical information about a CqQuery.
+ * 
+ * @since 5.5
+ * @author Rao Madduri
+ */
+public class CqStatisticsImpl implements CqStatistics {
+  private CqQueryImpl cqQuery;
+  
+//  private long numInserts;
+//  private long numDeletes;
+//  private long numUpdates;
+//  private long numEvents;
+  
+  /**
+   * Constructor for CqStatisticsImpl
+   * @param cq - CqQuery reference to the CqQueryImpl object
+   */
+  public CqStatisticsImpl(CqQueryImpl cq) {
+    cqQuery = cq;
+  }
+  
+  /**
+   * Returns the number of Insert events for this CQ.
+   * @return the number of insert events
+   */
+  public long numInserts() {
+    return this.cqQuery.getVsdStats().getNumInserts();
+  }
+  
+  /**
+   * Returns number of Delete events for this CQ.
+   * @return the number of delete events
+   */
+  public long numDeletes() {
+    return this.cqQuery.getVsdStats().getNumDeletes();
+  }
+  
+  /**
+   * Returns number of Update events for this CQ.
+   * @return the number of update events
+   */
+  public long numUpdates(){
+    return this.cqQuery.getVsdStats().getNumUpdates();
+  }
+  
+  /**
+   * Returns the total number of events for this CQ.
+   * @return the total number of insert, update, and delete events
+   */
+  public long numEvents(){
+    return cqQuery.getVsdStats().getNumEvents();
+  }
+  
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/ServerCQImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/ServerCQImpl.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/ServerCQImpl.java
new file mode 100644
index 0000000..385c0a5
--- /dev/null
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/ServerCQImpl.java
@@ -0,0 +1,639 @@
+package com.gemstone.gemfire.cache.query.internal.cq;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+import org.apache.logging.log4j.Logger;
+
+import com.gemstone.gemfire.CancelException;
+import com.gemstone.gemfire.DataSerializable;
+import com.gemstone.gemfire.DataSerializer;
+import com.gemstone.gemfire.SystemFailure;
+import com.gemstone.gemfire.cache.CacheClosedException;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.EvictionAction;
+import com.gemstone.gemfire.cache.client.internal.UserAttributes;
+import com.gemstone.gemfire.cache.query.CqAttributes;
+import com.gemstone.gemfire.cache.query.CqAttributesMutator;
+import com.gemstone.gemfire.cache.query.CqClosedException;
+import com.gemstone.gemfire.cache.query.CqException;
+import com.gemstone.gemfire.cache.query.CqExistsException;
+import com.gemstone.gemfire.cache.query.CqListener;
+import com.gemstone.gemfire.cache.query.CqResults;
+import com.gemstone.gemfire.cache.query.Query;
+import com.gemstone.gemfire.cache.query.QueryException;
+import com.gemstone.gemfire.cache.query.RegionNotFoundException;
+import com.gemstone.gemfire.cache.query.internal.CompiledBindArgument;
+import com.gemstone.gemfire.cache.query.internal.CompiledIteratorDef;
+import com.gemstone.gemfire.cache.query.internal.CompiledRegion;
+import com.gemstone.gemfire.cache.query.internal.CompiledSelect;
+import com.gemstone.gemfire.cache.query.internal.CqStateImpl;
+import com.gemstone.gemfire.cache.query.internal.DefaultQuery;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.cache.LocalRegion;
+import com.gemstone.gemfire.internal.cache.Token;
+import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier;
+import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy;
+import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.internal.logging.LogService;
+import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
+import com.gemstone.gemfire.i18n.StringId;
+
+public class ServerCQImpl extends CqQueryImpl implements DataSerializable, ServerCQ {
+  private static final Logger logger = LogService.getLogger();
+
+  /** 
+   * This holds the keys that are part of the CQ query results.
+   * Using this CQ engine can determine whether to execute 
+   * query on old value from EntryEvent, which is an expensive
+   * operation. 
+   */
+  private volatile HashMap<Object, Object> cqResultKeys;
+
+  /** 
+   * This maintains the keys that are destroyed while the Results
+   * Cache is getting constructed. This avoids any keys that are
+   * destroyed (after query execution) but is still part of the 
+   * CQs result.
+   */
+  private HashSet<Object> destroysWhileCqResultsInProgress;
+  
+  /**
+   * To indicate if the CQ results key cache is initialized.
+   */
+  public volatile boolean cqResultKeysInitialized = false;
+  
+  /** Boolean flag to see if the CQ is on Partitioned Region */
+  public volatile boolean isPR = false;
+  
+  private ClientProxyMembershipID clientProxyId = null;
+  
+  private CacheClientNotifier ccn = null;
+  
+  private String serverCqName;
+  
+  
+  /** identifier assigned to this query for FilterRoutingInfos */
+  private Long filterID;
+  
+  public ServerCQImpl(CqServiceImpl cqService, String cqName, String queryString, boolean isDurable, String serverCqName)  {
+    super(cqService, cqName, queryString, isDurable);
+    this.serverCqName = serverCqName; // On Client Side serverCqName and cqName will be same.
+  }
+  
+  public ServerCQImpl() {
+    //For deserialization
+  }
+
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqQuery2#getFilterID()
+   */
+  @Override
+  public Long getFilterID() {
+    return this.filterID;
+  }
+
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqQuery2#setFilterID(java.lang.Long)
+   */
+  @Override
+  public void setFilterID(Long filterID) {
+    this.filterID = filterID;
+  }
+  
+  @Override
+  public void setName(String cqName) {
+    this.cqName = this.serverCqName = cqName;
+  }
+  
+  @Override
+  public String getServerCqName() {
+    return this.serverCqName;
+  }
+  
+  @Override
+  public void registerCq(ClientProxyMembershipID p_clientProxyId, 
+      CacheClientNotifier p_ccn, int p_cqState) 
+      throws CqException, RegionNotFoundException {      
+    
+    CacheClientProxy clientProxy = null;    
+    this.clientProxyId = p_clientProxyId; 
+    //servConnection = serverSideConnection;
+
+    if (p_ccn != null) {
+      this.ccn = p_ccn;
+      clientProxy = p_ccn.getClientProxy(p_clientProxyId, true);
+    }
+    
+    /*
+    try {
+      initCq();
+    } catch (CqExistsException cqe) {
+      // Should not happen.
+      throw new CqException(LocalizedStrings.CqQueryImpl_UNABLE_TO_CREATE_CQ_0_ERROR__1.toLocalizedString(new Object[] { cqName, cqe.getMessage()}));
+    }
+    */
+    
+    validateCq();
+    
+    final boolean isDebugEnabled = logger.isDebugEnabled();
+    StringId msg = LocalizedStrings.ONE_ARG;
+    Throwable t = null;
+    try {
+      this.query = constructServerSideQuery();
+      if (isDebugEnabled) {
+        logger.debug("Server side query for the cq: {} is: {}", cqName, this.query.getQueryString());
+      }
+    } catch (Exception ex) {
+      t = ex;
+      if (ex instanceof ClassNotFoundException) {
+        msg = LocalizedStrings.CqQueryImpl_CLASS_NOT_FOUND_EXCEPTION_THE_ANTLRJAR_OR_THE_SPCIFIED_CLASS_MAY_BE_MISSING_FROM_SERVER_SIDE_CLASSPATH_ERROR_0;
+      } else {
+        msg = LocalizedStrings.CqQueryImpl_ERROR_WHILE_PARSING_THE_QUERY_ERROR_0;
+      }
+    } finally {
+      if (t != null) {
+        String s = msg.toLocalizedString(t);
+        if (isDebugEnabled) {
+          logger.debug(s, t);
+        }
+        throw new CqException(s);
+      }
+    }
+    
+    // Update Regions Book keeping.
+    // TODO replace getRegion() with getRegionByPathForProcessing() so this doesn't block
+    // if the region is still being initialized
+    this.cqBaseRegion = (LocalRegion)cqService.getCache().getRegion(regionName); 
+    if (this.cqBaseRegion == null) {
+      throw new RegionNotFoundException(LocalizedStrings.CqQueryImpl_REGION__0_SPECIFIED_WITH_CQ_NOT_FOUND_CQNAME_1
+          .toLocalizedString(new Object[] {regionName, this.cqName}));
+    }
+    
+    // Make sure that the region is partitioned or 
+    // replicated with distributed ack or global.
+    DataPolicy dp = this.cqBaseRegion.getDataPolicy();
+    this.isPR = dp.withPartitioning();
+    if (!(this.isPR || dp.withReplication())) {
+      String errMsg = null;
+      //replicated regions with eviction set to local destroy get turned into preloaded
+      if (dp.withPreloaded() && cqBaseRegion.getAttributes().getEvictionAttributes() != null && cqBaseRegion.getAttributes().getEvictionAttributes().getAction().equals(EvictionAction.LOCAL_DESTROY)) {
+        errMsg = LocalizedStrings.CqQueryImpl_CQ_NOT_SUPPORTED_FOR_REPLICATE_WITH_LOCAL_DESTROY.toString(this.regionName, cqBaseRegion.getAttributes().getEvictionAttributes().getAction());
+      }
+      else {
+        errMsg = "The region " + this.regionName + 
+            "  specified in CQ creation is neither replicated nor partitioned; " +
+        "only replicated or partitioned regions are allowed in CQ creation.";
+      }
+      if (isDebugEnabled){
+        logger.debug(errMsg);
+      }
+      throw new CqException(errMsg);
+    }
+    if ((dp.withReplication() && 
+        (!(cqBaseRegion.getAttributes().getScope().isDistributedAck() || 
+        cqBaseRegion.getAttributes().getScope().isGlobal())))) {
+      String errMsg = "The replicated region " + this.regionName + 
+          " specified in CQ creation does not have scope supported by CQ." +
+          " The CQ supported scopes are DISTRIBUTED_ACK and GLOBAL.";
+      if (isDebugEnabled){
+        logger.debug(errMsg);
+      }
+      throw new CqException(errMsg);
+    }
+    
+    //checkAndSetCqOnRegion();
+    
+    //Can be null by the time we are here
+    if (clientProxy != null) {
+      clientProxy.incCqCount();
+      if (clientProxy.hasOneCq()) {
+        cqService.stats.incClientsWithCqs();
+      }
+      if (isDebugEnabled) {
+        logger.debug("Added CQ to the base region: {} With key as: {}", cqBaseRegion.getFullPath(), serverCqName);
+      }
+    }
+    
+    // this.cqService.addToCqEventKeysMap(this);
+    this.updateCqCreateStats();
+    
+    // Initialize the state of CQ.
+    if(this.cqState.getState() != p_cqState) {
+      setCqState(p_cqState);
+    }
+    
+    //Register is called from both filter profile and cqService
+    //In either case, if we are trying to start/run the cq, we need to add
+    //it to other matching cqs for performance reasons
+    if (p_cqState == CqStateImpl.RUNNING) {
+         // Add to the matchedCqMap.
+        cqService.addToMatchingCqMap(this);    
+    }
+
+    // Initialize CQ results (key) cache.
+    if(CqServiceProvider.MAINTAIN_KEYS) {
+      this.cqResultKeys = new HashMap <Object, Object>();
+      // Currently the CQ Result keys are not cached for the Partitioned 
+      // Regions. Supporting this with PR needs more work like forcing 
+      // query execution on primary buckets only; and handling the bucket
+      // re-balancing. Once this is added remove the check with PR region.
+      // Only the events which are seen during event processing is 
+      // added to the results cache (not from the CQ Results).
+      if (this.isPR){
+        this.setCqResultsCacheInitialized();
+      } else {
+        this.destroysWhileCqResultsInProgress = new HashSet <Object>();
+      }
+    } 
+
+    if (p_ccn != null) {
+      try {
+        cqService.addToCqMap(this);
+      } catch (CqExistsException cqe) {
+        // Should not happen.
+        throw new CqException(LocalizedStrings.CqQueryImpl_UNABLE_TO_CREATE_CQ_0_ERROR__1.toLocalizedString(new Object[] { cqName, cqe.getMessage()}));
+      }
+      this.cqBaseRegion.getFilterProfile().registerCq(this);
+    }
+  }
+  
+  /**
+   * For Test use only.
+   * @return CQ Results Cache.
+   */
+  public Set<Object> getCqResultKeyCache() {
+    if (this.cqResultKeys != null){
+      synchronized (this.cqResultKeys) {
+        return Collections.synchronizedSet(new HashSet<Object>(this.cqResultKeys.keySet()));
+      }
+    } else {
+      return null;
+    }
+  }
+  
+  /**
+   * Returns parameterized query used by the server.
+   * This method replaces Region name with $1 and if type is not specified
+   * in the query, looks for type from cqattributes and appends into the
+   * query.
+   * @return String modified query.
+   * @throws CqException
+   */
+  private Query constructServerSideQuery() throws QueryException {
+    GemFireCacheImpl cache = (GemFireCacheImpl)cqService.getCache();
+    DefaultQuery locQuery = (DefaultQuery)cache.getLocalQueryService().newQuery(this.queryString);      
+    CompiledSelect select = locQuery.getSimpleSelect();
+    CompiledIteratorDef from = (CompiledIteratorDef)select.getIterators().get(0);
+    // WARNING: ASSUMES QUERY WAS ALREADY VALIDATED FOR PROPER "FORM" ON CLIENT;
+    // THIS VALIDATION WILL NEED TO BE DONE ON THE SERVER FOR NATIVE CLIENTS,
+    // BUT IS NOT DONE HERE FOR JAVA CLIENTS.
+    // The query was already checked on the client that the sole iterator is a
+    // CompiledRegion
+    this.regionName = ((CompiledRegion)from.getCollectionExpr()).getRegionPath();
+    from.setCollectionExpr(new CompiledBindArgument(1));
+    return locQuery;    
+  }
+  
+  /**
+   * Returns if the passed key is part of the CQs result set.
+   * This method needs to be called once the CQ result key caching
+   * is completed (cqResultsCacheInitialized is true).
+   * @param key
+   * @return true if key is in the Results Cache.
+   */
+  public boolean isPartOfCqResult(Object key) {
+    // Handle events that may have been deleted,
+    // but added by result caching.
+    if (this.cqResultKeys == null) {
+      logger.warn(LocalizedMessage.create(LocalizedStrings.CqQueryImpl_Null_CQ_Result_Key_Cache_0));
+      return false;
+    }
+
+    synchronized (this.cqResultKeys) {
+      if (this.destroysWhileCqResultsInProgress != null) {
+        //this.logger.fine("Removing keys from Destroy Cache  For CQ :" + 
+        //this.cqName + " Keys :" + this.destroysWhileCqResultsInProgress);
+        for (Object k : this.destroysWhileCqResultsInProgress){
+          this.cqResultKeys.remove(k);  
+        }
+        this.destroysWhileCqResultsInProgress = null;
+      }
+      return this.cqResultKeys.containsKey(key);
+    }
+  }
+    
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqQuery2#addToCqResultKeys(java.lang.Object)
+   */
+  @Override
+  public void addToCqResultKeys(Object key) {
+    if (!CqServiceProvider.MAINTAIN_KEYS){
+      return;
+    }
+    
+    //this.logger.fine("Adding key to Results Cache For CQ :" + 
+    //this.cqName + " key :" + key);
+    if (this.cqResultKeys != null) {
+      synchronized (this.cqResultKeys) { 
+        this.cqResultKeys.put(key, TOKEN);
+        if (!this.cqResultKeysInitialized){
+          // This key could be coming after add, destroy.
+          // Remove this from destroy queue.
+          //this.logger.fine("Removing key from Destroy Cache For CQ :" + 
+          //this.cqName + " key :" + key);
+          if (this.destroysWhileCqResultsInProgress != null){
+            this.destroysWhileCqResultsInProgress.remove(key);
+          }
+        }
+      }
+    }
+  }
+
+  
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqQuery2#removeFromCqResultKeys(java.lang.Object, boolean)
+   */
+  @Override
+  public void removeFromCqResultKeys(Object key, boolean isTokenMode) {
+    if (!CqServiceProvider.MAINTAIN_KEYS){
+      return;
+    }
+    //this.logger.fine("Removing key from Results Cache For CQ :" + 
+    //this.cqName + " key :" + key);
+    if (this.cqResultKeys != null) {
+      synchronized (this.cqResultKeys) { 
+        if (isTokenMode && this.cqResultKeys.get(key) != Token.DESTROYED){
+          return;
+        }
+        this.cqResultKeys.remove(key);
+        if (!this.cqResultKeysInitialized){
+          //this.logger.fine("Adding key to Destroy Cache For CQ :" + 
+          //this.cqName + " key :" + key);
+          if (this.destroysWhileCqResultsInProgress != null){
+            this.destroysWhileCqResultsInProgress.add(key);
+          }
+        }
+      }
+    }
+  }
+  
+  /**
+   * Marks the key as destroyed in the CQ Results key cache.
+   * @param key
+   */
+  public void markAsDestroyedInCqResultKeys(Object key){
+    if (!CqServiceProvider.MAINTAIN_KEYS){
+      return;
+    }
+    //this.logger.fine("Marking key in Results Cache For CQ :" + 
+    //    this.cqName + " key :" + key);
+
+    if (this.cqResultKeys != null) {
+      synchronized (this.cqResultKeys) { 
+        this.cqResultKeys.put(key, Token.DESTROYED);
+        if (!this.cqResultKeysInitialized){
+          //this.logger.fine("Adding key to Destroy Cache For CQ :" + 
+          //this.cqName + " key :" + key);
+          if (this.destroysWhileCqResultsInProgress != null){
+            this.destroysWhileCqResultsInProgress.add(key);
+          }
+        }
+      }
+    }    
+  }
+  
+  
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqQuery2#setCqResultsCacheInitialized()
+   */
+  @Override
+  public void setCqResultsCacheInitialized() {
+    if (CqServiceProvider.MAINTAIN_KEYS) {
+      this.cqResultKeysInitialized = true;
+    }
+  }
+   
+  /**
+   * Returns the size of the CQ Result key cache.
+   * @return size of CQ Result key cache.
+   */
+  public int getCqResultKeysSize() {
+    if (this.cqResultKeys == null) {
+      return 0;
+    }
+    synchronized (this.cqResultKeys) { 
+      return this.cqResultKeys.size();
+    }
+  }
+  
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqQuery2#isOldValueRequiredForQueryProcessing(java.lang.Object)
+   */
+  @Override
+  public boolean isOldValueRequiredForQueryProcessing(Object key){
+    if (this.cqResultKeysInitialized && this.isPartOfCqResult(key)) {
+      return false;
+    }
+    return true;
+  }
+  
+  /**
+   * Closes the Query.
+   *        On Client side, sends the cq close request to server.
+   *        On Server side, takes care of repository cleanup.
+   * @throws CqException
+   */
+  public void close() throws CqClosedException, CqException {
+    close(true);
+  }
+  
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqQuery2#close(boolean)
+   */
+  @Override
+  public void close(boolean sendRequestToServer) throws CqClosedException, CqException {
+    final boolean isDebugEnabled = logger.isDebugEnabled();
+    if (isDebugEnabled) {
+      logger.debug("Started closing CQ CqName: {} SendRequestToServer: {}", cqName, sendRequestToServer);
+    }   
+    // Synchronize with stop and execute CQ commands
+    synchronized(this.cqState) {
+      // Check if the cq is already closed.
+      if (this.isClosed()) {
+        //throw new CqClosedException("CQ is already closed, CqName : " + this.cqName);
+        if (isDebugEnabled){
+          logger.debug("CQ is already closed, CqName: {}", this.cqName);
+        }
+        return;
+      }
+
+      int stateBeforeClosing = this.cqState.getState();
+      this.cqState.setState(CqStateImpl.CLOSING);      
+      boolean isClosed = false;
+
+      // Cleanup the resource used by cq.
+      this.removeFromCqMap(); 
+
+      // Stat update.
+      if (stateBeforeClosing == CqStateImpl.RUNNING) {
+        cqService.stats.decCqsActive();
+      } else if (stateBeforeClosing == CqStateImpl.STOPPED) {
+        cqService.stats.decCqsStopped();
+      }
+
+      // Clean-up the CQ Results Cache.
+      if (this.cqResultKeys != null) {
+        synchronized (this.cqResultKeys){
+          this.cqResultKeys.clear();
+        }
+      }
+
+      // Set the state to close, and update stats
+      this.cqState.setState(CqStateImpl.CLOSED);
+      cqService.stats.incCqsClosed();
+      cqService.stats.decCqsOnClient();
+      if(this.stats != null)
+        this.stats.close();
+    }
+
+    if (isDebugEnabled) {
+      logger.debug("Successfully closed the CQ. {}", cqName);
+    }
+  }
+  
+  @Override
+  public ClientProxyMembershipID getClientProxyId() {
+    return this.clientProxyId;
+  }
+  
+  /**
+   * Get CacheClientNotifier of this CqQuery.
+   * @return CacheClientNotifier 
+   */
+  public CacheClientNotifier getCacheClientNotifier() {
+    return this.ccn;
+  }
+  
+  /**
+   * Clears the resource used by CQ.
+   * @throws CqException
+   */
+  protected void cleanup() throws CqException {
+    // CqBaseRegion 
+    try {
+      if (this.cqBaseRegion != null && !this.cqBaseRegion.isDestroyed()) {
+        this.cqBaseRegion.getFilterProfile().closeCq(this);
+        CacheClientProxy clientProxy = ccn.getClientProxy(clientProxyId);
+        clientProxy.decCqCount();
+        if (clientProxy.hasNoCq()) {
+          cqService.stats.decClientsWithCqs();
+        }
+      } 
+    }catch (Exception ex){
+      // May be cache is being shutdown
+      if (logger.isDebugEnabled()) {
+        logger.debug("Failed to remove CQ from the base region. CqName :{}", cqName);
+      }
+    }
+  }
+  
+  /**
+   * @param serverCqName The serverCqName to set.
+   */
+  public void setServerCqName(String serverCqName) {
+    
+    this.serverCqName = serverCqName;
+  }
+  
+  /**
+   * Stop or pause executing the query.
+   */
+  public void stop()throws CqClosedException, CqException {
+    boolean isStopped = false;
+    synchronized (this.cqState) {
+      if (this.isClosed()) {
+        throw new CqClosedException(LocalizedStrings.CqQueryImpl_CQ_IS_CLOSED_CQNAME_0
+            .toLocalizedString(this.cqName));
+      }
+      
+      if (!(this.isRunning())) {
+        throw new IllegalStateException(LocalizedStrings.CqQueryImpl_CQ_IS_NOT_IN_RUNNING_STATE_STOP_CQ_DOES_NOT_APPLY_CQNAME_0
+            .toLocalizedString(this.cqName));
+      }
+      
+      // Change state and stats on the client side
+      this.cqState.setState(CqStateImpl.STOPPED);
+      this.cqService.stats.incCqsStopped();
+      this.cqService.stats.decCqsActive();
+      if (logger.isDebugEnabled()) {
+        logger.debug("Successfully stopped the CQ. {}", cqName);
+      }
+    }
+  }
+
+  /* DataSerializableFixedID methods ---------------------------------------- */
+
+  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
+    //this.cqName = DataSerializer.readString(in);
+    synchronized(cqState) {
+      this.cqState.setState(DataSerializer.readInteger(in));
+    }
+    this.isDurable = DataSerializer.readBoolean(in);
+    this.queryString = DataSerializer.readString(in);
+    this.filterID = in.readLong();
+  }
+  
+  /*
+  public int getDSFID() {
+    return CQ_QUERY;
+  }
+  */
+  
+  public void toData(DataOutput out) throws IOException {
+    //DataSerializer.writeString(this.cqName, out);
+    DataSerializer.writeInteger(this.cqState.getState(), out);
+    DataSerializer.writeBoolean(this.isDurable, out);
+    DataSerializer.writeString(this.queryString, out);
+    out.writeLong(this.filterID);
+  }
+  
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqQuery2#isPR()
+   */
+  @Override
+  public boolean isPR() {
+    return isPR;
+  }
+
+  @Override
+  public CqAttributes getCqAttributes() {
+    throw new IllegalStateException("CQ attributes are not available on the server");
+  }
+
+  @Override
+  public CqAttributesMutator getCqAttributesMutator() {
+    throw new IllegalStateException("CQ attributes are not available on the server");
+  }
+
+  @Override
+  public <E> CqResults<E> executeWithInitialResults() throws CqClosedException,
+      RegionNotFoundException, CqException {
+    throw new IllegalStateException("Execute cannot be called on a CQ on the server");
+  }
+
+  @Override
+  public void execute() throws CqClosedException, RegionNotFoundException,
+      CqException {
+    throw new IllegalStateException("Execute cannot be called on a CQ on the server");
+  }
+  
+  
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/BaseCQCommand.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/BaseCQCommand.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/BaseCQCommand.java
new file mode 100644
index 0000000..85e886b
--- /dev/null
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/BaseCQCommand.java
@@ -0,0 +1,43 @@
+package com.gemstone.gemfire.internal.cache.tier.sockets.command;
+
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import com.gemstone.gemfire.cache.RegionDestroyedException;
+import com.gemstone.gemfire.cache.operations.QueryOperationContext;
+import com.gemstone.gemfire.cache.query.Query;
+import com.gemstone.gemfire.cache.query.QueryException;
+import com.gemstone.gemfire.cache.query.QueryInvalidException;
+import com.gemstone.gemfire.cache.query.SelectResults;
+import com.gemstone.gemfire.cache.query.Struct;
+import com.gemstone.gemfire.cache.query.internal.CqEntry;
+import com.gemstone.gemfire.cache.query.internal.DefaultQuery;
+import com.gemstone.gemfire.cache.query.internal.cq.InternalCqQuery;
+import com.gemstone.gemfire.cache.query.internal.types.CollectionTypeImpl;
+import com.gemstone.gemfire.cache.query.internal.types.StructTypeImpl;
+import com.gemstone.gemfire.cache.query.types.CollectionType;
+import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException;
+import com.gemstone.gemfire.distributed.internal.DistributionStats;
+import com.gemstone.gemfire.internal.Version;
+import com.gemstone.gemfire.internal.cache.CachedDeserializable;
+import com.gemstone.gemfire.internal.cache.tier.CachedRegionHelper;
+import com.gemstone.gemfire.internal.cache.tier.MessageType;
+import com.gemstone.gemfire.internal.cache.tier.sockets.BaseCommand;
+import com.gemstone.gemfire.internal.cache.tier.sockets.BaseCommandQuery;
+import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerStats;
+import com.gemstone.gemfire.internal.cache.tier.sockets.ChunkedMessage;
+import com.gemstone.gemfire.internal.cache.tier.sockets.Message;
+import com.gemstone.gemfire.internal.cache.tier.sockets.ObjectPartList;
+import com.gemstone.gemfire.internal.cache.tier.sockets.ServerConnection;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
+import com.gemstone.gemfire.internal.security.AuthorizeRequestPP;
+
+public abstract class BaseCQCommand extends BaseCommandQuery {
+
+  
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/CloseCQ.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/CloseCQ.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/CloseCQ.java
new file mode 100644
index 0000000..4f8b2ef
--- /dev/null
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/CloseCQ.java
@@ -0,0 +1,125 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+/**
+ * 
+ */
+package com.gemstone.gemfire.internal.cache.tier.sockets.command;
+
+import com.gemstone.gemfire.internal.cache.tier.CachedRegionHelper;
+import com.gemstone.gemfire.internal.cache.tier.Command;
+import com.gemstone.gemfire.internal.cache.tier.MessageType;
+import com.gemstone.gemfire.internal.cache.tier.sockets.*;
+import com.gemstone.gemfire.cache.query.CqException;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.distributed.internal.DistributionStats;
+import com.gemstone.gemfire.cache.query.internal.DefaultQueryService;
+import com.gemstone.gemfire.cache.query.internal.cq.CqService;
+import com.gemstone.gemfire.cache.query.internal.cq.InternalCqQuery;
+import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.internal.security.AuthorizeRequest;
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+
+
+public class CloseCQ extends BaseCQCommand {
+
+  private final static CloseCQ singleton = new CloseCQ();
+
+  public static Command getCommand() {
+    return singleton;
+  }
+
+  private CloseCQ() {
+  }
+
+  @Override
+  public void cmdExecute(Message msg, ServerConnection servConn, long start)
+      throws IOException {
+    CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
+    ClientProxyMembershipID id = servConn.getProxyID();
+    CacheServerStats stats = servConn.getCacheServerStats();
+
+    // Based on MessageType.QUERY
+    // Added by Rao 2/1/2007
+    servConn.setAsTrue(REQUIRES_RESPONSE);
+    servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+
+    start = DistributionStats.getStatTime();
+    // Retrieve the data from the message parts
+    String cqName = msg.getPart(0).getString();
+
+    if (logger.isDebugEnabled()) {
+      logger.debug("{}: Received close CQ request from {} cqName: {}", servConn.getName(), servConn.getSocketString(), cqName);
+    }
+
+    // Process the query request
+    if (cqName == null) {
+      String err = LocalizedStrings.CloseCQ_THE_CQNAME_FOR_THE_CQ_CLOSE_REQUEST_IS_NULL.toLocalizedString();
+      sendCqResponse(MessageType.CQDATAERROR_MSG_TYPE, err, msg
+          .getTransactionId(), null, servConn);
+      return;
+    }
+
+    // Process CQ close request
+    try {
+      // Append Client ID to CQ name
+      CqService cqService = crHelper.getCache().getCqService();
+      cqService.start();
+      
+      String serverCqName = cqName;
+      if (id != null) {
+        serverCqName = cqService.constructServerCqName(cqName, id);
+      }
+      InternalCqQuery cqQuery = cqService.getCq(serverCqName);
+      
+      AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+      if (authzRequest != null) {
+        String queryStr = null;
+        Set cqRegionNames = null;        
+        
+        if (cqQuery != null) {
+          queryStr = cqQuery.getQueryString();
+          cqRegionNames = new HashSet();
+          cqRegionNames.add(((InternalCqQuery)cqQuery).getRegionName());
+          authzRequest.closeCQAuthorize(cqName, queryStr, cqRegionNames);
+        }
+        
+      }
+      // String cqNameWithClientId = new String(cqName + "__" +
+      // getMembershipID());
+      cqService.closeCq(cqName, id);
+      if(cqQuery != null)
+        servConn.removeCq(cqName, cqQuery.isDurable());
+    }
+    catch (CqException cqe) {
+      sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, "", msg.getTransactionId(),
+          cqe, servConn);
+      return;
+    }
+    catch (Exception e) {
+      String err = LocalizedStrings.CloseCQ_EXCEPTION_WHILE_CLOSING_CQ_CQNAME_0.toLocalizedString(cqName);
+      sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, err,
+          msg.getTransactionId(), e, servConn);
+      return;
+    }
+
+    // Send OK to client
+    sendCqResponse(MessageType.REPLY, LocalizedStrings.CloseCQ_CQ_CLOSED_SUCCESSFULLY.toLocalizedString(), msg.getTransactionId(), null, servConn);
+    servConn.setAsTrue(RESPONDED);
+
+    {
+      long oldStart = start;
+      start = DistributionStats.getStatTime();
+      stats.incProcessCloseCqTime(start - oldStart);
+    }
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteCQ.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteCQ.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteCQ.java
new file mode 100644
index 0000000..9f111fc
--- /dev/null
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteCQ.java
@@ -0,0 +1,162 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+/**
+ * 
+ */
+package com.gemstone.gemfire.internal.cache.tier.sockets.command;
+
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.cache.tier.CachedRegionHelper;
+import com.gemstone.gemfire.internal.cache.tier.Command;
+import com.gemstone.gemfire.internal.cache.tier.MessageType;
+import com.gemstone.gemfire.internal.cache.tier.sockets.*;
+import com.gemstone.gemfire.cache.operations.ExecuteCQOperationContext;
+import com.gemstone.gemfire.cache.query.CqException;
+import com.gemstone.gemfire.cache.query.Query;
+import com.gemstone.gemfire.distributed.internal.DistributionStats;
+import com.gemstone.gemfire.cache.query.internal.DefaultQuery;
+import com.gemstone.gemfire.cache.query.internal.DefaultQueryService;
+import com.gemstone.gemfire.cache.query.internal.cq.CqService;
+import com.gemstone.gemfire.cache.query.internal.cq.InternalCqQuery;
+import com.gemstone.gemfire.cache.query.internal.cq.ServerCQ;
+import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.internal.logging.LogService;
+import com.gemstone.gemfire.internal.security.AuthorizeRequest;
+
+import java.io.IOException;
+import java.util.Set;
+
+import org.apache.logging.log4j.Logger;
+
+
+public class ExecuteCQ extends BaseCQCommand {
+  protected static final Logger logger = LogService.getLogger();
+
+  private final static ExecuteCQ singleton = new ExecuteCQ();
+
+  public static Command getCommand() {
+    return singleton;
+  }
+
+  private ExecuteCQ() {
+  }
+
+  @Override
+  public void cmdExecute(Message msg, ServerConnection servConn, long start)
+      throws IOException, InterruptedException {
+    AcceptorImpl acceptor = servConn.getAcceptor();
+    CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
+    ClientProxyMembershipID id = servConn.getProxyID();
+    CacheServerStats stats = servConn.getCacheServerStats();
+
+    servConn.setAsTrue(REQUIRES_RESPONSE);
+    servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+    
+    // Retrieve the data from the message parts
+    String cqName = msg.getPart(0).getString();
+    String cqQueryString = msg.getPart(1).getString();
+    int cqState = msg.getPart(2).getInt();
+
+    Part isDurablePart = msg.getPart(3);
+    byte[] isDurableByte = isDurablePart.getSerializedForm();
+    boolean isDurable = (isDurableByte == null || isDurableByte[0] == 0) ? false
+        : true;
+    if (logger.isDebugEnabled()) {
+      logger.debug("{}: Received {} request from {} CqName: {} queryString: {}", servConn.getName(), MessageType.getString(msg.getMessageType()), servConn.getSocketString(), cqName, cqQueryString);
+    }
+
+    DefaultQueryService qService = null;
+    CqService cqServiceForExec = null;
+    Query query = null;
+    Set cqRegionNames = null;
+    ExecuteCQOperationContext executeCQContext = null;
+    ServerCQ cqQuery = null;
+    
+    try {
+      qService = (DefaultQueryService)((GemFireCacheImpl)crHelper.getCache()).getLocalQueryService();
+
+      // Authorization check
+      AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+      if (authzRequest != null) {
+        query = qService.newQuery(cqQueryString);
+        cqRegionNames = ((DefaultQuery)query).getRegionsInQuery(null);
+        executeCQContext = authzRequest.executeCQAuthorize(cqName,
+            cqQueryString, cqRegionNames);
+        String newCqQueryString = executeCQContext.getQuery();
+        
+        if (!cqQueryString.equals(newCqQueryString)) {
+          query = qService.newQuery(newCqQueryString);
+          cqQueryString = newCqQueryString;
+          cqRegionNames = executeCQContext.getRegionNames();
+          if (cqRegionNames == null) {
+            cqRegionNames = ((DefaultQuery)query).getRegionsInQuery(null);
+          }
+        }
+      }
+
+      cqServiceForExec = qService.getCqService();
+      cqQuery = cqServiceForExec.executeCq(cqName, cqQueryString, 
+        cqState, id, acceptor.getCacheClientNotifier(), isDurable, false, 0, null);
+    }
+    catch (CqException cqe) {
+      sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, "", msg.getTransactionId(),
+          cqe, servConn);
+      return;
+    }
+    catch (Exception e) {
+      writeChunkedException(msg, e, false, servConn);
+      return;
+    }
+
+    long oldstart = start;
+    boolean sendResults = false;
+    boolean successQuery = false;
+    
+    if (msg.getMessageType() == MessageType.EXECUTECQ_WITH_IR_MSG_TYPE) {
+      sendResults = true;
+    }
+
+    // Execute the query and send the result-set to client.    
+    try {
+      if (query == null) {
+        query = qService.newQuery(cqQueryString);
+        cqRegionNames = ((DefaultQuery)query).getRegionsInQuery(null);
+      }
+      ((DefaultQuery)query).setIsCqQuery(true);
+      successQuery = processQuery(msg, query, cqQueryString,
+          cqRegionNames, start, cqQuery, executeCQContext, servConn, sendResults);
+
+      // Update the CQ statistics.
+      cqQuery.getVsdStats().setCqInitialResultsTime((DistributionStats.getStatTime()) - oldstart);
+      stats.incProcessExecuteCqWithIRTime((DistributionStats.getStatTime()) - oldstart);
+      //logger.fine("Time spent in execute with initial results :" + DistributionStats.getStatTime() + ", " +  oldstart);
+    } finally { // To handle any exception.
+      // If failure to execute the query, close the CQ.
+      if (!successQuery) {
+        try {
+          cqServiceForExec.closeCq(cqName, id);
+        }
+        catch (Exception ex) {
+          // Ignore.
+        }        
+      }
+    }
+
+    if (!sendResults && successQuery) {
+      // Send OK to client
+      sendCqResponse(MessageType.REPLY, LocalizedStrings.ExecuteCQ_CQ_CREATED_SUCCESSFULLY.toLocalizedString(), msg
+          .getTransactionId(), null, servConn);
+
+      long start2 = DistributionStats.getStatTime();
+      stats.incProcessCreateCqTime(start2 - oldstart);
+    }
+    servConn.setAsTrue(RESPONDED);
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteCQ61.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteCQ61.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteCQ61.java
new file mode 100755
index 0000000..8e19ef3
--- /dev/null
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteCQ61.java
@@ -0,0 +1,214 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+/**
+ * 
+ */
+package com.gemstone.gemfire.internal.cache.tier.sockets.command;
+
+import java.io.IOException;
+import java.util.Set;
+
+import org.apache.logging.log4j.Logger;
+
+import com.gemstone.gemfire.cache.operations.ExecuteCQOperationContext;
+import com.gemstone.gemfire.cache.query.CqException;
+import com.gemstone.gemfire.cache.query.Query;
+import com.gemstone.gemfire.cache.query.internal.DefaultQuery;
+import com.gemstone.gemfire.cache.query.internal.DefaultQueryService;
+import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
+import com.gemstone.gemfire.cache.query.internal.cq.CqServiceProvider;
+import com.gemstone.gemfire.cache.query.internal.cq.ServerCQImpl;
+import com.gemstone.gemfire.distributed.internal.DistributionStats;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.cache.tier.CachedRegionHelper;
+import com.gemstone.gemfire.internal.cache.tier.Command;
+import com.gemstone.gemfire.internal.cache.tier.MessageType;
+import com.gemstone.gemfire.internal.cache.tier.sockets.AcceptorImpl;
+import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier;
+import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy;
+import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerStats;
+import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
+import com.gemstone.gemfire.internal.cache.tier.sockets.Message;
+import com.gemstone.gemfire.internal.cache.tier.sockets.Part;
+import com.gemstone.gemfire.internal.cache.tier.sockets.ServerConnection;
+import com.gemstone.gemfire.internal.cache.vmotion.VMotionObserver;
+import com.gemstone.gemfire.internal.cache.vmotion.VMotionObserverHolder;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.internal.logging.LogService;
+import com.gemstone.gemfire.internal.security.AuthorizeRequest;
+
+
+/**
+ * @author aingle
+ * @since 6.1
+ */
+
+public class ExecuteCQ61 extends BaseCQCommand {
+  protected static final Logger logger = LogService.getLogger();
+
+  private final static ExecuteCQ61 singleton = new ExecuteCQ61();
+  
+  public static Command getCommand() {
+    return singleton;
+  }
+
+  private ExecuteCQ61() {
+  }
+
+  @Override
+  public void cmdExecute(Message msg, ServerConnection servConn, long start)
+      throws IOException, InterruptedException {
+    AcceptorImpl acceptor = servConn.getAcceptor();
+    CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
+    ClientProxyMembershipID id = servConn.getProxyID();
+    CacheServerStats stats = servConn.getCacheServerStats();
+
+    servConn.setAsTrue(REQUIRES_RESPONSE);
+    servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+    
+    // Retrieve the data from the message parts
+    String cqName = msg.getPart(0).getString();
+    String cqQueryString = msg.getPart(1).getString();
+    int cqState = msg.getPart(2).getInt();
+
+    Part isDurablePart = msg.getPart(3);
+    byte[] isDurableByte = isDurablePart.getSerializedForm();
+    boolean isDurable = (isDurableByte == null || isDurableByte[0] == 0) ? false
+        : true;
+//  region data policy
+    Part regionDataPolicyPart = msg.getPart(msg.getNumberOfParts()-1);
+    byte[] regionDataPolicyPartBytes = regionDataPolicyPart.getSerializedForm();
+    if (logger.isDebugEnabled()) {
+      logger.debug("{}: Received {} request from {} CqName: {} queryString: {}", servConn.getName(), MessageType.getString(msg.getMessageType()), servConn.getSocketString(), cqName, cqQueryString);
+    }
+
+    // Check if the Server is running in NotifyBySubscription=true mode.
+    CacheClientNotifier ccn = acceptor.getCacheClientNotifier();
+    if (ccn != null) {
+      CacheClientProxy proxy = ccn.getClientProxy(id);
+      if (proxy != null && !proxy.isNotifyBySubscription()) {
+        // This should have been taken care at the client.
+        String err = LocalizedStrings.ExecuteCQ_SERVER_NOTIFYBYSUBSCRIPTION_MODE_IS_SET_TO_FALSE_CQ_EXECUTION_IS_NOT_SUPPORTED_IN_THIS_MODE.toLocalizedString();
+        sendCqResponse(MessageType.CQDATAERROR_MSG_TYPE, err, msg
+          .getTransactionId(), null, servConn);
+        return;
+      }
+    }
+
+    DefaultQueryService qService = null;
+    CqServiceImpl cqServiceForExec = null;
+    Query query = null;
+    Set cqRegionNames = null;
+    ExecuteCQOperationContext executeCQContext = null;
+    ServerCQImpl cqQuery = null;
+    
+    try {
+      qService = (DefaultQueryService)((GemFireCacheImpl)crHelper.getCache()).getLocalQueryService();
+
+      // Authorization check
+      AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+      if (authzRequest != null) {
+        query = qService.newQuery(cqQueryString);
+        cqRegionNames = ((DefaultQuery)query).getRegionsInQuery(null);
+        executeCQContext = authzRequest.executeCQAuthorize(cqName,
+            cqQueryString, cqRegionNames);
+        String newCqQueryString = executeCQContext.getQuery();
+        
+        if (!cqQueryString.equals(newCqQueryString)) {
+          query = qService.newQuery(newCqQueryString);
+          cqQueryString = newCqQueryString;
+          cqRegionNames = executeCQContext.getRegionNames();
+          if (cqRegionNames == null) {
+            cqRegionNames = ((DefaultQuery)query).getRegionsInQuery(null);
+          }
+        }
+      }
+      
+      // test hook to trigger vMotion during CQ registration
+
+      if (CqServiceProvider.VMOTION_DURING_CQ_REGISTRATION_FLAG) {
+        VMotionObserver vmo = VMotionObserverHolder.getInstance();
+        vmo.vMotionBeforeCQRegistration();
+      }
+
+      cqServiceForExec = (CqServiceImpl) qService.getCqService();
+      //registering cq with serverConnection so that when CCP will require auth info it can access that
+      //registering cq auth before as possibility that you may get event
+      servConn.setCq(cqName, isDurable);
+      cqQuery = (ServerCQImpl) cqServiceForExec.executeCq(cqName, cqQueryString, cqState, 
+        id, ccn, isDurable, true, regionDataPolicyPartBytes[0], null);  
+    }
+    catch (CqException cqe) {
+      sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, "", msg.getTransactionId(),
+          cqe, servConn);
+      servConn.removeCq(cqName, isDurable);
+      return;
+    }
+    catch (Exception e) {
+      writeChunkedException(msg, e, false, servConn);
+      servConn.removeCq(cqName, isDurable);
+      return;
+    }
+
+    long oldstart = start;
+    boolean sendResults = false;
+    boolean successQuery = false;
+
+    if (msg.getMessageType() == MessageType.EXECUTECQ_WITH_IR_MSG_TYPE) {
+      sendResults = true;
+    }
+    
+    // Execute the query only if it is execute with initial results or
+    // if it is a non PR query with execute query and maintain keys flags set
+    if(sendResults || (CqServiceImpl.EXECUTE_QUERY_DURING_INIT && CqServiceProvider.MAINTAIN_KEYS && !cqQuery.isPR())) {
+      // Execute the query and send the result-set to client.
+      try {
+        if (query == null) {
+          query = qService.newQuery(cqQueryString);
+          cqRegionNames = ((DefaultQuery)query).getRegionsInQuery(null);
+        }
+        ((DefaultQuery)query).setIsCqQuery(true);
+        successQuery = processQuery(msg, query, cqQueryString,
+            cqRegionNames, start, cqQuery, executeCQContext, servConn, sendResults);
+      
+
+        // Update the CQ statistics.
+        cqQuery.getVsdStats().setCqInitialResultsTime((DistributionStats.getStatTime()) - oldstart);
+        stats.incProcessExecuteCqWithIRTime((DistributionStats.getStatTime()) - oldstart);
+        //logger.fine("Time spent in execute with initial results :" + DistributionStats.getStatTime() + ", " +  oldstart);
+      } finally { // To handle any exception.
+        // If failure to execute the query, close the CQ.
+        if (!successQuery) {
+          try {
+            cqServiceForExec.closeCq(cqName, id);
+          }
+          catch (Exception ex) {
+            // Ignore.
+          }      
+        }
+      }
+    } else {
+      // Don't execute query for cq.execute and
+      // if it is a PR query with execute query and maintain keys flags not set
+      cqQuery.cqResultKeysInitialized = true;
+      successQuery = true;
+    }
+      
+    if (!sendResults && successQuery) {
+      // Send OK to client
+      sendCqResponse(MessageType.REPLY, LocalizedStrings.ExecuteCQ_CQ_CREATED_SUCCESSFULLY.toLocalizedString(), msg
+          .getTransactionId(), null, servConn);
+
+      long start2 = DistributionStats.getStatTime();
+      stats.incProcessCreateCqTime(start2 - oldstart);
+    }
+    servConn.setAsTrue(RESPONDED);
+
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetCQStats.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetCQStats.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetCQStats.java
new file mode 100644
index 0000000..b483ddf
--- /dev/null
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetCQStats.java
@@ -0,0 +1,94 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+/**
+ * 
+ */
+package com.gemstone.gemfire.internal.cache.tier.sockets.command;
+
+
+import com.gemstone.gemfire.internal.cache.tier.CachedRegionHelper;
+import com.gemstone.gemfire.internal.cache.tier.Command;
+import com.gemstone.gemfire.internal.cache.tier.MessageType;
+import com.gemstone.gemfire.internal.cache.tier.sockets.*;
+import com.gemstone.gemfire.cache.query.CqException;
+import com.gemstone.gemfire.distributed.internal.DistributionStats;
+import com.gemstone.gemfire.cache.query.internal.DefaultQueryService;
+import com.gemstone.gemfire.cache.query.internal.cq.CqService;
+
+import java.io.IOException;
+
+
+public class GetCQStats extends BaseCQCommand {
+
+  private final static GetCQStats singleton = new GetCQStats();
+
+  public static Command getCommand() {
+    return singleton;
+  }
+
+  private GetCQStats() {
+  }
+
+  @Override
+  public void cmdExecute(Message msg, ServerConnection servConn, long start)
+      throws IOException {
+    CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
+
+    CacheServerStats stats = servConn.getCacheServerStats();
+
+    servConn.setAsTrue(REQUIRES_RESPONSE);
+    servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+
+    final boolean isDebugEnabled = logger.isDebugEnabled();
+    if (isDebugEnabled) {
+      logger.debug("{}: Received close all client CQs request from {}", servConn.getName(), servConn.getSocketString());
+    }
+
+    // Retrieve the data from the message parts
+    String cqName = msg.getPart(0).getString();
+
+    if (isDebugEnabled) {
+      logger.debug("{}: Received close CQ request from {} cqName: {}", servConn.getName(), servConn.getSocketString(), cqName);
+    }
+
+    // Process the query request
+    if (cqName == null) {
+      String err = "The cqName for the cq stats request is null";
+      sendCqResponse(MessageType.CQDATAERROR_MSG_TYPE, err, msg
+          .getTransactionId(), null, servConn);
+      return;
+
+    }
+    else {
+      // Process the cq request
+      try {
+        // make sure the cqservice has been created
+        // since that is what registers the stats
+        CqService cqService = crHelper.getCache().getCqService();
+        cqService.start();
+      }
+      catch (Exception e) {
+        String err = "Exception while Getting the CQ Statistics. ";
+        sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, err, msg
+            .getTransactionId(), e, servConn);
+        return;
+      }
+    }
+    // Send OK to client
+    sendCqResponse(MessageType.REPLY, "cq stats sent successfully.", msg
+        .getTransactionId(), null, servConn);
+    servConn.setAsTrue(RESPONDED);
+
+    {
+      long oldStart = start;
+      start = DistributionStats.getStatTime();
+      stats.incProcessGetCqStatsTime(start - oldStart);
+    }
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetDurableCQs.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetDurableCQs.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetDurableCQs.java
new file mode 100755
index 0000000..f22d141
--- /dev/null
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetDurableCQs.java
@@ -0,0 +1,137 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+/**
+ * 
+ */
+package com.gemstone.gemfire.internal.cache.tier.sockets.command;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.operations.GetDurableCQsOperationContext;
+import com.gemstone.gemfire.cache.query.CqException;
+import com.gemstone.gemfire.cache.query.Query;
+import com.gemstone.gemfire.cache.query.internal.DefaultQuery;
+import com.gemstone.gemfire.cache.query.internal.DefaultQueryService;
+import com.gemstone.gemfire.cache.query.internal.cq.CqService;
+import com.gemstone.gemfire.cache.query.internal.cq.InternalCqQuery;
+import com.gemstone.gemfire.distributed.internal.DistributionStats;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.cache.tier.CachedRegionHelper;
+import com.gemstone.gemfire.internal.cache.tier.Command;
+import com.gemstone.gemfire.internal.cache.tier.MessageType;
+import com.gemstone.gemfire.internal.cache.tier.sockets.AcceptorImpl;
+import com.gemstone.gemfire.internal.cache.tier.sockets.BaseCommand;
+import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerStats;
+import com.gemstone.gemfire.internal.cache.tier.sockets.ChunkedMessage;
+import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
+import com.gemstone.gemfire.internal.cache.tier.sockets.Message;
+import com.gemstone.gemfire.internal.cache.tier.sockets.ServerConnection;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.internal.security.AuthorizeRequest;
+
+
+public class GetDurableCQs extends BaseCQCommand {
+
+  private final static GetDurableCQs singleton = new GetDurableCQs();
+
+  public static Command getCommand() {
+    return singleton;
+  }
+
+  private GetDurableCQs() {
+  }
+
+  @Override
+  public void cmdExecute(Message msg, ServerConnection servConn, long start)
+      throws IOException, InterruptedException {
+    AcceptorImpl acceptor = servConn.getAcceptor();
+    CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
+    ClientProxyMembershipID id = servConn.getProxyID();
+    CacheServerStats stats = servConn.getCacheServerStats();
+
+    servConn.setAsTrue(REQUIRES_RESPONSE);
+    servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+
+    if (logger.isDebugEnabled()) {
+      logger.debug("{}: Received {} request from {}", servConn.getName(), MessageType.getString(msg.getMessageType()), servConn.getSocketString());
+    }
+
+    DefaultQueryService qService = null;
+    CqService cqServiceForExec = null;
+    Query query = null;
+    Set cqRegionNames = null;
+    GetDurableCQsOperationContext getDurableCqsOperationContext = null;
+    InternalCqQuery cqQuery = null;
+
+    try {
+      qService = (DefaultQueryService) ((GemFireCacheImpl) crHelper.getCache())
+          .getLocalQueryService();
+
+      // Authorization check
+      AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+      if (authzRequest != null) {
+        authzRequest.getDurableCQsAuthorize();
+      }
+
+      cqServiceForExec = qService.getCqService();
+      List<String> durableCqs = cqServiceForExec.getAllDurableClientCqs(id);
+
+      ChunkedMessage chunkedResponseMsg = servConn.getChunkedResponseMessage();
+      chunkedResponseMsg.setMessageType(MessageType.RESPONSE);
+      chunkedResponseMsg.setTransactionId(msg.getTransactionId());
+      chunkedResponseMsg.sendHeader();
+
+      List durableCqList = new ArrayList(maximumChunkSize);
+      final boolean isTraceEnabled = logger.isTraceEnabled();
+      for (Iterator it = durableCqs.iterator(); it.hasNext();) {
+        Object durableCqName = it.next();
+        durableCqList.add(durableCqName);
+        if (isTraceEnabled) {
+          logger.trace("{}: getDurableCqsResponse <{}>; list size was {}", servConn.getName(), durableCqName, durableCqList.size());
+        }
+        if (durableCqList.size() == maximumChunkSize) {
+          // Send the chunk and clear the list
+          sendDurableCqsResponseChunk(durableCqList, false, servConn);
+          durableCqList.clear();
+        }
+      }
+      // Send the last chunk even if the list is of zero size.
+      sendDurableCqsResponseChunk(durableCqList, true, servConn);
+
+    } catch (CqException cqe) {
+      sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, "", msg.getTransactionId(),
+          cqe, servConn);
+      return;
+    } catch (Exception e) {
+      writeChunkedException(msg, e, false, servConn);
+      return;
+    }
+  }
+
+  private void sendDurableCqsResponseChunk(List list, boolean lastChunk,
+      ServerConnection servConn) throws IOException {
+    ChunkedMessage chunkedResponseMsg = servConn.getChunkedResponseMessage();
+
+    chunkedResponseMsg.setNumberOfParts(1);
+    chunkedResponseMsg.setLastChunk(lastChunk);
+    chunkedResponseMsg.addObjPart(list, zipValues);
+
+    if (logger.isDebugEnabled()) {
+      logger.debug("{}: Sending {} durableCQs response chunk{}", servConn.getName(), (lastChunk ? " last " : " "), (logger.isTraceEnabled() ? " keys=" + list + " chunk=<" + chunkedResponseMsg + ">" : ""));
+    }
+
+    chunkedResponseMsg.sendChunk(servConn);
+  }
+
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/MonitorCQ.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/MonitorCQ.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/MonitorCQ.java
new file mode 100644
index 0000000..bd77cee
--- /dev/null
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/MonitorCQ.java
@@ -0,0 +1,94 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+/**
+ * 
+ */
+package com.gemstone.gemfire.internal.cache.tier.sockets.command;
+
+
+import com.gemstone.gemfire.internal.cache.tier.CachedRegionHelper;
+import com.gemstone.gemfire.internal.cache.tier.Command;
+import com.gemstone.gemfire.internal.cache.tier.MessageType;
+import com.gemstone.gemfire.internal.cache.tier.sockets.*;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.cache.query.CqException;
+import com.gemstone.gemfire.cache.query.internal.DefaultQueryService;
+import com.gemstone.gemfire.cache.query.internal.cq.CqService;
+
+import java.io.IOException;
+
+public class MonitorCQ extends BaseCQCommand {
+
+  private final static MonitorCQ singleton = new MonitorCQ();
+
+  public static Command getCommand() {
+    return singleton;
+  }
+
+  private MonitorCQ() {
+  }
+
+  @Override
+  public void cmdExecute(Message msg, ServerConnection servConn, long start)
+      throws IOException {
+    CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
+    servConn.setAsTrue(REQUIRES_RESPONSE);
+    servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+
+    int op = msg.getPart(0).getInt();
+
+    if (op < 1) {
+      // This should have been taken care at the client - remove?
+      String err = LocalizedStrings.MonitorCQ__0_THE_MONITORCQ_OPERATION_IS_INVALID.toLocalizedString(servConn.getName());
+      sendCqResponse(MessageType.CQDATAERROR_MSG_TYPE, err, msg
+          .getTransactionId(), null, servConn);
+      return;
+    }
+
+    String regionName = null;
+    if (msg.getNumberOfParts() == 2) {
+      // This will be enable/disable on region.
+      regionName = msg.getPart(1).getString();
+      if (regionName == null) {
+        // This should have been taken care at the client - remove?
+        String err = LocalizedStrings.MonitorCQ__0_A_NULL_REGION_NAME_WAS_PASSED_FOR_MONITORCQ_OPERATION.toLocalizedString(servConn.getName());
+        sendCqResponse(MessageType.CQDATAERROR_MSG_TYPE, err, msg
+            .getTransactionId(), null, servConn);
+        return;
+      }
+    }
+
+    if (logger.isDebugEnabled()) {
+      logger.debug("{}: Received MonitorCq request from {} op: {}{}", servConn.getName(), servConn.getSocketString(), op, (regionName != null) ? " RegionName: " + regionName : "");
+    }
+
+    try {
+      CqService cqService = crHelper.getCache().getCqService();
+      cqService.start();
+      // The implementation of enable/disable cq is changed.
+      // Instead calling enable/disable client calls execute/stop methods
+      // at cache and region level.
+      // This method is retained for future purpose, to support admin level apis
+      // similar to enable/disable at system/client level.
+      // Should never come.
+      throw new CqException (LocalizedStrings.CqService_INVALID_CQ_MONITOR_REQUEST_RECEIVED.toLocalizedString());
+    }
+    catch (CqException cqe) {
+      sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, "", msg.getTransactionId(),
+          cqe, servConn);
+      return;
+    }
+    catch (Exception e) {
+      String err = LocalizedStrings.MonitorCQ_EXCEPTION_WHILE_HANDLING_THE_MONITOR_REQUEST_OP_IS_0.toLocalizedString(Integer.valueOf(op));
+      sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, err,
+          msg.getTransactionId(), e, servConn);
+      return;
+    }
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/StopCQ.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/StopCQ.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/StopCQ.java
new file mode 100644
index 0000000..157158e
--- /dev/null
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/StopCQ.java
@@ -0,0 +1,129 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+/**
+ * 
+ */
+package com.gemstone.gemfire.internal.cache.tier.sockets.command;
+
+import com.gemstone.gemfire.internal.cache.tier.CachedRegionHelper;
+import com.gemstone.gemfire.internal.cache.tier.Command;
+import com.gemstone.gemfire.internal.cache.tier.MessageType;
+import com.gemstone.gemfire.internal.cache.tier.sockets.*;
+import com.gemstone.gemfire.cache.query.CqException;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.distributed.internal.DistributionStats;
+import com.gemstone.gemfire.cache.query.internal.DefaultQueryService;
+import com.gemstone.gemfire.cache.query.internal.cq.CqQueryImpl;
+import com.gemstone.gemfire.cache.query.internal.cq.CqService;
+import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
+import com.gemstone.gemfire.cache.query.internal.cq.InternalCqQuery;
+import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.internal.security.AuthorizeRequest;
+
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+
+
+public class StopCQ extends BaseCQCommand {
+
+  private final static StopCQ singleton = new StopCQ();
+
+  public static Command getCommand() {
+    return singleton;
+  }
+
+  private StopCQ() {
+  }
+
+  @Override
+  public void cmdExecute(Message msg, ServerConnection servConn, long start)
+      throws IOException {
+    CachedRegionHelper crHelper = servConn.getCachedRegionHelper();
+    ClientProxyMembershipID id = servConn.getProxyID();
+    CacheServerStats stats = servConn.getCacheServerStats();
+
+    // Based on MessageType.QUERY
+    // Added by Rao 2/1/2007
+    servConn.setAsTrue(REQUIRES_RESPONSE);
+    servConn.setAsTrue(REQUIRES_CHUNKED_RESPONSE);
+
+    start = DistributionStats.getStatTime();
+    // Retrieve the data from the message parts
+    String cqName = msg.getPart(0).getString();
+
+    if (logger.isDebugEnabled()) {
+      logger.debug("{}: Received stop CQ request from {} cqName: {}", servConn.getName(), servConn.getSocketString(), cqName);
+    }
+
+    // Process the query request
+    if (cqName == null) {
+      String err = LocalizedStrings.StopCQ_THE_CQNAME_FOR_THE_CQ_STOP_REQUEST_IS_NULL.toLocalizedString();
+      sendCqResponse(MessageType.CQDATAERROR_MSG_TYPE, err, msg
+          .getTransactionId(), null, servConn);
+      return;
+    }
+
+    // Process CQ stop request
+    try {
+      // Append Client ID to CQ name
+      CqService cqService = crHelper.getCache().getCqService();
+      cqService.start();
+      // String cqNameWithClientId = new String(cqName + "__" +
+      // getMembershipID());
+      String serverCqName = cqName;
+      if (id != null) {
+        serverCqName = cqService.constructServerCqName(cqName, id);
+      }
+      InternalCqQuery cqQuery = cqService.getCq(serverCqName);
+      
+      AuthorizeRequest authzRequest = servConn.getAuthzRequest();
+      if (authzRequest != null) {
+        String queryStr = null;
+        Set cqRegionNames = null;
+        
+        if (cqQuery != null) {
+          queryStr = cqQuery.getQueryString();
+          cqRegionNames = new HashSet();
+          cqRegionNames.add(((CqQueryImpl)cqQuery).getRegionName());
+        }
+        authzRequest.stopCQAuthorize(cqName, queryStr, cqRegionNames);
+      }
+      cqService.stopCq(cqName, id);
+      if(cqQuery != null)
+        servConn.removeCq(cqName, cqQuery.isDurable());
+    }
+    catch (CqException cqe) {
+      sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, "", msg.getTransactionId(),
+          cqe, servConn);
+      return;
+    }
+    catch (Exception e) {
+      String err = LocalizedStrings.StopCQ_EXCEPTION_WHILE_STOPPING_CQ_NAMED_0
+        .toLocalizedString(cqName);
+      sendCqResponse(MessageType.CQ_EXCEPTION_TYPE, err,
+          msg.getTransactionId(), e, servConn);
+      return;
+    }
+
+    // Send OK to client
+    sendCqResponse(MessageType.REPLY, LocalizedStrings.StopCQ_CQ_STOPPED_SUCCESSFULLY.toLocalizedString(), msg
+        .getTransactionId(), null, servConn);
+
+    servConn.setAsTrue(RESPONDED);
+
+    {
+      long oldStart = start;
+      start = DistributionStats.getStatTime();
+      stats.incProcessStopCqTime(start - oldStart);
+    }
+
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/main/resources/META-INF/services/com.gemstone.gemfire.cache.query.internal.cq.spi.CqServiceFactory
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/resources/META-INF/services/com.gemstone.gemfire.cache.query.internal.cq.spi.CqServiceFactory b/gemfire-cq/src/main/resources/META-INF/services/com.gemstone.gemfire.cache.query.internal.cq.spi.CqServiceFactory
new file mode 100644
index 0000000..0c51c3d
--- /dev/null
+++ b/gemfire-cq/src/main/resources/META-INF/services/com.gemstone.gemfire.cache.query.internal.cq.spi.CqServiceFactory
@@ -0,0 +1 @@
+com.gemstone.gemfire.cache.query.internal.cq.CqServiceFactoryImpl


[49/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceImpl.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceImpl.java
new file mode 100644
index 0000000..7d4dbb0
--- /dev/null
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceImpl.java
@@ -0,0 +1,2079 @@
+/*=========================================================================
+ * Copyright Copyright (c) 2000-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ * $Id: DefaultQueryService.java,v 1.2 2005/02/01 17:19:20 vaibhav Exp $
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.query.internal.cq;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+import org.apache.logging.log4j.Logger;
+
+import com.gemstone.gemfire.InvalidDeltaException;
+import com.gemstone.gemfire.StatisticsFactory;
+import com.gemstone.gemfire.SystemFailure;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheEvent;
+import com.gemstone.gemfire.cache.CacheLoaderException;
+import com.gemstone.gemfire.cache.EntryEvent;
+import com.gemstone.gemfire.cache.Operation;
+import com.gemstone.gemfire.cache.RegionEvent;
+import com.gemstone.gemfire.cache.TimeoutException;
+import com.gemstone.gemfire.cache.client.Pool;
+import com.gemstone.gemfire.cache.client.internal.GetEventValueOp;
+import com.gemstone.gemfire.cache.client.internal.InternalPool;
+import com.gemstone.gemfire.cache.client.internal.QueueManager;
+import com.gemstone.gemfire.cache.client.internal.ServerCQProxyImpl;
+import com.gemstone.gemfire.cache.client.internal.UserAttributes;
+import com.gemstone.gemfire.cache.query.CqAttributes;
+import com.gemstone.gemfire.cache.query.CqClosedException;
+import com.gemstone.gemfire.cache.query.CqException;
+import com.gemstone.gemfire.cache.query.CqExistsException;
+import com.gemstone.gemfire.cache.query.CqListener;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.CqServiceStatistics;
+import com.gemstone.gemfire.cache.query.CqStatusListener;
+import com.gemstone.gemfire.cache.query.QueryException;
+import com.gemstone.gemfire.cache.query.QueryInvalidException;
+import com.gemstone.gemfire.cache.query.RegionNotFoundException;
+import com.gemstone.gemfire.cache.query.SelectResults;
+import com.gemstone.gemfire.cache.query.internal.CompiledSelect;
+import com.gemstone.gemfire.cache.query.internal.CqQueryVsdStats;
+import com.gemstone.gemfire.cache.query.internal.CqStateImpl;
+import com.gemstone.gemfire.cache.query.internal.DefaultQuery;
+import com.gemstone.gemfire.cache.query.internal.ExecutionContext;
+import com.gemstone.gemfire.distributed.internal.DistributionAdvisor.Profile;
+import com.gemstone.gemfire.internal.cache.CacheDistributionAdvisor.CacheProfile;
+import com.gemstone.gemfire.internal.cache.EntryEventImpl;
+import com.gemstone.gemfire.internal.cache.EventID;
+import com.gemstone.gemfire.internal.cache.FilterProfile;
+import com.gemstone.gemfire.internal.cache.FilterRoutingInfo;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.cache.LocalRegion;
+import com.gemstone.gemfire.internal.cache.tier.MessageType;
+import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier;
+import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy;
+import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
+import com.gemstone.gemfire.internal.cache.tier.sockets.Part;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.internal.logging.LogService;
+import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
+import com.gemstone.gemfire.i18n.StringId;
+
+/**
+ * @author Rao Madduri
+ * @since 5.5
+ *
+ * Implements the CqService functionality.
+ * 
+ */
+/**
+ * @author agingade
+ *
+ */
+public final class CqServiceImpl implements CqService  {
+  private static final Logger logger = LogService.getLogger();
+  
+  /** 
+   * System property to evaluate the query even though the initial results are not required
+   * when cq is executed using the execute() method. 
+   */  
+  public static boolean EXECUTE_QUERY_DURING_INIT = 
+      Boolean.valueOf(System.getProperty("gemfire.cq.EXECUTE_QUERY_DURING_INIT", "true")).booleanValue(); 
+
+  private static final String CQ_NAME_PREFIX = "GfCq";
+  
+  private final Cache cache;
+  
+  /**
+   * Manages cq pools to determine if a status of connect or disconnect needs to be sent out
+   */
+  private final HashMap<String, Boolean> cqPoolsConnected = new HashMap<String, Boolean>();
+
+  
+  /** Manages CQ objects. uses serverCqName as key and CqQueryImpl as value 
+   * @guarded.By cqQueryMapLock
+   */
+  private volatile HashMap<String, CqQueryImpl> cqQueryMap = new HashMap<String, CqQueryImpl>();
+  private final Object cqQueryMapLock = new Object();
+  
+  private volatile boolean isRunning = false;
+
+  /**
+   * Used by client when multiuser-authentication is true.
+   */
+  private final HashMap<String, UserAttributes> cqNameToUserAttributesMap = new HashMap<String, UserAttributes>();
+  
+  // private boolean isServer = true;
+  
+  /*
+  // Map to manage CQ to satisfied CQ events (keys) for optimizing updates. 
+  private final HashMap cqToCqEventKeysMap = 
+      CqService.MAINTAIN_KEYS ? new HashMap() : null;
+  */
+  
+  // Map to manage the similar CQs (having same query - performance optimization).
+  // With query as key and Set of CQs as values.
+  private final HashMap<String, HashSet<String>> matchingCqMap;
+
+  // CQ Service statistics
+  public final CqServiceStatisticsImpl cqServiceStats;
+  public final CqServiceVsdStats stats;
+  
+  // CQ identifier, also used in auto generated CQ names
+  private volatile long cqId = 1;
+  
+  /**
+   * Used to synchronize access to CQs in the repository
+   */
+  final Object cqSync = new Object();
+    
+  /* This is to manage region to CQs map, client side book keeping. */
+  private HashMap<String, ArrayList<String>> baseRegionToCqNameMap = new HashMap<String, ArrayList<String>>();
+  
+  
+  /**
+   * Constructor. 
+   * @param c The cache used for the service
+   */
+  public CqServiceImpl(final Cache c) {
+    if (c == null) {
+      throw new IllegalStateException(LocalizedStrings.CqService_CACHE_IS_NULL.toLocalizedString());
+    }
+    GemFireCacheImpl gfc = (GemFireCacheImpl) c;
+    gfc.getCancelCriterion().checkCancelInProgress(null);
+
+    this.cache = gfc;
+
+    
+    // Initialize the Map which maintains the matching cqs.
+    this.matchingCqMap = new HashMap<String, HashSet<String>>();
+    
+    // Initialize the VSD statistics
+    StatisticsFactory factory = cache.getDistributedSystem();
+    this.stats = new CqServiceVsdStats(factory);
+    this.cqServiceStats  = new CqServiceStatisticsImpl(this);
+
+//    final LoggingThreadGroup group =
+//      LoggingThreadGroup.createThreadGroup("CqExecutor Threads", logger);
+    
+    //if (this.cache.getCacheServers().isEmpty()) {
+    //  isServer = false;
+    //}    
+  }
+  
+  /**
+   * Returns the cache associated with the cqService.
+   */
+  public Cache getCache() {
+    return this.cache;
+  }
+    
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqService#newCq(java.lang.String, java.lang.String, com.gemstone.gemfire.cache.query.CqAttributes, com.gemstone.gemfire.cache.client.internal.ServerCQProxy, boolean)
+   */
+  @Override
+  public synchronized ClientCQ newCq(String cqName, String queryString, CqAttributes cqAttributes, InternalPool pool, boolean isDurable)
+  throws QueryInvalidException, CqExistsException, CqException {
+    if (queryString == null) {
+      throw new IllegalArgumentException(LocalizedStrings.CqService_NULL_ARGUMENT_0.toLocalizedString("queryString"));
+
+    } else if (cqAttributes == null ) {
+      throw new IllegalArgumentException(LocalizedStrings.CqService_NULL_ARGUMENT_0.toLocalizedString("cqAttribute"));
+    }
+    
+    if (isServer()) {
+      throw new IllegalStateException(
+        LocalizedStrings.CqService_CLIENT_SIDE_NEWCQ_METHOD_INVOCATION_ON_SERVER.toLocalizedString());
+    }
+    
+    // Check if the given cq already exists.
+    if (cqName != null && isCqExists(cqName)) {
+      throw new CqExistsException(
+        LocalizedStrings.
+          CqService_CQ_WITH_THE_GIVEN_NAME_ALREADY_EXISTS_CQNAME_0
+        .toLocalizedString(cqName));
+    }
+    
+    
+    ServerCQProxyImpl serverProxy= pool == null ? null : new ServerCQProxyImpl(pool);
+    ClientCQImpl cQuery = new ClientCQImpl(this, cqName, queryString, cqAttributes, serverProxy, isDurable);
+    cQuery.updateCqCreateStats();
+
+    //cQuery.initCq();
+    
+    // Check if query is valid.  
+    cQuery.validateCq();
+    
+    // Add cq into meta region.    
+    // Check if Name needs to be generated.
+    if (cqName == null) {
+      // in the case of cqname internally generated, the CqExistsException needs
+      // to be taken care internally.
+      while(true) {
+        cQuery.setName(generateCqName());
+        try {
+          addToCqMap(cQuery);
+        } catch (CqExistsException ex) {
+          if (logger.isDebugEnabled()) {
+            logger.debug("Got CqExistsException while intializing cq : {} Error : {}", cQuery.getName(), ex.getMessage());
+          }
+          continue;
+        }
+        break;
+      } 
+    } else {
+      addToCqMap(cQuery);
+    }
+
+    this.addToBaseRegionToCqNameMap(cQuery.getBaseRegionName(), cQuery.getServerCqName());
+    
+    return cQuery;
+  }
+  
+
+  /**
+   * Executes the given CqQuery, if the CqQuery for that name is not there
+   * it registers the one and executes. This is called on the Server. 
+   * @param cqName
+   * @param queryString
+   * @param cqState
+   * @param clientProxyId
+   * @param ccn
+   * @param manageEmptyRegions whether to update the 6.1 emptyRegions map held in the CCN
+   * @param regionDataPolicy the data policy of the region associated with the
+   *        query.  This is only needed if manageEmptyRegions is true.
+   * @param emptyRegionsMap map of empty regions.    
+   * @throws IllegalStateException if this is called at client side.
+   * @throws CqException
+   */
+  @Override
+  public synchronized ServerCQ executeCq(String cqName, String queryString,
+      int cqState, ClientProxyMembershipID clientProxyId, 
+      CacheClientNotifier ccn, boolean isDurable, boolean manageEmptyRegions,
+      int regionDataPolicy, Map emptyRegionsMap) 
+    throws CqException, RegionNotFoundException, CqClosedException {
+    if (!isServer()) {
+      throw new IllegalStateException(
+          LocalizedStrings.CqService_SERVER_SIDE_EXECUTECQ_METHOD_IS_CALLED_ON_CLIENT_CQNAME_0
+              .toLocalizedString(cqName));
+    }
+    
+    String serverCqName = constructServerCqName(cqName, clientProxyId);
+    ServerCQImpl cQuery = null;
+    
+    // If this CQ is not yet registered in Server, register CQ.
+    if (!isCqExists(serverCqName)) {
+      cQuery = new ServerCQImpl(this, cqName, queryString, isDurable, constructServerCqName(cqName, clientProxyId));
+      
+      try {
+        cQuery.registerCq(clientProxyId, ccn, cqState);
+        if (manageEmptyRegions) { // new in 6.1
+          if (emptyRegionsMap != null && emptyRegionsMap.containsKey(cQuery.getBaseRegionName())){
+            regionDataPolicy = 0;
+          }
+          ccn.updateMapOfEmptyRegions(ccn.getClientProxy(clientProxyId, true).getRegionsWithEmptyDataPolicy(), 
+              cQuery.getBaseRegionName(), regionDataPolicy);
+        }
+      } catch (CqException cqe) {
+        logger.info(LocalizedMessage.create(LocalizedStrings.CqService_EXCEPTION_WHILE_REGISTERING_CQ_ON_SERVER_CQNAME___0, cQuery.getName()));
+        cQuery = null;
+        throw cqe;
+      }
+      
+    } else {
+      cQuery = (ServerCQImpl)getCq(serverCqName);
+      resumeCQ(cqState, cQuery);
+   }
+    
+    
+    if (logger.isDebugEnabled() ) {
+      logger.debug("Successfully created CQ on the server. CqName : {}", cQuery.getName());
+    }
+    return cQuery;
+  }
+
+  public void resumeCQ(int cqState, ServerCQ cQuery) {
+    // Initialize the state of CQ.
+    if(((CqStateImpl)cQuery.getState()).getState() != cqState) {
+      cQuery.setCqState(cqState);
+      // addToCqEventKeysMap(cQuery);
+      // Send state change info to peers.
+      cQuery.getCqBaseRegion().getFilterProfile().setCqState(cQuery);
+    }
+    //If we are going to set the state to running, we need to check to see if it matches any other cq
+    if (cqState == CqStateImpl.RUNNING) {
+      // Add to the matchedCqMap.
+        addToMatchingCqMap((CqQueryImpl) cQuery);    
+    }
+  }
+  
+  /*
+  public void addToCqEventKeysMap(CqQuery cq){
+    if (cqToCqEventKeysMap != null) {
+      synchronized (cqToCqEventKeysMap){
+        String serverCqName = ((CqQueryImpl)cq).getServerCqName();
+        if (!cqToCqEventKeysMap.containsKey(serverCqName)){
+          cqToCqEventKeysMap.put(serverCqName, new HashSet());
+          if (_logger.isDebugEnabled()) {
+            _logger.debug("CQ Event key maintenance for CQ, CqName: " + 
+              serverCqName + " is Enabled." + " key maintenance map size is: " +
+              cqToCqEventKeysMap.size());
+          }
+        }
+      } // synchronized
+    }    
+  }
+  */
+
+  public boolean hasCq(){
+    HashMap<String, CqQueryImpl> cqMap = cqQueryMap;
+    return (cqMap.size() > 0);
+  }
+  
+  
+  /**
+   * Adds the given CQ and cqQuery object into the CQ map.
+   */
+  public void addToCqMap(CqQueryImpl cq) throws CqExistsException, CqException {
+    // On server side cqName will be server side cqName.
+    String sCqName = cq.getServerCqName();
+    if (logger.isDebugEnabled()) {
+      logger.debug("Adding to CQ Repository. CqName : {} ServerCqName : {}", cq.getName(), sCqName);
+    }
+    HashMap<String, CqQueryImpl> cqMap = cqQueryMap;
+      if (cqMap.containsKey(sCqName)) {
+        throw new CqExistsException(
+          LocalizedStrings.CqService_A_CQ_WITH_THE_GIVEN_NAME_0_ALREADY_EXISTS.toLocalizedString(sCqName));
+      }
+      synchronized (cqQueryMapLock) {
+        HashMap<String, CqQueryImpl> tmpCqQueryMap = new HashMap<String, CqQueryImpl>(cqQueryMap);
+        try {
+          tmpCqQueryMap.put(sCqName, cq);
+        }catch (Exception ex){
+          StringId errMsg = LocalizedStrings.CqQueryImpl_FAILED_TO_STORE_CONTINUOUS_QUERY_IN_THE_REPOSITORY_CQNAME_0_1;
+          Object[] errMsgArgs = new Object[] {sCqName, ex.getLocalizedMessage()};
+          String s = errMsg.toLocalizedString(errMsgArgs);
+          logger.error(s);
+          throw new CqException(s, ex);
+        }    
+        UserAttributes attributes = UserAttributes.userAttributes.get();
+        if (attributes != null) {
+          this.cqNameToUserAttributesMap.put(cq.getName(), attributes);
+        }
+        cqQueryMap = tmpCqQueryMap;
+      }
+  }
+
+  /**
+   * Removes given CQ from the cqMap..
+   */
+  public void removeCq(String cqName) {
+    // On server side cqName will be server side cqName.
+    synchronized (cqQueryMapLock) {
+      HashMap<String, CqQueryImpl> tmpCqQueryMap = new HashMap<String, CqQueryImpl>(cqQueryMap);
+      tmpCqQueryMap.remove(cqName);
+      this.cqNameToUserAttributesMap.remove(cqName);
+      cqQueryMap = tmpCqQueryMap;
+    }
+  }
+  
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqService#getClientCqFromServer(com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID, java.lang.String)
+   */
+  @Override
+  public CqQuery getClientCqFromServer(ClientProxyMembershipID clientProxyId, String clientCqName) {
+    // On server side cqName will be server side cqName.
+    HashMap<String, CqQueryImpl> cqMap = cqQueryMap;
+    return (CqQuery)cqMap.get(this.constructServerCqName(clientCqName, clientProxyId));
+  }
+
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqService#getCq(java.lang.String)
+   */
+  @Override
+  public InternalCqQuery getCq(String cqName) {
+    // On server side cqName will be server side cqName.
+    return (InternalCqQuery)cqQueryMap.get(cqName);
+  }
+
+  /**
+   * Clears the CQ Query Map.
+   */
+  public void clearCqQueryMap() {
+    // On server side cqName will be server side cqName.
+    synchronized (cqQueryMapLock) {
+      cqQueryMap = new HashMap<String, CqQueryImpl>();
+    }
+  }
+
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqService#getAllCqs()
+   */
+  @Override
+  public Collection<? extends InternalCqQuery> getAllCqs(){
+    return cqQueryMap.values();
+  }
+
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqService#getAllCqs(java.lang.String)
+   */
+  @Override
+  public Collection<? extends InternalCqQuery> getAllCqs(final String regionName)throws CqException{
+    if (regionName == null){
+      throw new IllegalArgumentException(LocalizedStrings.CqService_NULL_ARGUMENT_0.toLocalizedString("regionName"));
+    }
+    
+    String[] cqNames = null;
+    
+    synchronized(this.baseRegionToCqNameMap){
+      ArrayList<String> cqs = this.baseRegionToCqNameMap.get(regionName);
+      if(cqs == null) {
+        return null;
+      }
+      cqNames = new String[cqs.size()];
+      cqs.toArray(cqNames);
+    }
+    
+    ArrayList<InternalCqQuery> cQueryList = new ArrayList<InternalCqQuery>();
+    for(int cqCnt=0; cqCnt < cqNames.length; cqCnt++){
+      InternalCqQuery cq = getCq(cqNames[cqCnt]);
+      if (cq != null){
+        cQueryList.add(cq);
+      }
+    }
+    
+    return cQueryList;
+  }
+
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqService#executeAllClientCqs()
+   */
+  @Override
+  public synchronized void executeAllClientCqs()throws CqException{
+    executeCqs(this.getAllCqs());
+  }
+  
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqService#executeAllRegionCqs(java.lang.String)
+   */
+  @Override
+  public synchronized void executeAllRegionCqs(final String regionName)throws CqException{
+     executeCqs(getAllCqs(regionName));
+  }
+  
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqService#executeCqs(com.gemstone.gemfire.cache.query.CqQuery[])
+   */
+  @Override
+  public synchronized void executeCqs(Collection<? extends InternalCqQuery> cqs)throws CqException{
+    if(cqs == null) {
+      return;
+    }
+    String cqName = null;
+    for (InternalCqQuery internalCq : cqs) {
+      CqQuery cq = (CqQuery) internalCq;
+      if (!cq.isClosed() && cq.isStopped()) {
+        try {
+          cqName = cq.getName();
+          cq.execute();
+        } catch (QueryException qe) {
+          if (logger.isDebugEnabled()) {
+            logger.debug("Failed to execute the CQ, CqName : {} Error : {}", cqName, qe.getMessage());
+          }
+        } catch (CqClosedException cce){
+          if (logger.isDebugEnabled()) {
+            logger.debug("Failed to execute the CQ, CqName : {} Error : {}", cqName, cce.getMessage());
+          }
+        }
+      }
+    }    
+  }
+  
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqService#stopAllClientCqs()
+   */
+  @Override
+  public synchronized void stopAllClientCqs()throws CqException{
+    stopCqs(this.getAllCqs());
+  }
+  
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqService#stopAllRegionCqs(java.lang.String)
+   */
+  @Override
+  public synchronized void stopAllRegionCqs(final String regionName)throws CqException{
+    stopCqs(this.getAllCqs(regionName));
+  }
+  
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqService#stopCqs(com.gemstone.gemfire.cache.query.CqQuery[])
+   */
+  @Override
+  public synchronized void stopCqs(Collection<? extends InternalCqQuery> cqs)throws CqException{
+    final boolean isDebugEnabled = logger.isDebugEnabled();
+    if (isDebugEnabled) {
+      if (cqs == null) {
+        logger.debug("CqService.stopCqs cqs : null");
+      } else {
+        logger.debug("CqService.stopCqs cqs : ({} queries)", cqs.size());
+      }
+    }
+
+    if(cqs == null) {
+      return;
+    }
+    
+    String cqName = null;
+    for (InternalCqQuery internalCqQuery : cqs) {
+      CqQuery cq = (CqQuery) internalCqQuery;
+      if (!cq.isClosed() && cq.isRunning()) {
+        try {
+          cqName = cq.getName();
+          cq.stop();
+        } catch (QueryException qe) {
+          if (isDebugEnabled){
+            logger.debug("Failed to stop the CQ, CqName : {} Error : {}", cqName, qe.getMessage());
+          }
+        } catch (CqClosedException cce){
+          if (isDebugEnabled){
+            logger.debug("Failed to stop the CQ, CqName : {} Error : {}", cqName, cce.getMessage());
+          }
+        }
+      }
+    }
+  }
+
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqService#closeCqs(java.lang.String)
+   */
+  @Override
+  public void closeCqs(final String regionName)throws CqException{
+    Collection<? extends InternalCqQuery> cqs = this.getAllCqs(regionName);
+    if(cqs != null) {
+      String cqName = null;
+      for (InternalCqQuery cq: cqs) {
+        try {
+          cqName = cq.getName();
+          
+          if(isServer()) {
+            // invoked on the server
+            cq.close(false);  
+          } else { 
+            // @todo grid: if regionName has a pool check its keepAlive
+            boolean keepAlive = ((GemFireCacheImpl)this.cache).keepDurableSubscriptionsAlive();
+            if(cq.isDurable() && keepAlive){
+              logger.warn(LocalizedMessage.create(LocalizedStrings.CqService_NOT_SENDING_CQ_CLOSE_TO_THE_SERVER_AS_IT_IS_A_DURABLE_CQ));
+              cq.close(false);  
+            } 
+            else {
+              cq.close(true);
+            }
+          }
+
+        } catch (QueryException qe) {
+          if (logger.isDebugEnabled()) {
+            logger.debug("Failed to close the CQ, CqName : {} Error : {}", cqName, qe.getMessage());
+          }
+        } catch (CqClosedException cce) {
+          if (logger.isDebugEnabled()) {
+            logger.debug("Failed to close the CQ, CqName : {} Error : {}", cqName, cce.getMessage());
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Called directly on server side.
+   * @param cqName
+   * @param clientId
+   * @throws CqException
+   */
+  @Override
+  public void stopCq(String cqName, ClientProxyMembershipID clientId)
+  throws CqException {
+    String serverCqName = cqName;
+    if (clientId != null) {
+      serverCqName = this.constructServerCqName(cqName, clientId); 
+    }
+  
+    ServerCQImpl cQuery = null;
+    StringId errMsg = null;
+    Exception ex = null;
+    
+    try {
+      HashMap<String, CqQueryImpl> cqMap = cqQueryMap;
+      if (!cqMap.containsKey(serverCqName)) {
+//        throw new CqException(LocalizedStrings.CqService_CQ_NOT_FOUND_FAILED_TO_STOP_THE_SPECIFIED_CQ_0.toLocalizedString(serverCqName));
+        /* gregp 052808: We should silently fail here instead of throwing error. This is to deal with races in recovery */
+        return;
+      }
+      cQuery = (ServerCQImpl)getCq(serverCqName);
+      
+    } catch (CacheLoaderException e1) {
+      errMsg = LocalizedStrings.CqService_CQ_NOT_FOUND_IN_THE_CQ_META_REGION_CQNAME_0;
+      ex = e1;
+    } catch (TimeoutException e2) {
+      errMsg = LocalizedStrings.CqService_TIMEOUT_WHILE_TRYING_TO_GET_CQ_FROM_META_REGION_CQNAME_0;
+      ex = e2;
+    } finally {
+      if (ex != null){
+        String s = errMsg.toLocalizedString(cqName);
+        if (logger.isDebugEnabled()) {
+          logger.debug(s);
+        }
+        throw new CqException(s, ex);
+      }
+    }
+    
+    try {
+      if(!cQuery.isStopped()) {
+        cQuery.stop();
+      }
+    } catch (CqClosedException cce){
+      throw new CqException(cce.getMessage());
+    } finally {
+      // If this CQ is stopped, disable caching event keys for this CQ.
+      //this.removeCQFromCaching(cQuery.getServerCqName());
+      this.removeFromMatchingCqMap(cQuery);
+    }
+    // Send stop message to peers.
+    cQuery.getCqBaseRegion().getFilterProfile().stopCq(cQuery);
+
+  }
+
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqService#closeCq(java.lang.String, com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID)
+   */
+  @Override
+  public void closeCq(String cqName, ClientProxyMembershipID clientProxyId)
+  throws CqException {
+    String serverCqName = cqName;
+    if (clientProxyId != null) {
+      serverCqName = this.constructServerCqName(cqName, clientProxyId); 
+    }
+    
+    ServerCQImpl cQuery = null;
+    StringId errMsg = null;
+    Exception ex = null;
+    
+    try {
+      HashMap<String, CqQueryImpl> cqMap = cqQueryMap;
+      if (!cqMap.containsKey(serverCqName)) {
+//        throw new CqException(LocalizedStrings.CqService_CQ_NOT_FOUND_FAILED_TO_CLOSE_THE_SPECIFIED_CQ_0
+//            .toLocalizedString(serverCqName));
+        /* gregp 052808: We should silently fail here instead of throwing error. This is to deal with races in recovery */
+        return;
+      }
+      cQuery = (ServerCQImpl)cqMap.get(serverCqName);
+      
+    } catch (CacheLoaderException e1) {
+      errMsg = LocalizedStrings.CqService_CQ_NOT_FOUND_IN_THE_CQ_META_REGION_CQNAME_0;
+      ex = e1;
+    } catch (TimeoutException e2) {
+      errMsg = LocalizedStrings.CqService_TIMEOUT_WHILE_TRYING_TO_GET_CQ_FROM_META_REGION_CQNAME_0;
+      ex = e2;
+    } finally {
+      if (ex != null){
+        String s = errMsg.toLocalizedString(cqName);
+        if (logger.isDebugEnabled()) {
+          logger.debug(s);
+        }
+        throw new CqException(s, ex);
+      }
+    }
+    
+    try {
+      cQuery.close(false);
+
+      // Repository Region.
+      // If CQ event caching is enabled, remove this CQs event cache reference.
+      // removeCQFromCaching(serverCqName);
+      
+      // CqBaseRegion 
+      try {
+        LocalRegion baseRegion = cQuery.getCqBaseRegion();
+        if (baseRegion != null && !baseRegion.isDestroyed()) {
+          // Server specific clean up.
+          if (isServer()){
+            FilterProfile fp = baseRegion.getFilterProfile();
+            if (fp != null) {
+              fp.closeCq(cQuery);
+            }
+            CacheClientProxy clientProxy = cQuery.getCacheClientNotifier().getClientProxy(clientProxyId);
+            clientProxy.decCqCount();
+            if (clientProxy.hasNoCq()) {
+              this.stats.decClientsWithCqs();
+            }
+          }
+        } 
+      }catch (Exception e){
+        // May be cache is being shutdown
+        if (logger.isDebugEnabled()) {
+          logger.debug("Failed to remove CQ from the base region. CqName : {}", cqName);
+        }
+      }
+    
+      if (isServer()){
+        removeFromBaseRegionToCqNameMap(cQuery.getRegionName(), serverCqName);      
+      }
+
+      LocalRegion baseRegion = cQuery.getCqBaseRegion();
+      if(baseRegion.getFilterProfile().getCqCount() <= 0){
+        if (logger.isDebugEnabled()) {
+          logger.debug("Should update the profile for this partitioned region {} for not requiring old value", baseRegion);
+        }
+      }
+    } catch (CqClosedException cce){
+      throw new CqException(cce.getMessage());
+    } finally {
+      this.removeFromMatchingCqMap(cQuery);
+    }
+  }
+  
+  
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqService#closeAllCqs(boolean)
+   */
+  @Override
+  public void closeAllCqs(boolean clientInitiated) {
+    closeAllCqs(clientInitiated, getAllCqs());
+  }
+
+  /** 
+   * Close all CQs executing in this VM, and release resources
+   * associated with executing CQs.
+   * CqQuerys created by other VMs are unaffected.
+   */
+  private void closeAllCqs(boolean clientInitiated, Collection<? extends InternalCqQuery> cqs) {
+    closeAllCqs(clientInitiated, cqs, ((GemFireCacheImpl)this.cache)
+        .keepDurableSubscriptionsAlive());
+  }
+
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqService#closeAllCqs(boolean, com.gemstone.gemfire.cache.query.CqQuery[], boolean)
+   */
+  @Override
+  public void closeAllCqs(boolean clientInitiated, Collection<? extends InternalCqQuery> cqs,
+      boolean keepAlive) {
+    
+    //CqQuery[] cqs = getAllCqs();
+    if (cqs != null) {
+      String cqName = null;
+      if (logger.isDebugEnabled()){
+        logger.debug("Closing all CQs, number of CQ to be closed : {}", cqs.size());
+      }
+      for (InternalCqQuery cQuery: cqs){
+        try {
+          cqName = cQuery.getName();
+//          boolean keepAlive = ((GemFireCache)this.cache).keepDurableSubscriptionsAlive();
+         
+          if(isServer()) {
+            cQuery.close(false);  
+          } else {
+            if (clientInitiated) {
+              cQuery.close(true);
+            } 
+            else {
+              if(!isServer() && cQuery.isDurable() && keepAlive){
+                logger.warn(LocalizedMessage.create(LocalizedStrings.CqService_NOT_SENDING_CQ_CLOSE_TO_THE_SERVER_AS_IT_IS_A_DURABLE_CQ));
+                cQuery.close(false);
+              }
+              else {
+                cQuery.close(true);
+              }
+            }
+          }
+        } catch (QueryException cqe) {
+          if (!isRunning()) {
+            // Not cache shutdown
+            logger.warn(LocalizedMessage.create(LocalizedStrings.CqService_FAILED_TO_CLOSE_CQ__0___1, new Object[] {cqName, cqe.getMessage()}));
+          }
+          if (logger.isDebugEnabled()) {
+            logger.debug(cqe.getMessage(), cqe);
+          }
+        } catch (CqClosedException cqe){
+          if (!isRunning()) {
+            // Not cache shutdown
+            logger.warn(LocalizedMessage.create(LocalizedStrings.CqService_FAILED_TO_CLOSE_CQ__0___1, new Object[] {cqName, cqe.getMessage()}));
+          }
+          if (logger.isDebugEnabled()) {
+            logger.debug(cqe.getMessage(), cqe);
+          } 
+        }
+      }
+    }
+  }
+  
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqService#getCqStatistics()
+   */
+  @Override
+  public CqServiceStatistics getCqStatistics() {
+    return cqServiceStats;
+  }
+  
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqService#closeClientCqs(com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID)
+   */
+  @Override
+  public void closeClientCqs(ClientProxyMembershipID clientProxyId)
+  throws CqException {
+    final boolean isDebugEnabled = logger.isDebugEnabled();
+    if (isDebugEnabled) {
+      logger.debug("Closing Client CQs for the client: {}", clientProxyId);
+    }
+    List<ServerCQ> cqs = getAllClientCqs(clientProxyId);
+    for (ServerCQ cq: cqs) {
+      CqQueryImpl cQuery = (CqQueryImpl)cq;
+      try {
+        cQuery.close(false);
+      } catch (QueryException qe) {
+        if (isDebugEnabled) {
+          logger.debug("Failed to close the CQ, CqName : {} Error : {}", cQuery.getName(), qe.getMessage());
+        }
+      } catch (CqClosedException cce) {
+        if (isDebugEnabled) {
+          logger.debug("Failed to close the CQ, CqName : {} Error : {}", cQuery.getName(), cce.getMessage());
+        }
+      }
+    }
+  }
+
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqService#getAllClientCqs(com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID)
+   */
+  @Override
+  public List<ServerCQ> getAllClientCqs(ClientProxyMembershipID clientProxyId){
+    Collection<? extends InternalCqQuery> cqs = getAllCqs();
+    ArrayList<ServerCQ> clientCqs = new ArrayList<ServerCQ>();
+    
+    for (InternalCqQuery cq: cqs) {
+      ServerCQImpl cQuery = (ServerCQImpl)cq;
+      ClientProxyMembershipID id = cQuery.getClientProxyId(); 
+      if (id != null && id.equals(clientProxyId)) {
+          clientCqs.add(cQuery);
+      }
+    }
+    return clientCqs;   
+  }
+  
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqService#getAllDurableClientCqs(com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID)
+   */
+  @Override
+  public List<String> getAllDurableClientCqs(ClientProxyMembershipID clientProxyId) throws CqException {
+    if (clientProxyId == null) {
+      throw new CqException (LocalizedStrings.CqService_UNABLE_TO_RETRIEVE_DURABLE_CQS_FOR_CLIENT_PROXY_ID.toLocalizedString(clientProxyId));
+    }
+    List<ServerCQ> cqs = getAllClientCqs(clientProxyId);
+    ArrayList<String> durableClientCqs = new ArrayList<String>();
+    
+    for (ServerCQ cq: cqs) {
+      ServerCQImpl cQuery = (ServerCQImpl)cq;
+      if (cQuery != null && cQuery.isDurable()) {
+        ClientProxyMembershipID id = cQuery.getClientProxyId(); 
+        if (id != null && id.equals(clientProxyId)) {
+            durableClientCqs.add(cQuery.getName());
+        }
+      }
+    }
+    return durableClientCqs;   
+  }
+  
+  /**
+   * Server side method.
+   * Closes non-durable CQs for the given client proxy id.
+   * @param clientProxyId
+   * @throws CqException
+   */
+  @Override
+  public void closeNonDurableClientCqs(ClientProxyMembershipID clientProxyId)
+  throws CqException {
+    final boolean isDebugEnabled = logger.isDebugEnabled();
+    if (isDebugEnabled) {
+      logger.debug("Closing Client CQs for the client: {}", clientProxyId);
+    }
+    List<ServerCQ> cqs = getAllClientCqs(clientProxyId);
+    for (ServerCQ cq: cqs) {
+      ServerCQImpl cQuery = (ServerCQImpl)cq;
+      try {
+        if (!cQuery.isDurable()) {
+          cQuery.close(false);
+        }
+      } catch (QueryException qe) {
+        if (isDebugEnabled) {
+          logger.debug("Failed to close the CQ, CqName : {} Error : {}", cQuery.getName(), qe.getMessage());
+        }
+      } catch (CqClosedException cce) {
+        if (isDebugEnabled) {
+          logger.debug("Failed to close the CQ, CqName : {} Error : {}", cQuery.getName(), cce.getMessage());
+        }
+      }
+    }
+  }
+  
+  /**
+   * Is the CQ service in a cache server environment
+   * @return true if cache server, false otherwise
+   */
+  public boolean isServer() {
+    if (this.cache.getCacheServers().isEmpty()) {
+      return false;
+    }    
+    return true;
+  }
+  
+  /**
+   * Cleans up the CqService.
+   */
+  @Override
+  public void close() {
+    if (logger.isDebugEnabled()){
+      logger.debug("Closing CqService. {}", this);
+    }
+    // Close All the CQs.
+    // Need to take care when Clients are still connected...
+    closeAllCqs(false);
+    isRunning = false;
+  }
+  
+  @Override
+  public boolean isRunning() {
+    return this.isRunning;
+  }
+  
+  public void start() {
+    this.isRunning = true;
+  }
+  
+  /**
+   * @return Returns the serverCqName.
+   */
+  @Override
+  public String constructServerCqName(String cqName, ClientProxyMembershipID clientProxyId) {
+    String cName = null;
+    if (clientProxyId.isDurable()) {
+      cName = cqName + "__" + clientProxyId.getDurableId();
+    }
+    else {
+      cName = cqName + "__" + clientProxyId.getDSMembership();
+    }
+    return cName;
+  }
+  
+  /*
+   * Checks if CQ with the given name already exists.
+   * @param cqName name of the CQ.
+   * @return true if exists else false.
+   */
+  private synchronized boolean isCqExists(String cqName) {
+    boolean status = false;
+    HashMap<String, CqQueryImpl> cqMap =cqQueryMap;
+    status = cqMap.containsKey(cqName);
+    return status;
+  }
+
+  /*
+   * Generates a name for CQ.
+   * Checks if CQ with that name already exists if so generates a new cqName.
+   */
+  public synchronized String generateCqName() {
+    while (true) {
+      String cqName = CQ_NAME_PREFIX + (cqId++);
+      if (!isCqExists(cqName)) {
+        return cqName;
+      }
+    }
+  }
+  
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqService#dispatchCqListeners(java.util.HashMap, int, java.lang.Object, java.lang.Object, byte[], com.gemstone.gemfire.cache.client.internal.QueueManager, com.gemstone.gemfire.internal.cache.EventID)
+   */
+  @Override
+  public void dispatchCqListeners(HashMap<String, Integer> cqs, int messageType, Object key,
+      Object value, byte[] delta, QueueManager qManager, EventID eventId) {
+    ClientCQImpl cQuery = null;
+    Object[] fullValue = new Object[1];
+    Iterator<Map.Entry<String, Integer>> iter = cqs.entrySet().iterator();
+    String cqName = null;
+    final boolean isDebugEnabled = logger.isDebugEnabled();
+    while (iter.hasNext()) {
+      try {
+      Map.Entry<String, Integer> entry = iter.next();
+      cqName = entry.getKey();
+      cQuery = (ClientCQImpl) this.getCq(cqName);
+      
+      if (cQuery == null || (!cQuery.isRunning() && cQuery.getQueuedEvents() == null)) {
+        if (isDebugEnabled) {
+          logger.debug("Unable to invoke CqListener, {}, CqName : {}", ((cQuery == null)? "CQ not found":" CQ is Not running"), cqName);
+        }
+        continue;
+      }
+      
+      Integer cqOp = (Integer)entry.getValue();
+      
+      // If Region destroy event, close the cq.
+      if (cqOp.intValue() == MessageType.DESTROY_REGION) {
+        // The close will also invoke the listeners close().
+        try {
+          cQuery.close(false);
+        } catch (Exception ex) {
+          // handle?
+        }
+        continue;
+      }
+      
+      // Construct CqEvent.
+      CqEventImpl cqEvent = null;
+      cqEvent = new CqEventImpl(cQuery, getOperation(messageType),
+          getOperation(cqOp.intValue()), key, value, delta, qManager, eventId);
+      
+      // Update statistics
+      cQuery.updateStats(cqEvent);
+
+      // Check if CQ Event needs to be queued.
+      if (cQuery.getQueuedEvents() != null) {
+        synchronized(cQuery.queuedEventsSynchObject) {
+          // Get latest value.
+          ConcurrentLinkedQueue<CqEventImpl> queuedEvents = cQuery.getQueuedEvents();
+          // Check to see, if its not set to null while waiting to get 
+          // Synchronization lock.
+          if (queuedEvents != null) {
+            if (isDebugEnabled) {
+              logger.debug("Queueing event for key: {}", key);
+            }
+            cQuery.getVsdStats().incQueuedCqListenerEvents();
+            queuedEvents.add(cqEvent);
+            continue;
+          }
+        }
+      }
+
+      this.invokeListeners(cqName, cQuery, cqEvent, fullValue);
+      if (value == null) {
+        value = fullValue[0];
+      }
+
+      } // outer try
+      catch(Throwable t) {
+        logger.warn(LocalizedMessage.create(LocalizedStrings.CqService_ERROR_PROCESSING_CQLISTENER_FOR_CQ_0, cqName), t);
+        
+        if (t instanceof VirtualMachineError) {
+          logger.warn(LocalizedMessage.create(LocalizedStrings.CqService_VIRTUALMACHINEERROR_PROCESSING_CQLISTENER_FOR_CQ_0, cqName), t);
+          return;
+        }
+      }
+    } // iteration.
+  }
+
+  public void invokeListeners(String cqName, ClientCQImpl cQuery,
+      CqEventImpl cqEvent) {
+    invokeListeners(cqName, cQuery, cqEvent, null);
+  }
+
+  public void invokeListeners(String cqName, ClientCQImpl cQuery,
+      CqEventImpl cqEvent, Object[] fullValue) {
+    if (!cQuery.isRunning() || cQuery.getCqAttributes() == null) {
+      return;
+    }
+    
+    // invoke CQ Listeners.
+    CqListener[] cqListeners = cQuery.getCqAttributes().getCqListeners();
+    
+    final boolean isDebugEnabled = logger.isDebugEnabled();
+    if (isDebugEnabled) {
+      logger.debug("Invoking CQ listeners for {}, number of listeners : {} cqEvent : {}", cqName, cqListeners.length, cqEvent);
+    }
+    
+    for (int lCnt=0; lCnt < cqListeners.length; lCnt++) {
+      try {
+        // Check if the listener is not null, it could have been changed/reset
+        // by the CqAttributeMutator.
+        if (cqListeners[lCnt] != null){
+          cQuery.getVsdStats().incNumCqListenerInvocations();
+          try {
+          if (cqEvent.getThrowable() != null) {
+            cqListeners[lCnt].onError(cqEvent);
+          } else {
+            cqListeners[lCnt].onEvent(cqEvent);
+          }
+          } catch (InvalidDeltaException ide) {
+            if (isDebugEnabled) {
+              logger.debug("CqService.dispatchCqListeners(): Requesting full value...");
+            }
+            Part result = (Part)GetEventValueOp.executeOnPrimary(cqEvent
+                .getQueueManager().getPool(), cqEvent.getEventID(), null);
+            Object newVal = null;
+            if (result == null || (newVal = result.getObject()) == null) {
+              if (this.cache.getCancelCriterion().cancelInProgress() == null) {
+                Exception ex = new Exception(
+                    "Failed to retrieve full value from server for eventID "
+                    + cqEvent.getEventID());
+                logger.warn(LocalizedMessage.create(
+                    LocalizedStrings.CqService_EXCEPTION_IN_THE_CQLISTENER_OF_THE_CQ_CQNAME_0_ERROR__1,
+                    new Object[] { cqName, ex.getMessage() }));
+                if (isDebugEnabled) {
+                  logger.debug(ex.getMessage(), ex);
+                }
+              }
+            }
+            else {
+              ((GemFireCacheImpl)this.cache).getCachePerfStats().incDeltaFullValuesRequested();
+              cqEvent = new CqEventImpl(cQuery, cqEvent.getBaseOperation(),
+                    cqEvent.getQueryOperation(), cqEvent.getKey(), newVal,
+                    cqEvent.getDeltaValue(), cqEvent.getQueueManager(), cqEvent.getEventID());
+              if (cqEvent.getThrowable() != null) {
+                cqListeners[lCnt].onError(cqEvent);
+              } else {
+                cqListeners[lCnt].onEvent(cqEvent);
+              }
+              if (fullValue != null) {
+                fullValue[0] = newVal;
+              }
+            }
+          }
+        }
+        // Handle client side exceptions.
+      } catch (Exception ex) {
+        if (this.cache.getCancelCriterion().cancelInProgress() == null) {
+          logger.warn(LocalizedMessage.create(
+              LocalizedStrings.CqService_EXCEPTION_IN_THE_CQLISTENER_OF_THE_CQ_CQNAME_0_ERROR__1,
+              new Object[] { cqName, ex.getMessage()}));
+          if (isDebugEnabled) {
+            logger.debug(ex.getMessage(), ex);
+          }
+        }
+      } 
+      catch (VirtualMachineError err) {
+        SystemFailure.initiateFailure(err);
+        // If this ever returns, rethrow the error.  We're poisoned
+        // now, so don't let this thread continue.
+        throw err;
+      }
+      catch (Throwable t) {
+        // Whenever you catch Error or Throwable, you must also
+        // catch VirtualMachineError (see above).  However, there is
+        // _still_ a possibility that you are dealing with a cascading
+        // error condition, so you also need to check to see if the JVM
+        // is still usable:
+        SystemFailure.checkFailure();
+        logger.warn(LocalizedMessage.create(LocalizedStrings.CqService_RUNTIME_EXCEPTION_IN_THE_CQLISTENER_OF_THE_CQ_CQNAME_0_ERROR__1, new Object[] {cqName, t.getLocalizedMessage()}));
+        if (isDebugEnabled) {
+          logger.debug(t.getMessage(), t);
+        }
+      }      
+    }    
+  }
+  
+  public void invokeCqConnectedListeners(String cqName, ClientCQImpl cQuery, boolean connected) {
+    if (!cQuery.isRunning() || cQuery.getCqAttributes() == null) {
+      return;
+    }
+    cQuery.setConnected(connected);
+    // invoke CQ Listeners.
+    CqListener[] cqListeners = cQuery.getCqAttributes().getCqListeners();
+    
+    if (logger.isDebugEnabled()){
+      logger.debug("Invoking CQ status listeners for {}, number of listeners : {}", cqName, cqListeners.length);
+    }
+    
+    for (int lCnt=0; lCnt < cqListeners.length; lCnt++) {
+      try {
+        if (cqListeners[lCnt] != null) {
+          if (cqListeners[lCnt] instanceof CqStatusListener) {
+            CqStatusListener listener = (CqStatusListener) cqListeners[lCnt];
+            if (connected) {
+              listener.onCqConnected();
+            }
+            else {
+              listener.onCqDisconnected();
+            }
+          }
+        }
+        // Handle client side exceptions.
+      } catch (Exception ex) {
+        if (this.cache.getCancelCriterion().cancelInProgress() == null) {
+          logger.warn(LocalizedMessage.create(
+              LocalizedStrings.CqService_EXCEPTION_IN_THE_CQLISTENER_OF_THE_CQ_CQNAME_0_ERROR__1,
+              new Object[] { cqName, ex.getMessage()}));
+          if (logger.isDebugEnabled()) {
+            logger.debug(ex.getMessage(), ex);
+          }
+        }
+      } 
+      catch (VirtualMachineError err) {
+        SystemFailure.initiateFailure(err);
+        // If this ever returns, rethrow the error.  We're poisoned
+        // now, so don't let this thread continue.
+        throw err;
+      }
+      catch (Throwable t) {
+        // Whenever you catch Error or Throwable, you must also
+        // catch VirtualMachineError (see above).  However, there is
+        // _still_ a possibility that you are dealing with a cascading
+        // error condition, so you also need to check to see if the JVM
+        // is still usable:
+        SystemFailure.checkFailure();
+        logger.warn(LocalizedMessage.create(LocalizedStrings.CqService_RUNTIME_EXCEPTION_IN_THE_CQLISTENER_OF_THE_CQ_CQNAME_0_ERROR__1, new Object[] {cqName, t.getLocalizedMessage()}));
+        if (logger.isDebugEnabled()) {
+          logger.debug(t.getMessage(), t);
+        }
+      }      
+    }    
+  }
+  
+  
+  /**
+   * Returns the Operation for the given EnumListenerEvent type.
+   * @param eventType
+   * @return Operation
+   */
+  private Operation getOperation(int eventType) {  
+    Operation op = null;
+    switch (eventType) {
+      case MessageType.LOCAL_CREATE :
+        op = Operation.CREATE;
+        break;
+        
+      case MessageType.LOCAL_UPDATE :
+        op = Operation.UPDATE;
+        break;
+        
+      case MessageType.LOCAL_DESTROY :
+        op = Operation.DESTROY;
+        break;        
+        
+      case MessageType.LOCAL_INVALIDATE :
+        op = Operation.INVALIDATE;
+        break;        
+        
+      case MessageType.CLEAR_REGION :
+        op = Operation.REGION_CLEAR;
+        break;        
+        
+      case MessageType.INVALIDATE_REGION :
+        op = Operation.REGION_INVALIDATE;
+        break;        
+    }
+    return op;    
+  }
+
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqService#processEvents(com.gemstone.gemfire.cache.CacheEvent, com.gemstone.gemfire.distributed.internal.DistributionAdvisor.Profile, com.gemstone.gemfire.distributed.internal.DistributionAdvisor.Profile[], com.gemstone.gemfire.internal.cache.FilterRoutingInfo)
+   */
+  @Override
+  public void processEvents (CacheEvent event, Profile localProfile, Profile[] profiles, FilterRoutingInfo frInfo) 
+    throws CqException {
+    //Is this a region event or an entry event
+    if (event instanceof RegionEvent){
+      processRegionEvent(event, localProfile, profiles, frInfo);
+    } else {
+      // Use the PDX types in serialized form.
+      DefaultQuery.setPdxReadSerialized(this.cache, true);
+      try {
+        processEntryEvent (event, localProfile, profiles, frInfo);
+      } finally {
+        DefaultQuery.setPdxReadSerialized(this.cache, false);
+      }
+    }
+  }
+
+  private void processRegionEvent(CacheEvent event, Profile localProfile, Profile[] profiles, FilterRoutingInfo frInfo)  
+    throws CqException {
+
+    final boolean isDebugEnabled = logger.isDebugEnabled();
+    if (isDebugEnabled) {
+      logger.debug("CQ service processing region event {}", event); 
+    }
+    Integer cqRegionEvent = generateCqRegionEvent(event);
+    
+    for (int i=-1; i < profiles.length; i++) {
+      CacheProfile cf;
+      if (i<0) {
+        cf = (CacheProfile)localProfile;
+        if (cf == null) continue;
+      } else {
+        cf = (CacheProfile)profiles[i];
+      }
+      FilterProfile pf = cf.filterProfile;
+      if (pf == null || pf.getCqMap().isEmpty()) {
+        continue;
+      }
+      Map cqs = pf.getCqMap();
+      HashMap<Long, Integer> cqInfo = new HashMap<Long, Integer>();
+      Iterator cqIter = cqs.entrySet().iterator();
+      while (cqIter.hasNext()){
+        Map.Entry cqEntry = (Map.Entry)cqIter.next();
+        ServerCQImpl cQuery = (ServerCQImpl)cqEntry.getValue();
+        if (!event.isOriginRemote() && event.getOperation().isRegionDestroy() &&
+            !((LocalRegion)event.getRegion()).isUsedForPartitionedRegionBucket()) {
+          try {
+            if (isDebugEnabled){
+              logger.debug("Closing CQ on region destroy event. CqName : {}", cQuery.getName());
+            }
+            cQuery.close(false);
+          } 
+          catch (Exception ex) {
+            if (isDebugEnabled) {
+              logger.debug("Failed to Close CQ on region destroy. CqName : {}", cQuery.getName(), ex);
+            }
+          }      
+        }
+        cqInfo.put(cQuery.getFilterID(), cqRegionEvent);
+        cQuery.getVsdStats().updateStats(cqRegionEvent);
+      }
+      if(pf.isLocalProfile()){
+        frInfo.setLocalCqInfo(cqInfo);
+      } else {
+        frInfo.setCqRoutingInfo(cf.getDistributedMember(), cqInfo);
+      }
+    }
+  }
+
+  private void processEntryEvent(CacheEvent event, Profile localProfile, Profile[] profiles, FilterRoutingInfo frInfo)
+  throws CqException {
+    final boolean isDebugEnabled = logger.isDebugEnabled();
+    HashSet<Object> cqUnfilteredEventsSet_newValue = new HashSet<Object>();
+    HashSet<Object> cqUnfilteredEventsSet_oldValue = new HashSet<Object>();
+    boolean b_cqResults_newValue = false;
+    boolean b_cqResults_oldValue = false;
+    boolean queryOldValue;
+    EntryEvent entryEvent = (EntryEvent)event;
+    Object eventKey = entryEvent.getKey();
+   
+    boolean isDupEvent = ((EntryEventImpl)event).isPossibleDuplicate();
+    // The CQ query needs to be applied when the op is update, destroy
+    // invalidate and in case when op is create and its an duplicate 
+    // event, the reason for this is when peer sends a duplicate event
+    // it marks it as create and sends it, so that the receiving node
+    // applies it (see DR.virtualPut()).
+    boolean opRequiringQueryOnOldValue = (event.getOperation().isUpdate() || 
+        event.getOperation().isDestroy() ||
+        event.getOperation().isInvalidate() || 
+        (event.getOperation().isCreate() && isDupEvent));
+
+    HashMap<String, Integer> matchedCqs = new HashMap<String, Integer>();
+    long executionStartTime = 0;
+    for (int i=-1; i < profiles.length; i++) {
+      CacheProfile cf;
+      if (i<0) {
+        cf = (CacheProfile)localProfile;
+        if (cf == null) continue;
+      } else {
+        cf = (CacheProfile)profiles[i];
+      }
+      FilterProfile pf = cf.filterProfile;
+      if (pf == null || pf.getCqMap().isEmpty()) {
+        continue;
+      }
+
+      Map cqs = pf.getCqMap();
+      
+      if (isDebugEnabled) {
+        logger.debug("Profile for {} processing {} CQs", cf.peerMemberId, cqs.size());
+      }
+
+      if (cqs.isEmpty()) {
+        continue;
+      }
+      
+      
+      // Get new value. If its not retrieved.
+      if (cqUnfilteredEventsSet_newValue.isEmpty() && (event.getOperation().isCreate() ||  event.getOperation().isUpdate())) {
+        Object newValue = entryEvent.getNewValue(); // TODO OFFHEAP: optimize by not copying the value on to the heap
+        if (newValue != null) {
+          //We have a new value to run the query on
+          cqUnfilteredEventsSet_newValue.add(newValue);
+        }
+      }
+      
+      HashMap<Long, Integer> cqInfo = new HashMap<Long, Integer>();
+      Iterator cqIter = cqs.entrySet().iterator();
+      
+      while (cqIter.hasNext()){
+        Map.Entry cqEntry = (Map.Entry)cqIter.next();
+        ServerCQImpl cQuery = (ServerCQImpl)cqEntry.getValue();
+        b_cqResults_newValue = false;
+        b_cqResults_oldValue = false;
+        queryOldValue = false;
+        if (cQuery == null){
+          continue;
+        }        
+        String cqName = cQuery.getServerCqName();
+        Long filterID = cQuery.getFilterID();
+
+        if (isDebugEnabled) {
+          logger.debug("Processing CQ : {} Key: {}", cqName, eventKey);
+        }
+
+        Integer cqEvent = null;
+        if (matchedCqs.containsKey(cqName)) {
+          cqEvent = matchedCqs.get(cqName);
+          if (isDebugEnabled) {
+            logger.debug("query {} has already been processed and returned {}", cqName, cqEvent);
+          }
+          if (cqEvent == null) {
+            continue;
+          }
+          // Update the Cache Results for this CQ.
+          if (cqEvent.intValue() == MessageType.LOCAL_CREATE ||
+              cqEvent.intValue() == MessageType.LOCAL_UPDATE) {
+              cQuery.addToCqResultKeys(eventKey);
+          } else if (cqEvent.intValue() == MessageType.LOCAL_DESTROY) {
+              cQuery.markAsDestroyedInCqResultKeys(eventKey);
+          }
+        } else {
+          boolean error = false;
+          synchronized (cQuery) {
+            try {
+              // Apply query on new value.
+              if (!cqUnfilteredEventsSet_newValue.isEmpty()) {
+                executionStartTime = this.stats.startCqQueryExecution();
+
+                b_cqResults_newValue = evaluateQuery(cQuery, 
+                    new Object[] {cqUnfilteredEventsSet_newValue});
+                this.stats.endCqQueryExecution(executionStartTime);
+              }
+
+              // In case of Update, destroy and invalidate.
+              // Apply query on oldValue.
+              if (opRequiringQueryOnOldValue) {
+                // Check if CQ Result is cached, if not apply query on old 
+                // value. Currently the CQ Results are not cached for the 
+                // Partitioned Regions. Once this is added remove the check 
+                // with PR region.
+                if (cQuery.cqResultKeysInitialized) {
+                  b_cqResults_oldValue = cQuery.isPartOfCqResult(eventKey);
+                  // For PR if not found in cache, apply the query on old value.
+                  // Also apply if the query was not executed during cq execute 
+                  if ((cQuery.isPR || !CqServiceImpl.EXECUTE_QUERY_DURING_INIT) && b_cqResults_oldValue == false) {
+                    queryOldValue = true;
+                  } 
+                  if (isDebugEnabled && !cQuery.isPR && !b_cqResults_oldValue) {
+                    logger.debug("Event Key not found in the CQ Result Queue. EventKey : {} CQ Name : {}", eventKey, cqName );
+                  }
+                } else {
+                  queryOldValue = true;
+                }
+
+                if (queryOldValue) {
+                  if (cqUnfilteredEventsSet_oldValue.isEmpty()) {
+                    Object oldValue = entryEvent.getOldValue();
+                    if (oldValue != null) {
+                      cqUnfilteredEventsSet_oldValue.add(oldValue);
+                    }
+                  }
+                  
+                  // Apply query on old value.
+                  if (!cqUnfilteredEventsSet_oldValue.isEmpty()) {
+                    executionStartTime = this.stats.startCqQueryExecution();
+                    b_cqResults_oldValue = evaluateQuery(cQuery, 
+                        new Object[] {cqUnfilteredEventsSet_oldValue});
+                    this.stats.endCqQueryExecution(executionStartTime);
+                  } else {
+                    if (isDebugEnabled) {
+                      logger.debug("old value for event with key {} is null - query execution not performed", eventKey);
+                    }
+                  }
+                } // Query oldValue
+                
+              } 
+            } catch (Exception ex) {
+              // Any exception in running the query should be caught here and 
+              // buried because this code is running in-line with the message 
+              // processing code and we don't want to kill that thread
+              error = true;
+              // CHANGE LOG MESSAGE:
+              logger.info(LocalizedMessage.create(
+                 LocalizedStrings.CqService_ERROR_WHILE_PROCESSING_CQ_ON_THE_EVENT_KEY_0_CQNAME_1_ERROR_2,
+                  new Object[] { ((EntryEvent)event).getKey(), cQuery.getName(), ex.getLocalizedMessage()}));
+            }
+
+            if (error) {
+              cqEvent = Integer.valueOf(MessageType.EXCEPTION); 
+            } 
+            else { 
+              if (b_cqResults_newValue) {
+                if (b_cqResults_oldValue) {
+                  cqEvent = Integer.valueOf(MessageType.LOCAL_UPDATE);
+                } else {
+                  cqEvent = Integer.valueOf(MessageType.LOCAL_CREATE);
+                }
+                // If its create and caching is enabled, cache the key 
+                // for this CQ.
+                cQuery.addToCqResultKeys(eventKey);
+              } else if (b_cqResults_oldValue) {
+                // Base invalidate operation is treated as destroy.
+                // When the invalidate comes through, the entry will no longer 
+                // satisfy the query and will need to be deleted.
+                cqEvent = Integer.valueOf(MessageType.LOCAL_DESTROY);
+                // If caching is enabled, mark this event's key as removed 
+                // from the CQ cache.
+                cQuery.markAsDestroyedInCqResultKeys(eventKey);
+              }
+            }
+          } //end synchronized(cQuery)
+
+          // Get the matching CQs if any.
+          synchronized (this.matchingCqMap){
+            String query = cQuery.getQueryString();
+            HashSet matchingCqs = matchingCqMap.get(query);
+            if (matchingCqs != null) {
+              Iterator iter = matchingCqs.iterator();
+              while (iter.hasNext()) {
+                String matchingCqName = (String)iter.next();
+                if (!matchingCqName.equals(cqName)){
+                  matchedCqs.put(matchingCqName, cqEvent);
+                  if (isDebugEnabled) {
+                    logger.debug("Adding CQ into Matching CQ Map: {} Event is: {}", matchingCqName, cqEvent);
+                  }
+                }
+              }
+            }
+          }
+        }
+
+        if (cqEvent != null && cQuery.isRunning()){
+          if (isDebugEnabled) {
+            logger.debug("Added event to CQ with client-side name: {} key: {} operation : {}", cQuery.cqName, eventKey, cqEvent);
+          }         
+          cqInfo.put(filterID, cqEvent);
+          CqQueryVsdStats stats = cQuery.getVsdStats();
+          if (stats != null) {
+            stats.updateStats(cqEvent);
+          }
+        }
+      } 
+      if (cqInfo.size() > 0) {
+        if(pf.isLocalProfile()){
+          if (isDebugEnabled) {
+            logger.debug("Setting local CQ matches to {}", cqInfo);
+          }
+          frInfo.setLocalCqInfo(cqInfo);
+        } else {
+          if (isDebugEnabled) {
+            logger.debug("Setting CQ matches for {} to {}", cf.getDistributedMember(), cqInfo);
+          }
+          frInfo.setCqRoutingInfo(cf.getDistributedMember(), cqInfo);
+        }
+      }
+    } // iteration over Profiles.
+  }
+
+
+/*  public void processEvents (EnumListenerEvent operation, CacheEvent event,
+                             ClientUpdateMessage clientMessage, 
+                             CM<ClientProxyMembershipID, CM<CqQuery, Boolean>> clientIds) 
+  throws CqException {
+  
+    //Is this a region event or an entry event
+    if (event instanceof RegionEvent){
+      processRegionEvent(operation, event, clientMessage, clientIds);
+    } else {
+      processEntryEvent (operation, event, clientMessage, clientIds);
+    }
+
+  }
+  
+  private void processRegionEvent(EnumListenerEvent operation, CacheEvent event,
+                                  ClientUpdateMessage clientMessage, 
+                                  CM<ClientProxyMembershipID, CM<CqQuery, Boolean>> clientIds) 
+  throws CqException {
+    
+    if (logger.isDebugEnabled()) {
+      logger.debug("Processing region event for region " + 
+                  ((LocalRegion)(event.getRegion())).getName());
+    }
+    HashMap filteredCqs = new HashMap(); 
+    Integer cqRegionEvent = generateCqRegionEvent(operation);
+    Iterator it = clientIds.entrySet().iterator();
+    while (it.hasNext()) {
+      Map.Entry me = (Map.Entry)it.next();
+      ClientProxyMembershipID clientId = (ClientProxyMembershipID)me.getKey();
+      CM cqsToBooleans = (CM)me.getValue();
+      if (cqsToBooleans == null) {
+        continue;
+      }
+      Set<CqQuery> cqs = cqsToBooleans.keySet();
+      if (cqs.isEmpty()) {
+        continue;
+      }
+      filteredCqs.clear();
+      Iterator cqIt = cqs.iterator();
+      while (cqIt.hasNext()) {
+        CqQueryImpl cQuery = (CqQueryImpl)cqIt.next();
+        if (operation == EnumListenerEvent.AFTER_REGION_DESTROY) {
+          try {
+            if (logger.isDebugEnabled()){
+              logger.debug("Closing CQ on region destroy event. CqName :" 
+                            + cQuery.getName());
+            }
+            cQuery.close(false);
+          } 
+          catch (Exception ex) {
+            logger.debug("Failed to Close CQ on region destroy. CqName :" + 
+                         cQuery.getName(), ex);
+          }      
+
+        }
+        filteredCqs.put(cQuery.cqName, cqRegionEvent);
+        cQuery.getVsdStats().updateStats(cqRegionEvent);
+        
+      }
+      if (!filteredCqs.isEmpty()){
+        ((ClientUpdateMessageImpl)clientMessage).addClientCqs(
+            clientId, filteredCqs);
+      }
+      
+    }
+  
+  }
+  
+  private void processEntryEvent(EnumListenerEvent operation, CacheEvent event,
+                                 ClientUpdateMessage clientMessage, 
+                                 CM<ClientProxyMembershipID, CM<CqQuery, Boolean>> clientIds)
+  throws CqException {
+    HashSet cqUnfilteredEventsSet_newValue = new HashSet();
+    HashSet cqUnfilteredEventsSet_oldValue = new HashSet();
+    boolean b_cqResults_newValue = false;
+    boolean b_cqResults_oldValue = false;
+    EntryEvent entryEvent = (EntryEvent)event;
+    Object eventKey = entryEvent.getKey();
+    if (operation == EnumListenerEvent.AFTER_CREATE || 
+        operation == EnumListenerEvent.AFTER_UPDATE) {
+      if (entryEvent.getNewValue() != null) {
+        //We have a new value to run the query on
+        cqUnfilteredEventsSet_newValue.clear();
+        cqUnfilteredEventsSet_newValue.add(entryEvent.getNewValue());
+      }
+    }
+     
+    HashMap matchedCqs = new HashMap();
+    long executionStartTime = 0;
+    Iterator it = clientIds.entrySet().iterator();
+    while (it.hasNext()) {
+      Map.Entry me = (Map.Entry)it.next();
+      ClientProxyMembershipID clientId = (ClientProxyMembershipID)me.getKey();
+      if (logger.isDebugEnabled()) {
+        logger.debug("Processing event for CQ filter, ClientId : " + clientId);
+      }
+      CM cqsToBooleans = (CM)me.getValue();
+      if (cqsToBooleans == null) {
+        continue;
+      }
+      Set<CqQuery> cqs = cqsToBooleans.keySet();
+      if (cqs.isEmpty()) {
+        continue;
+      }
+      HashMap filteredCqs = new HashMap();
+      Iterator cqIt = cqs.iterator();
+      while (cqIt.hasNext()) {
+        CqQueryImpl cQuery = (CqQueryImpl)cqIt.next();
+        b_cqResults_newValue = false;
+        b_cqResults_oldValue = false;       
+        if (cQuery == null || !(cQuery.isRunning())){
+          continue;
+        }        
+        String cqName = cQuery.getServerCqName();
+        Integer cqEvent = null;
+        if (matchedCqs.containsKey(cqName)) {
+          if (logger.isDebugEnabled()){
+            logger.debug("Similar cq/query is already processed, getting the cq event-type from the matched cq.");
+          }
+          cqEvent = (Integer)matchedCqs.get(cqName);
+        } else {
+          boolean error = false;
+          boolean hasSeenEvent = false;
+          HashSet cqEventKeys = null;
+          synchronized (cQuery) {
+            try {
+              // Apply query on new value.
+              if (!cqUnfilteredEventsSet_newValue.isEmpty()) {
+                executionStartTime = this.stats.startCqQueryExecution();
+                b_cqResults_newValue = evaluateQuery(cQuery, 
+                                                     new Object[] {cqUnfilteredEventsSet_newValue});
+                this.stats.endCqQueryExecution(executionStartTime);
+              }
+              // Check if old value is cached, if not apply query on old value.
+              if (cqToCqEventKeysMap != null) {
+                synchronized (cqToCqEventKeysMap) {
+                  if ((cqEventKeys = (HashSet)cqToCqEventKeysMap.get(cqName)) != null) {
+                    hasSeenEvent = cqEventKeys.contains(eventKey);
+                  }
+                }
+              }  
+              if (!hasSeenEvent) {
+                // get the oldValue.
+                // In case of Update, destroy and invalidate.
+                if (operation == EnumListenerEvent.AFTER_UPDATE || 
+                    operation == EnumListenerEvent.AFTER_DESTROY ||
+                    operation == EnumListenerEvent.AFTER_INVALIDATE) {
+                  if (entryEvent.getOldValue() != null) {
+                    cqUnfilteredEventsSet_oldValue.clear();
+                    cqUnfilteredEventsSet_oldValue.add(entryEvent.getOldValue());
+                    // Apply query on old value.
+                    executionStartTime = this.stats.startCqQueryExecution();
+                    b_cqResults_oldValue = evaluateQuery(cQuery, 
+                                                         new Object[] {cqUnfilteredEventsSet_oldValue});
+                    this.stats.endCqQueryExecution(executionStartTime);
+                  }
+                }
+              }
+            }
+            catch (Exception ex) {
+              //Any exception in running the query
+              // should be caught here and buried
+              //because this code is running inline with the 
+              //message processing code and we don't want to 
+              //kill that thread
+              error = true;
+              logger.info(
+                LocalizedStrings.CqService_ERROR_WHILE_PROCESSING_CQ_ON_THE_EVENT_KEY_0_CQNAME_1_CLIENTID_2_ERROR_3,
+                new Object[] { ((EntryEvent)event).getKey(), cQuery.getName(), clientId, ex.getLocalizedMessage()});
+            }
+            
+            if (error) {
+              cqEvent = Integer.valueOf(MessageType.EXCEPTION);  
+            } 
+            else {
+              if (b_cqResults_newValue) {
+                if (hasSeenEvent || b_cqResults_oldValue) {
+                  cqEvent = Integer.valueOf(MessageType.LOCAL_UPDATE);
+                } else {
+                  cqEvent = Integer.valueOf(MessageType.LOCAL_CREATE);
+                }
+                // If its create and caching is enabled, cache the key for this CQ.
+                if (!hasSeenEvent && cqEventKeys != null) {
+                  cqEventKeys.add(eventKey);
+                } 
+              } 
+              else if (hasSeenEvent || (b_cqResults_oldValue)) {
+                // Base invalidate operation is treated as destroy.
+                // When the invalidate comes through, the entry will no longer satisfy 
+                // the query and will need to be deleted.
+                cqEvent = Integer.valueOf(MessageType.LOCAL_DESTROY);
+                // If caching is enabled, remove this event's key from the cache.
+                if (hasSeenEvent && cqEventKeys != null) {
+                  cqEventKeys.remove(eventKey);
+                }
+              }
+            }
+            
+          } //end synchronized(cQuery)
+
+          // Get the matching CQs if any.
+          synchronized (this.matchingCqMap){
+            String query = cQuery.getQueryString();
+            ArrayList matchingCqs = (ArrayList)matchingCqMap.get(query);
+            if (matchingCqs != null) {
+              Iterator iter = matchingCqs.iterator();
+              while (iter.hasNext()) {
+                String matchingCqName = (String)iter.next();
+                if (!matchingCqName.equals(cqName)){
+                  matchedCqs.put(matchingCqName, cqEvent);
+                }
+              }
+            }
+          }
+          
+        }
+ 
+        if (cqEvent != null){
+          if (logger.isDebugEnabled()) {
+            logger.debug("Event is added for the CQ, CqName (clientside): " + cQuery.cqName + 
+            " With CQ Op : " + cqEvent + " for Client : " + clientId);
+          }
+          filteredCqs.put(cQuery.cqName, cqEvent);
+          cQuery.getVsdStats().updateStats(cqEvent);
+        }
+ 
+      } // iteration over cqsToBooleans.keySet()
+      if (!filteredCqs.isEmpty()){
+        logger.debug("Adding event map for client : "+clientId + " with event map size : "+filteredCqs.size());
+        ((ClientUpdateMessageImpl)clientMessage).addClientCqs(clientId, filteredCqs);
+      }
+    } // iteration over clientIds.entrySet()
+  }
+*/ 
+ 
+  private Integer generateCqRegionEvent(CacheEvent event) {
+    Integer cqEvent = null;
+    if (event.getOperation().isRegionDestroy()) {
+      cqEvent = Integer.valueOf(MessageType.DESTROY_REGION);
+    }
+    else if (event.getOperation().isRegionInvalidate()) {
+      cqEvent = Integer.valueOf(MessageType.INVALIDATE_REGION);
+    }
+    else if (event.getOperation().isClear()){
+      cqEvent = Integer.valueOf(MessageType.CLEAR_REGION);
+    } 
+    return cqEvent;
+  }
+
+  
+  /**
+   * Manages the CQs created for the base region.
+   * This is managed here, instead of on the base region; since the cq could be
+   * created on the base region, before base region is created (using newCq()).
+   */
+  public void addToBaseRegionToCqNameMap(String regionName, String cqName){
+    synchronized(this.baseRegionToCqNameMap){
+      ArrayList<String> cqs = this.baseRegionToCqNameMap.get(regionName);
+      if (cqs == null){
+        cqs = new ArrayList<String>();
+      }
+      cqs.add(cqName);
+      this.baseRegionToCqNameMap.put(regionName, cqs);
+    }
+  }
+  
+  public void removeFromBaseRegionToCqNameMap(String regionName, String cqName){
+    synchronized(this.baseRegionToCqNameMap){
+      ArrayList<String> cqs = this.baseRegionToCqNameMap.get(regionName);
+      if (cqs != null){
+        cqs.remove(cqName);
+        if (cqs.isEmpty()){
+          this.baseRegionToCqNameMap.remove(regionName);
+        } else {
+          this.baseRegionToCqNameMap.put(regionName, cqs);
+        }
+      }
+    }
+  }
+  
+  /**
+   * Get the VSD ststs for CQ Service. There is one CQ Service per cache
+   * @return reference to VSD stats object for the CQ service
+   */
+  public CqServiceVsdStats getCqServiceVsdStats() {
+    return stats;
+  }
+
+  /**
+   * Removes this CQ from CQ event Cache map. 
+   * This disables the caching events for this CQ. 
+   * @param cqName
+   */
+  /*
+  synchronized public void removeCQFromCaching(String cqName){
+    if (cqToCqEventKeysMap != null) {
+      // Take a lock on CqQuery object. In processEvents the maps are
+      // handled under CqQuery object.
+      if (cqToCqEventKeysMap != null){
+        synchronized (cqToCqEventKeysMap) {        
+          cqToCqEventKeysMap.remove(cqName);
+        }
+      }
+    } 
+  }
+  */
+  
+  /**
+   * Returns the CQ event cache map.
+   * @return HashMap cqToCqEventKeysMap
+   * 
+   * Caller must synchronize on the returned value in order
+   * to inspect.
+   */
+  /*
+  public HashMap getCqToCqEventKeysMap(){
+    return cqToCqEventKeysMap; 
+  }
+  */
+  
+  /**
+   * Adds the query from the given CQ to the matched CQ map.
+   * @param cq
+   */
+  public void addToMatchingCqMap(CqQueryImpl cq) {
+    synchronized(this.matchingCqMap){
+      String cqQuery = cq.getQueryString();
+      HashSet<String> matchingCQs = null;
+      if (!matchingCqMap.containsKey(cqQuery)){
+        matchingCQs = new HashSet<String>();
+        matchingCqMap.put(cqQuery, matchingCQs);
+        this.stats.incUniqueCqQuery();
+      } else {
+        matchingCQs = matchingCqMap.get(cqQuery);
+      }
+      matchingCQs.add(cq.getServerCqName());
+      if (logger.isDebugEnabled()) {
+        logger.debug("Adding CQ into MatchingCQ map, CQName: {} Number of matched querys are: {}" , cq.getServerCqName(), matchingCQs.size());
+      }
+    }
+  }
+
+  /**
+   * Removes the query from the given CQ from the matched CQ map.
+   * @param cq
+   */
+  public void removeFromMatchingCqMap(CqQueryImpl cq) {
+    synchronized(this.matchingCqMap){
+      String cqQuery = cq.getQueryString();
+      if (matchingCqMap.containsKey(cqQuery)){
+    	  HashSet matchingCQs = matchingCqMap.get(cqQuery);
+        matchingCQs.remove(cq.getServerCqName());
+        if (logger.isDebugEnabled()) {
+          logger.debug("Removing CQ from MatchingCQ map, CQName: {} Number of matched querys are: {}", cq.getServerCqName(), matchingCQs.size());
+        }
+        if (matchingCQs.isEmpty()){
+          matchingCqMap.remove(cqQuery);
+          this.stats.decUniqueCqQuery();
+        }
+      } 
+    }
+  }
+
+  /**
+   * Returns the matching CQ map.
+   * @return HashMap matchingCqMap
+   */
+  public HashMap<String, HashSet<String>> getMatchingCqMap(){
+    return matchingCqMap; 
+  }
+
+  /**
+   * Applies the query on the event.
+   * This method takes care of the performance related changed done to improve 
+   * the CQ-query performance. When CQ-query is executed first time, it saves the 
+   * query related information in the execution context and uses that info in later 
+   * executions. 
+   * @param cQuery
+   * @param event
+   * @return boolean
+   */
+  private boolean evaluateQuery(CqQueryImpl cQuery, Object[] event) throws Exception {
+    ExecutionContext execContext = cQuery.getQueryExecutionContext();
+    execContext.reset();
+    execContext.setBindArguments(event);
+    boolean status = false;
+    
+    // Check if the CQ query is executed once.
+    // If not execute the query in normal way.
+    // During this phase the query execution related info are stored in the
+    // ExecutionContext.
+    if (execContext.getScopeNum() <= 0) {
+      SelectResults results = (SelectResults)((DefaultQuery)cQuery.getQuery()).executeUsingContext(execContext);
+      if (results != null && results.size() > 0) {
+        status = true;
+      } 
+    } else {
+      // Execute using the saved query info (in ExecutionContext).
+      // This avoids building resultSet, index look-up, generating build-plans
+      // that are not required for; query execution on single object.
+      CompiledSelect cs = ((DefaultQuery)(cQuery.getQuery())).getSelect();
+      status = cs.evaluateCq(execContext);
+    }
+    return status;
+  }
+
+  @Override
+  public UserAttributes getUserAttributes(String cqName) {
+    return this.cqNameToUserAttributesMap.get(cqName);
+  }
+  
+//  public static void memberLeft(String poolName) {
+//    if (cqServiceSingleton != null  && !cqServiceSingleton.isServer()) {
+//      cqServiceSingleton.sendMemberDisconnectedMessageToCqs(poolName);
+//    }
+//  }
+//  
+//  public static void memberCrashed(String poolName) {
+//    if (cqServiceSingleton != null && !cqServiceSingleton.isServer()) {
+//      cqServiceSingleton.sendMemberDisconnectedMessageToCqs(poolName);
+//    }
+//  }
+//  
+  
+  @Override
+  public void cqsDisconnected(Pool pool) {
+    invokeCqsConnected(pool, false);
+  }
+  
+  @Override
+  public void cqsConnected(Pool pool) {
+    invokeCqsConnected(pool, true);
+  }
+  
+  /**
+   * Let cq listeners know that they are connected or disconnected
+   */
+  private void invokeCqsConnected(Pool pool, boolean connected) {
+    String poolName = pool.getName();
+    //Check to see if we are already connected/disconnected.
+    //If state has not changed, do not invoke another connected/disconnected 
+    synchronized(cqPoolsConnected) {
+      //don't repeatily send same connect/disconnect message to cq's on repeated fails of RedundancySatisfier
+      if (cqPoolsConnected.containsKey(poolName) && connected == cqPoolsConnected.get(poolName)){
+        return;
+      }
+      cqPoolsConnected.put(poolName, connected);
+    
+      Collection<? extends InternalCqQuery> cqs = this.getAllCqs();
+      String cqName = null;
+      final boolean isDebugEnabled = logger.isDebugEnabled();
+      for (InternalCqQuery query: cqs) {
+        try {
+          if (query == null) {
+            continue;
+          }
+          
+          cqName = query.getName();
+          ClientCQImpl cQuery = (ClientCQImpl) this.getCq(cqName);
+  
+          //Check cq pool to determine if the pool matches, if not continue.
+          //Also if the connected state is already the same, we do not have to send status again.
+	  if (cQuery == null) {
+            continue;
+          }
+          Pool cqPool = cQuery.getCQProxy().getPool();
+          if (cQuery.isConnected() == connected || !cqPool.getName().equals(poolName)) {
+            continue;
+          }
+          
+          if ((!cQuery.isRunning() && cQuery.getQueuedEvents() == null)) {
+            if (isDebugEnabled) {
+              logger.debug("Unable to invoke CqListener, {}, CqName : {}", ((cQuery == null) ? "CQ not found" : " CQ is Not running"), cqName);
+            }
+            continue;
+          }
+        
+          this.invokeCqConnectedListeners(cqName, cQuery, connected);
+        } catch (VirtualMachineError e) {
+          SystemFailure.initiateFailure(e);
+          throw e;
+        } catch (Throwable t) {
+          SystemFailure.checkFailure();
+          logger.warn(LocalizedMessage.create(LocalizedStrings.CqService_ERROR_SENDING_CQ_CONNECTION_STATUS, cqName), t);
+  
+          if (t instanceof VirtualMachineError) {
+            logger.warn(LocalizedMessage.create(
+                    LocalizedStrings.CqService_VIRTUALMACHINEERROR_PROCESSING_CQLISTENER_FOR_CQ_0,
+                    cqName), t);
+            return;
+          }
+        }
+      }
+    }
+  }
+
+  @Override
+  public List<String> getAllDurableCqsFromServer(InternalPool pool) {
+    return new ServerCQProxyImpl(pool).getAllDurableCqsFromServer();
+  }
+  
+  
+}
+

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceStatisticsImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceStatisticsImpl.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceStatisticsImpl.java
new file mode 100644
index 0000000..9f504fa
--- /dev/null
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceStatisticsImpl.java
@@ -0,0 +1,92 @@
+/*=========================================================================
+ * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ *========================================================================
+ */
+
+package com.gemstone.gemfire.cache.query.internal.cq;
+
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.query.CqServiceStatistics;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.internal.DefaultQueryService;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+
+/**
+ * Provides statistical information about CqService.
+ *
+ * @since 5.5
+ * @author anil
+ */
+public class CqServiceStatisticsImpl implements CqServiceStatistics {
+  private CqServiceImpl cqService;
+//  private long activeCqs;
+//  private long stoppedCqs;
+//  private long closedCqs;
+//  private long createdCqs;
+  
+  /**
+   * Constructor for CqStatisticsImpl
+   * @param cqs - CqService 
+   */
+  public CqServiceStatisticsImpl(CqServiceImpl cqs) {
+    cqService = cqs;
+  }
+  
+  /**
+   * Returns the number of CQs currently executing
+   */
+  public long numCqsActive(){
+    return this.cqService.getCqServiceVsdStats().getNumCqsActive();
+  }
+  
+  /**
+   * Returns number of CQs created.
+   * @return long number of cqs created.
+   */
+  public long numCqsCreated(){
+    return this.cqService.getCqServiceVsdStats().getNumCqsCreated();
+  }
+  
+  /**
+   * Returns number of Cqs that are closed.
+   */
+  public long numCqsClosed(){
+    return this.cqService.getCqServiceVsdStats().getNumCqsClosed();
+  }
+  
+  /**
+   * Returns number of Cqs that are stopped.
+   */
+  public long numCqsStopped(){
+    return this.cqService.getCqServiceVsdStats().getNumCqsStopped();
+  }
+  
+  /**
+   * Returns number of CQs created from the client.
+   */
+  public long numCqsOnClient(){
+    return this.cqService.getCqServiceVsdStats().getNumCqsOnClient();
+  }
+  
+  /**
+   * Returns the number of CQs (active + suspended) on the given region.
+   * @param regionName
+   */
+  public long numCqsOnRegion(String regionName){
+    
+    DefaultQueryService queryService = (DefaultQueryService)((GemFireCacheImpl)CacheFactory.getAnyInstance()).getLocalQueryService();
+    try {
+      CqQuery[] cqs = queryService.getCqs(regionName);
+      
+      if (cqs != null) {
+        return cqs.length;
+      }
+    } catch(Exception ex) {
+      // Dont do anything.
+    }
+    return 0;
+  } 
+}


[68/70] incubator-geode git commit: GEODE-873: Allowing for possible retry in testParallelPregationHA

Posted by up...@apache.org.
GEODE-873: Allowing for possible retry in testParallelPregationHA

It's possible a put could be retried due to the member shutdown in this
test. If there is a retry, the stats may get incremented by one more
event.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/441c29cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/441c29cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/441c29cd

Branch: refs/heads/develop
Commit: 441c29cdb1df3a29b75dee6d1b99b6506cb80cde
Parents: 2260630
Author: Dan Smith <up...@apache.org>
Authored: Wed Jan 27 17:25:30 2016 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Thu Jan 28 09:38:00 2016 -0800

----------------------------------------------------------------------
 .../cache/wan/parallel/ParallelWANStatsDUnitTest.java       | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/441c29cd/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
index 4da0868..529e378 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
@@ -306,7 +306,7 @@ public class ParallelWANStatsDUnitTest extends WANTestBase{
     vm2.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {100, 1000, 1000 });
     vm3.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {100, 1000, 1000 });
   }
-
+  
   public void testParallelPropagationHA() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
         "createFirstLocatorWithDSId", new Object[] { 1 });
@@ -365,8 +365,11 @@ public class ParallelWANStatsDUnitTest extends WANTestBase{
         WANTestBase.class, "getSenderStats", new Object[] { "ln", 0});
     
     assertEquals(0, v5List.get(0) + v6List.get(0) + v7List.get(0) ); //queue size
-    assertEquals(30000, v5List.get(1) + v6List.get(1) + v7List.get(1)); //eventsReceived
-    assertEquals(30000, v5List.get(2) + v6List.get(2) + v7List.get(2)); //events queued
+    int receivedEvents = v5List.get(1) + v6List.get(1) + v7List.get(1);
+    //We may see a single retried event on all members due to the kill
+    assertTrue("Received " + receivedEvents, 30000 <= receivedEvents && 30003 >= receivedEvents); //eventsReceived
+    int queuedEvents = v5List.get(2) + v6List.get(2) + v7List.get(2);
+    assertTrue("Queued " + queuedEvents, 30000 <= queuedEvents && 30003 >= queuedEvents); //eventsQueued
     //assertTrue(10000 <= v5List.get(3) + v6List.get(3) + v7List.get(3)); //events distributed : its quite possible that vm4 has distributed some of the events
     //assertTrue(v5List.get(4) + v6List.get(4) + v7List.get(4) > 1000); //batches distributed : its quite possible that vm4 has distributed some of the batches.
     assertEquals(0, v5List.get(5) + v6List.get(5) + v7List.get(5)); //batches redistributed


[22/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
new file mode 100644
index 0000000..751a697
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
@@ -0,0 +1,5143 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.wan;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.Serializable;
+import java.net.InetSocketAddress;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Random;
+import java.util.Set;
+import java.util.StringTokenizer;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentSkipListSet;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.AttributesMutator;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheClosedException;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.CacheListener;
+import com.gemstone.gemfire.cache.CacheTransactionManager;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.DiskStore;
+import com.gemstone.gemfire.cache.DiskStoreFactory;
+import com.gemstone.gemfire.cache.EntryEvent;
+import com.gemstone.gemfire.cache.PartitionAttributesFactory;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionAttributes;
+import com.gemstone.gemfire.cache.RegionDestroyedException;
+import com.gemstone.gemfire.cache.RegionFactory;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.asyncqueue.AsyncEvent;
+import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener;
+import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue;
+import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueueFactory;
+import com.gemstone.gemfire.cache.asyncqueue.internal.AsyncEventQueueImpl;
+import com.gemstone.gemfire.cache.asyncqueue.internal.AsyncEventQueueStats;
+import com.gemstone.gemfire.cache.client.Pool;
+import com.gemstone.gemfire.cache.client.PoolManager;
+import com.gemstone.gemfire.cache.client.internal.LocatorDiscoveryCallbackAdapter;
+import com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListener;
+import com.gemstone.gemfire.cache.persistence.PartitionOfflineException;
+import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
+import com.gemstone.gemfire.cache.wan.GatewayEventFilter;
+import com.gemstone.gemfire.cache.wan.GatewayQueueEvent;
+import com.gemstone.gemfire.cache.wan.GatewayReceiver;
+import com.gemstone.gemfire.cache.wan.GatewayReceiverFactory;
+import com.gemstone.gemfire.cache.wan.GatewaySender;
+import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
+import com.gemstone.gemfire.cache.wan.GatewaySenderFactory;
+import com.gemstone.gemfire.cache.wan.GatewayTransportFilter;
+import com.gemstone.gemfire.cache30.CacheTestCase;
+import com.gemstone.gemfire.distributed.DistributedSystem;
+import com.gemstone.gemfire.distributed.Locator;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.distributed.internal.InternalLocator;
+import com.gemstone.gemfire.internal.AvailablePort;
+import com.gemstone.gemfire.internal.AvailablePortHelper;
+import com.gemstone.gemfire.internal.FileUtil;
+import com.gemstone.gemfire.internal.admin.remote.DistributionLocatorId;
+import com.gemstone.gemfire.internal.cache.BucketRegion;
+import com.gemstone.gemfire.internal.cache.CacheConfig;
+import com.gemstone.gemfire.internal.cache.CacheServerImpl;
+import com.gemstone.gemfire.internal.cache.CustomerIDPartitionResolver;
+import com.gemstone.gemfire.internal.cache.ForceReattemptException;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.cache.LocalRegion;
+import com.gemstone.gemfire.internal.cache.PartitionedRegion;
+import com.gemstone.gemfire.internal.cache.RegionQueue;
+import com.gemstone.gemfire.internal.cache.execute.data.CustId;
+import com.gemstone.gemfire.internal.cache.execute.data.Customer;
+import com.gemstone.gemfire.internal.cache.execute.data.Order;
+import com.gemstone.gemfire.internal.cache.execute.data.OrderId;
+import com.gemstone.gemfire.internal.cache.execute.data.Shipment;
+import com.gemstone.gemfire.internal.cache.execute.data.ShipmentId;
+import com.gemstone.gemfire.internal.cache.partitioned.PRLocallyDestroyedException;
+import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerStats;
+import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
+import com.gemstone.gemfire.internal.cache.wan.parallel.ConcurrentParallelGatewaySenderEventProcessor;
+import com.gemstone.gemfire.internal.cache.wan.parallel.ConcurrentParallelGatewaySenderQueue;
+import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelGatewaySenderEventProcessor;
+import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelGatewaySenderQueue;
+import com.gemstone.gemfire.pdx.SimpleClass;
+import com.gemstone.gemfire.pdx.SimpleClass1;
+import com.gemstone.gemfire.util.test.TestUtil;
+
+import dunit.DistributedTestCase;
+import dunit.Host;
+import dunit.VM;
+import junit.framework.Assert;
+
+public class WANTestBase extends DistributedTestCase{
+
+  protected static Cache cache;
+  protected static Region region;
+  
+  protected static PartitionedRegion customerRegion;
+  protected static PartitionedRegion orderRegion;
+  protected static PartitionedRegion shipmentRegion;
+  
+  protected static final String customerRegionName = "CUSTOMER";
+  protected static final String orderRegionName = "ORDER";
+  protected static final String shipmentRegionName = "SHIPMENT";
+  
+  protected static VM vm0;
+  protected static VM vm1;
+  protected static VM vm2;
+  protected static VM vm3;
+  protected static VM vm4;
+  protected static VM vm5;
+  protected static VM vm6;
+  protected static VM vm7;
+  
+  protected static QueueListener listener1;
+  protected static QueueListener listener2;
+  
+  protected static List<QueueListener> gatewayListeners;
+  
+  protected static AsyncEventListener eventListener1 ;
+  protected static AsyncEventListener eventListener2 ;
+
+  private static final long MAX_WAIT = 10000;
+  
+  protected static GatewayEventFilter eventFilter;
+  
+  protected static boolean destroyFlag = false;
+  
+  protected static List<Integer> dispatcherThreads = 
+	  new ArrayList<Integer>(Arrays.asList(1, 3, 5));
+  //this will be set for each test method run with one of the values from above list
+  protected static int numDispatcherThreadsForTheRun = 1;
+  
+  public WANTestBase(String name) {
+    super(name);
+  }
+  
+  public void setUp() throws Exception {
+    final Host host = Host.getHost(0);
+    vm0 = host.getVM(0); 
+    vm1 = host.getVM(1);
+    vm2 = host.getVM(2);
+    vm3 = host.getVM(3); 
+    vm4 = host.getVM(4);
+    vm5 = host.getVM(5);
+    vm6 = host.getVM(6); 
+    vm7 = host.getVM(7);
+    //Need to set the test name after the VMs are created
+    super.setUp();
+    //this is done to vary the number of dispatchers for sender 
+    //during every test method run
+    shuffleNumDispatcherThreads();
+    invokeInEveryVM(WANTestBase.class,"setNumDispatcherThreadsForTheRun",
+    	new Object[]{dispatcherThreads.get(0)});
+    addExpectedException("Connection refused");
+    addExpectedException("Software caused connection abort");
+    addExpectedException("Connection reset");
+  }
+  
+  public static void shuffleNumDispatcherThreads() {
+	  Collections.shuffle(dispatcherThreads);  
+  }
+  
+  public static void setNumDispatcherThreadsForTheRun(int numThreads) {
+	  numDispatcherThreadsForTheRun = numThreads;
+  }
+  
+  public static void stopOldLocator() {
+    if (Locator.hasLocator()) {
+      Locator.getLocator().stop();
+    }
+  }
+
+  public static void createLocator(int dsId, int port, Set<String> localLocatorsList, Set<String> remoteLocatorsList){
+    WANTestBase test = new WANTestBase(testName);
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
+    props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
+    StringBuffer localLocatorBuffer = new StringBuffer(localLocatorsList.toString());
+    localLocatorBuffer.deleteCharAt(0);
+    localLocatorBuffer.deleteCharAt(localLocatorBuffer.lastIndexOf("]"));
+    String localLocator = localLocatorBuffer.toString();
+    localLocator = localLocator.replace(" ", ""); 
+    
+    props.setProperty(DistributionConfig.LOCATORS_NAME, localLocator);
+    props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost");
+    StringBuffer remoteLocatorBuffer = new StringBuffer(remoteLocatorsList.toString());
+    remoteLocatorBuffer.deleteCharAt(0);
+    remoteLocatorBuffer.deleteCharAt(remoteLocatorBuffer.lastIndexOf("]"));
+    String remoteLocator = remoteLocatorBuffer.toString();
+    remoteLocator = remoteLocator.replace(" ", ""); 
+    props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, remoteLocator);
+    test.getSystem(props);
+  }
+  
+  public static Integer createFirstLocatorWithDSId(int dsId) {
+    stopOldLocator();
+    WANTestBase test = new WANTestBase(testName);
+    int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
+    props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port + "]");
+    props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost");
+    test.getSystem(props);
+    return port;
+  }
+  
+  public static Integer createFirstPeerLocator(int dsId) {
+    stopOldLocator();
+    WANTestBase test = new WANTestBase(testName);
+    int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
+    props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port + "]");
+    props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + port + "],server=false,peer=true,hostname-for-clients=localhost");
+    test.getSystem(props);
+    return port;
+  }
+  
+  public static Integer createSecondLocator(int dsId, int locatorPort) {
+    stopOldLocator();
+    WANTestBase test = new WANTestBase(testName);
+    int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
+    props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locatorPort + "]");
+    props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost");
+    test.getSystem(props);
+    return port;
+  }
+
+  public static Integer createSecondPeerLocator(int dsId, int locatorPort) {
+    stopOldLocator();
+    WANTestBase test = new WANTestBase(testName);
+    int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
+    props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locatorPort + "]");
+    props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + port + "],server=false,peer=true,hostname-for-clients=localhost");
+    test.getSystem(props);
+    return port;
+  }
+  
+  public static Integer createFirstRemoteLocator(int dsId, int remoteLocPort) {
+    stopOldLocator();
+    WANTestBase test = new WANTestBase(testName);
+    int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
+    props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port + "]");
+    props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost");
+    props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + remoteLocPort + "]");
+    test.getSystem(props);
+    return port;
+  }
+  
+  public static void bringBackLocatorOnOldPort(int dsId, int remoteLocPort, int oldPort) {
+    WANTestBase test = new WANTestBase(testName);
+    Properties props = new Properties();
+    props.put(DistributionConfig.LOG_LEVEL_NAME, "fine");
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
+    props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + oldPort + "]");
+    props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + oldPort + "],server=true,peer=true,hostname-for-clients=localhost");
+    props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + remoteLocPort + "]");
+    test.getSystem(props);
+    return;
+  }
+  
+  
+  public static Integer createFirstRemotePeerLocator(int dsId, int remoteLocPort) {
+    stopOldLocator();
+    WANTestBase test = new WANTestBase(testName);
+    int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
+    props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port + "]");
+    props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + port + "],server=false,peer=true,hostname-for-clients=localhost");
+    props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + remoteLocPort + "]");
+    test.getSystem(props);
+    return port;
+  }
+  
+  public static Integer createSecondRemoteLocator(int dsId, int localPort,
+      int remoteLocPort) {
+    stopOldLocator();
+    WANTestBase test = new WANTestBase(testName);
+    int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
+    props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + localPort + "]");
+    props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost");
+    props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + remoteLocPort + "]");
+    test.getSystem(props);
+    return port;
+  }
+  
+  public static Integer createSecondRemotePeerLocator(int dsId, int localPort,
+      int remoteLocPort) {
+    stopOldLocator();
+    WANTestBase test = new WANTestBase(testName);
+    int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
+    props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + localPort + "]");
+    props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + port + "],server=false,peer=true,hostname-for-clients=localhost");
+    props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + remoteLocPort + "]");
+    test.getSystem(props);
+    return port;
+  }
+  
+  public static void createReplicatedRegion(String regionName, String senderIds, Boolean offHeap){
+    ExpectedException exp = addExpectedException(ForceReattemptException.class
+        .getName());
+    ExpectedException exp1 = addExpectedException(InterruptedException.class
+        .getName());
+    ExpectedException exp2 = addExpectedException(GatewaySenderException.class
+        .getName());
+    try {
+      AttributesFactory fact = new AttributesFactory();
+      if (senderIds != null) {
+        StringTokenizer tokenizer = new StringTokenizer(senderIds, ",");
+        while (tokenizer.hasMoreTokens()) {
+          String senderId = tokenizer.nextToken();
+          // GatewaySender sender = cache.getGatewaySender(senderId);
+          // assertNotNull(sender);
+          fact.addGatewaySenderId(senderId);
+        }
+      }
+      fact.setDataPolicy(DataPolicy.REPLICATE);
+      fact.setScope(Scope.DISTRIBUTED_ACK);
+      fact.setOffHeap(offHeap);
+      Region r = cache.createRegionFactory(fact.create()).create(regionName);
+      assertNotNull(r);
+    }
+    finally {
+      exp.remove();
+      exp1.remove();
+      exp2.remove();
+    }
+  }
+
+  public static void createNormalRegion(String regionName, String senderIds){
+    AttributesFactory fact = new AttributesFactory();
+    if(senderIds!= null){
+      StringTokenizer tokenizer = new StringTokenizer(senderIds, ",");
+      while (tokenizer.hasMoreTokens()){
+        String senderId = tokenizer.nextToken();
+//        GatewaySender sender = cache.getGatewaySender(senderId);
+//        assertNotNull(sender);
+        fact.addGatewaySenderId(senderId);
+      }
+    }
+    fact.setDataPolicy(DataPolicy.NORMAL);
+    fact.setScope(Scope.DISTRIBUTED_ACK);
+    Region r = cache.createRegionFactory(fact.create()).create(regionName);
+    assertNotNull(r);
+  }
+  
+//  public static void createReplicatedRegion_PDX(String regionName, String senderId, DataPolicy policy, InterestPolicy intPolicy){
+//    AttributesFactory fact = new AttributesFactory();
+//    if(senderId!= null){
+//      StringTokenizer tokenizer = new StringTokenizer(senderId, ",");
+//      while (tokenizer.hasMoreTokens()){
+//        String sender = tokenizer.nextToken();
+//        //fact.addSerialGatewaySenderId(sender);
+//      }
+//    }
+//    fact.setDataPolicy(policy);
+//    SubscriptionAttributes subAttr = new SubscriptionAttributes(intPolicy);
+//    fact.setSubscriptionAttributes(subAttr);
+//    fact.setScope(Scope.DISTRIBUTED_ACK);
+//    Region r = cache.createRegionFactory(fact.create()).create(regionName);
+//    assertNotNull(r);
+//    assertTrue(r.size() == 0);
+//  }
+  
+  public static void createPersistentReplicatedRegion(String regionName, String senderIds, Boolean offHeap){
+    AttributesFactory fact = new AttributesFactory();
+    if(senderIds!= null){
+      StringTokenizer tokenizer = new StringTokenizer(senderIds, ",");
+      while (tokenizer.hasMoreTokens()){
+        String senderId = tokenizer.nextToken();
+//        GatewaySender sender = cache.getGatewaySender(senderId);
+//        assertNotNull(sender);
+        fact.addGatewaySenderId(senderId);
+      }
+    }
+    fact.setDataPolicy(DataPolicy.PERSISTENT_REPLICATE);
+    fact.setOffHeap(offHeap);
+    Region r = cache.createRegionFactory(fact.create()).create(regionName);
+    assertNotNull(r);
+  }
+  
+//  public static void createReplicatedRegionWithParallelSenderId(String regionName, String senderId){
+//    AttributesFactory fact = new AttributesFactory();
+//    if(senderId!= null){
+//      StringTokenizer tokenizer = new StringTokenizer(senderId, ",");
+//      while (tokenizer.hasMoreTokens()){
+//        String sender = tokenizer.nextToken();
+//        //fact.addParallelGatewaySenderId(sender);
+//      }
+//    }
+//    fact.setDataPolicy(DataPolicy.REPLICATE);
+//    Region r = cache.createRegionFactory(fact.create()).create(regionName);
+//    assertNotNull(r);
+//  }
+  
+//  public static void createReplicatedRegion(String regionName){
+//    AttributesFactory fact = new AttributesFactory();
+//    fact.setDataPolicy(DataPolicy.REPLICATE);
+//    Region r = cache.createRegionFactory(fact.create()).create(regionName);
+//    assertNotNull(r);
+//  }
+  
+  public static void createReplicatedRegionWithAsyncEventQueue(
+      String regionName, String asyncQueueIds, Boolean offHeap) {
+    ExpectedException exp1 = addExpectedException(ForceReattemptException.class
+        .getName());
+    try {
+      AttributesFactory fact = new AttributesFactory();
+      if (asyncQueueIds != null) {
+        StringTokenizer tokenizer = new StringTokenizer(asyncQueueIds, ",");
+        while (tokenizer.hasMoreTokens()) {
+          String asyncQueueId = tokenizer.nextToken();
+          fact.addAsyncEventQueueId(asyncQueueId);
+        }
+      }
+      fact.setDataPolicy(DataPolicy.REPLICATE);
+      fact.setOffHeap(offHeap);
+      RegionFactory regionFactory = cache.createRegionFactory(fact.create());
+      Region r = regionFactory.create(regionName);
+      assertNotNull(r);
+    }
+    finally {
+      exp1.remove();
+    }
+  }
+  
+  public static void createPersistentReplicatedRegionWithAsyncEventQueue(
+      String regionName, String asyncQueueIds) {
+        
+    AttributesFactory fact = new AttributesFactory();
+    if(asyncQueueIds != null){
+      StringTokenizer tokenizer = new StringTokenizer(asyncQueueIds, ",");
+      while (tokenizer.hasMoreTokens()){
+        String asyncQueueId = tokenizer.nextToken();
+        fact.addAsyncEventQueueId(asyncQueueId);
+      }
+    }
+    fact.setDataPolicy(DataPolicy.PERSISTENT_REPLICATE);
+    RegionFactory regionFactory = cache.createRegionFactory(fact.create());
+    Region r = regionFactory.create(regionName);
+    assertNotNull(r);
+  }
+  
+  
+  
+  public static void createReplicatedRegionWithSenderAndAsyncEventQueue(
+      String regionName, String senderIds, String asyncChannelId, Boolean offHeap) {
+    ExpectedException exp = addExpectedException(ForceReattemptException.class
+        .getName());
+    try {
+
+      AttributesFactory fact = new AttributesFactory();
+      if (senderIds != null) {
+        StringTokenizer tokenizer = new StringTokenizer(senderIds, ",");
+        while (tokenizer.hasMoreTokens()) {
+          String senderId = tokenizer.nextToken();
+          fact.addGatewaySenderId(senderId);
+        }
+      }
+      fact.setDataPolicy(DataPolicy.REPLICATE);
+      fact.setScope(Scope.DISTRIBUTED_ACK);
+      fact.setOffHeap(offHeap);
+      RegionFactory regionFactory = cache.createRegionFactory(fact.create());
+      regionFactory.addAsyncEventQueueId(asyncChannelId);
+      Region r = regionFactory.create(regionName);
+      assertNotNull(r);
+    }
+    finally {
+      exp.remove();
+    }
+  }
+  
+  public static void createReplicatedRegion(String regionName, String senderIds, Scope scope, DataPolicy policy, Boolean offHeap){
+    AttributesFactory fact = new AttributesFactory();
+    if(senderIds!= null){
+      StringTokenizer tokenizer = new StringTokenizer(senderIds, ",");
+      while (tokenizer.hasMoreTokens()){
+        String senderId = tokenizer.nextToken();
+//        GatewaySender sender = cache.getGatewaySender(senderId);
+//        assertNotNull(sender);
+        fact.addGatewaySenderId(senderId);
+      }
+    }
+    fact.setDataPolicy(policy);
+    fact.setScope(scope);
+    fact.setOffHeap(offHeap);
+    Region r = cache.createRegionFactory(fact.create()).create(regionName);
+    assertNotNull(r);
+  }
+  
+  public static void createAsyncEventQueue(
+      String asyncChannelId, boolean isParallel, 
+      Integer maxMemory, Integer batchSize, boolean isConflation, 
+      boolean isPersistent, String diskStoreName, boolean isDiskSynchronous) {
+    
+    if (diskStoreName != null) {
+      File directory = new File(asyncChannelId + "_disk_"
+          + System.currentTimeMillis() + "_" + VM.getCurrentVMNum());
+      directory.mkdir();
+      File[] dirs1 = new File[] { directory };
+      DiskStoreFactory dsf = cache.createDiskStoreFactory();
+      dsf.setDiskDirs(dirs1);
+      DiskStore ds = dsf.create(diskStoreName);
+    }
+    
+    AsyncEventListener asyncEventListener = new MyAsyncEventListener();
+    
+    AsyncEventQueueFactory factory = cache.createAsyncEventQueueFactory();
+    factory.setBatchSize(batchSize);
+    factory.setPersistent(isPersistent);
+    factory.setDiskStoreName(diskStoreName);
+    factory.setDiskSynchronous(isDiskSynchronous);
+    factory.setBatchConflationEnabled(isConflation);
+    factory.setMaximumQueueMemory(maxMemory);
+    factory.setParallel(isParallel);
+    //set dispatcher threads
+    factory.setDispatcherThreads(numDispatcherThreadsForTheRun);
+    AsyncEventQueue asyncChannel = factory.create(asyncChannelId, asyncEventListener);
+  }
+  
+  public static void createAsyncEventQueueWithListener2(String asyncChannelId,
+      boolean isParallel, Integer maxMemory, Integer batchSize,
+      boolean isPersistent, String diskStoreName) {
+    
+    if (diskStoreName != null) {
+      File directory = new File(asyncChannelId + "_disk_"
+          + System.currentTimeMillis() + "_" + VM.getCurrentVMNum());
+      directory.mkdir();
+      File[] dirs1 = new File[] { directory };
+      DiskStoreFactory dsf = cache.createDiskStoreFactory();
+      dsf.setDiskDirs(dirs1);
+      DiskStore ds = dsf.create(diskStoreName);
+    }
+    
+    AsyncEventListener asyncEventListener = new MyAsyncEventListener2();
+
+    AsyncEventQueueFactory factory = cache.createAsyncEventQueueFactory();
+    factory.setBatchSize(batchSize);
+    factory.setPersistent(isPersistent);
+    factory.setDiskStoreName(diskStoreName);
+    factory.setMaximumQueueMemory(maxMemory);
+    factory.setParallel(isParallel);
+    //set dispatcher threads
+    factory.setDispatcherThreads(numDispatcherThreadsForTheRun);
+    AsyncEventQueue asyncChannel = factory.create(asyncChannelId,
+        asyncEventListener);
+  }
+  
+  public static void createAsyncEventQueue(
+    String asyncChannelId, boolean isParallel, Integer maxMemory, 
+    Integer batchSize, boolean isConflation, boolean isPersistent, 
+    String diskStoreName, boolean isDiskSynchronous, String asyncListenerClass) throws Exception {
+	    
+	if (diskStoreName != null) {
+	  File directory = new File(asyncChannelId + "_disk_"
+		+ System.currentTimeMillis() + "_" + VM.getCurrentVMNum());
+	  directory.mkdir();
+	  File[] dirs1 = new File[] { directory };
+	  DiskStoreFactory dsf = cache.createDiskStoreFactory();
+	  dsf.setDiskDirs(dirs1);
+	  DiskStore ds = dsf.create(diskStoreName);
+	}
+	
+	String packagePrefix = "com.gemstone.gemfire.internal.cache.wan.";
+	String className = packagePrefix + asyncListenerClass;
+	AsyncEventListener asyncEventListener = null;
+	try {
+		Class clazz = Class.forName(className);
+		asyncEventListener = (AsyncEventListener) clazz.newInstance();
+	} catch (ClassNotFoundException e) {
+	  throw e;
+	} catch (InstantiationException e) {
+	  throw e;
+	} catch (IllegalAccessException e) {
+	  throw e;
+	}
+	    
+	AsyncEventQueueFactory factory = cache.createAsyncEventQueueFactory();
+	factory.setBatchSize(batchSize);
+	factory.setPersistent(isPersistent);
+	factory.setDiskStoreName(diskStoreName);
+	factory.setDiskSynchronous(isDiskSynchronous);
+	factory.setBatchConflationEnabled(isConflation);
+	factory.setMaximumQueueMemory(maxMemory);
+	factory.setParallel(isParallel);
+	//set dispatcher threads
+	factory.setDispatcherThreads(numDispatcherThreadsForTheRun);
+	AsyncEventQueue asyncChannel = factory.create(asyncChannelId, asyncEventListener);
+  }
+  
+  public static void createAsyncEventQueueWithCustomListener(
+      String asyncChannelId, boolean isParallel, Integer maxMemory,
+      Integer batchSize, boolean isConflation, boolean isPersistent,
+      String diskStoreName, boolean isDiskSynchronous) {
+    createAsyncEventQueueWithCustomListener(asyncChannelId, isParallel, maxMemory, batchSize,
+        isConflation, isPersistent, diskStoreName, isDiskSynchronous, GatewaySender.DEFAULT_DISPATCHER_THREADS);
+  }
+  
+  public static void createAsyncEventQueueWithCustomListener(
+      String asyncChannelId, boolean isParallel, Integer maxMemory,
+      Integer batchSize, boolean isConflation, boolean isPersistent,
+      String diskStoreName, boolean isDiskSynchronous, int nDispatchers) {
+
+    ExpectedException exp = addExpectedException(ForceReattemptException.class
+        .getName());
+
+    try {
+      if (diskStoreName != null) {
+        File directory = new File(asyncChannelId + "_disk_"
+            + System.currentTimeMillis() + "_" + VM.getCurrentVMNum());
+        directory.mkdir();
+        File[] dirs1 = new File[] { directory };
+        DiskStoreFactory dsf = cache.createDiskStoreFactory();
+        dsf.setDiskDirs(dirs1);
+        DiskStore ds = dsf.create(diskStoreName);
+      }
+
+      AsyncEventListener asyncEventListener = new CustomAsyncEventListener();
+
+      AsyncEventQueueFactory factory = cache.createAsyncEventQueueFactory();
+      factory.setBatchSize(batchSize);
+      factory.setPersistent(isPersistent);
+      factory.setDiskStoreName(diskStoreName);
+      factory.setMaximumQueueMemory(maxMemory);
+      factory.setParallel(isParallel);
+      factory.setDispatcherThreads(nDispatchers);
+      AsyncEventQueue asyncChannel = factory.create(asyncChannelId,
+          asyncEventListener);
+    } finally {
+      exp.remove();
+    }
+  }
+
+  public static void createConcurrentAsyncEventQueue(
+      String asyncChannelId, boolean isParallel, 
+      Integer maxMemory, Integer batchSize, boolean isConflation, 
+      boolean isPersistent, String diskStoreName, boolean isDiskSynchronous,
+      int dispatcherThreads, OrderPolicy policy) {
+    
+    if (diskStoreName != null) {
+      File directory = new File(asyncChannelId + "_disk_"
+          + System.currentTimeMillis() + "_" + VM.getCurrentVMNum());
+      directory.mkdir();
+      File[] dirs1 = new File[] { directory };
+      DiskStoreFactory dsf = cache.createDiskStoreFactory();
+      dsf.setDiskDirs(dirs1);
+      DiskStore ds = dsf.create(diskStoreName);
+    }
+    
+    AsyncEventListener asyncEventListener = new MyAsyncEventListener();
+    
+    AsyncEventQueueFactory factory = cache.createAsyncEventQueueFactory();
+    factory.setBatchSize(batchSize);
+    factory.setPersistent(isPersistent);
+    factory.setDiskStoreName(diskStoreName);
+    factory.setDiskSynchronous(isDiskSynchronous);
+    factory.setBatchConflationEnabled(isConflation);
+    factory.setMaximumQueueMemory(maxMemory);
+    factory.setParallel(isParallel);
+    factory.setDispatcherThreads(dispatcherThreads);
+    factory.setOrderPolicy(policy);
+    AsyncEventQueue asyncChannel = factory.create(asyncChannelId, asyncEventListener);
+  }
+  
+  
+  public static String createAsyncEventQueueWithDiskStore(
+      String asyncChannelId, boolean isParallel, 
+      Integer maxMemory, Integer batchSize, 
+      boolean isPersistent, String diskStoreName) {
+    
+    AsyncEventListener asyncEventListener = new MyAsyncEventListener();
+    
+    File persistentDirectory = null;
+    if (diskStoreName == null) {
+      persistentDirectory = new File(asyncChannelId + "_disk_"
+          + System.currentTimeMillis() + "_" + VM.getCurrentVMNum());
+    } else {
+      persistentDirectory = new File(diskStoreName); 
+    }
+    getLogWriter().info("The ds is : " + persistentDirectory.getName());
+    persistentDirectory.mkdir();
+    DiskStoreFactory dsf = cache.createDiskStoreFactory();
+    File [] dirs1 = new File[] {persistentDirectory};
+    
+    AsyncEventQueueFactory factory = cache.createAsyncEventQueueFactory();
+    factory.setBatchSize(batchSize);
+    factory.setParallel(isParallel);
+    if (isPersistent) {
+      factory.setPersistent(isPersistent);
+      factory.setDiskStoreName(dsf.setDiskDirs(dirs1).create(asyncChannelId).getName());
+    }
+    factory.setMaximumQueueMemory(maxMemory);
+    //set dispatcher threads
+    factory.setDispatcherThreads(numDispatcherThreadsForTheRun);
+    AsyncEventQueue asyncChannel = factory.create(asyncChannelId, asyncEventListener);
+    return persistentDirectory.getName();
+  }
+  
+  public static void pauseAsyncEventQueue(String asyncChannelId) {
+    AsyncEventQueue theChannel = null;
+    
+    Set<AsyncEventQueue> asyncEventChannels = cache.getAsyncEventQueues();
+    for (AsyncEventQueue asyncChannel : asyncEventChannels) {
+      if (asyncChannelId.equals(asyncChannel.getId())) {
+        theChannel = asyncChannel;
+      }
+    }
+    
+    ((AsyncEventQueueImpl)theChannel).getSender().pause();
+ }
+  
+  public static void pauseAsyncEventQueueAndWaitForDispatcherToPause(String asyncChannelId) {
+    AsyncEventQueue theChannel = null;
+    
+    Set<AsyncEventQueue> asyncEventChannels = cache.getAsyncEventQueues();
+    for (AsyncEventQueue asyncChannel : asyncEventChannels) {
+      if (asyncChannelId.equals(asyncChannel.getId())) {
+        theChannel = asyncChannel;
+        break;
+      }
+    }
+    
+    ((AsyncEventQueueImpl)theChannel).getSender().pause();
+    
+    
+    ((AbstractGatewaySender)((AsyncEventQueueImpl)theChannel).getSender()).getEventProcessor().waitForDispatcherToPause();
+  }
+  
+ public static void resumeAsyncEventQueue(String asyncQueueId) {
+    AsyncEventQueue theQueue = null;
+    
+    Set<AsyncEventQueue> asyncEventChannels = cache.getAsyncEventQueues();
+    for (AsyncEventQueue asyncChannel : asyncEventChannels) {
+      if (asyncQueueId.equals(asyncChannel.getId())) {
+        theQueue = asyncChannel;
+      }
+    }
+    
+    ((AsyncEventQueueImpl)theQueue).getSender().resume();
+  }
+  
+  
+  public static void checkAsyncEventQueueSize(String asyncQueueId, int numQueueEntries) {
+    AsyncEventQueue theAsyncEventQueue = null;
+    
+    Set<AsyncEventQueue> asyncEventChannels = cache.getAsyncEventQueues();
+    for (AsyncEventQueue asyncChannel : asyncEventChannels) {
+      if (asyncQueueId.equals(asyncChannel.getId())) {
+        theAsyncEventQueue = asyncChannel;
+      }
+    }
+    
+    GatewaySender sender = ((AsyncEventQueueImpl)theAsyncEventQueue).getSender();
+    
+    if (sender.isParallel()) {
+      Set<RegionQueue> queues = ((AbstractGatewaySender)sender).getQueues();
+      assertEquals(numQueueEntries,
+          queues.toArray(new RegionQueue[queues.size()])[0].getRegion().size());
+    } else {
+      Set<RegionQueue> queues = ((AbstractGatewaySender)sender).getQueues();
+      int size = 0;
+      for (RegionQueue q : queues) {
+        size += q.size();
+      }
+      assertEquals(numQueueEntries, size);
+    }
+  }
+  
+  /**
+   * This method verifies the queue size of a ParallelGatewaySender. For
+   * ParallelGatewaySender conflation happens in a separate thread, hence test
+   * code needs to wait for some time for expected result
+   * 
+   * @param asyncQueueId
+   *          Async Queue ID
+   * @param numQueueEntries
+   *          expected number of Queue entries
+   * @throws Exception
+   */
+  public static void waitForAsyncEventQueueSize(String asyncQueueId,
+      final int numQueueEntries) throws Exception {
+    AsyncEventQueue theAsyncEventQueue = null;
+
+    Set<AsyncEventQueue> asyncEventChannels = cache.getAsyncEventQueues();
+    for (AsyncEventQueue asyncChannel : asyncEventChannels) {
+      if (asyncQueueId.equals(asyncChannel.getId())) {
+        theAsyncEventQueue = asyncChannel;
+      }
+    }
+
+    GatewaySender sender = ((AsyncEventQueueImpl) theAsyncEventQueue)
+        .getSender();
+
+    if (sender.isParallel()) {
+      final Set<RegionQueue> queues = ((AbstractGatewaySender) sender)
+          .getQueues();
+
+      waitForCriterion(new WaitCriterion() {
+
+        public String description() {
+          return "Waiting for EventQueue size to be " + numQueueEntries;
+        }
+
+        public boolean done() {
+          boolean done = numQueueEntries == queues
+              .toArray(new RegionQueue[queues.size()])[0].getRegion().size();
+          return done;
+        }
+
+      }, MAX_WAIT, 500, true);
+
+    } else {
+      throw new Exception(
+          "This method should be used for only ParallelGatewaySender,SerialGatewaySender should use checkAsyncEventQueueSize() method instead");
+
+    }
+  }
+  
+  public static void createPartitionedRegion(String regionName, String senderIds, Integer redundantCopies, Integer totalNumBuckets, Boolean offHeap){
+    ExpectedException exp = addExpectedException(ForceReattemptException.class
+        .getName());
+    ExpectedException exp1 = addExpectedException(PartitionOfflineException.class
+        .getName());
+    try {
+      AttributesFactory fact = new AttributesFactory();
+      if (senderIds != null) {
+        StringTokenizer tokenizer = new StringTokenizer(senderIds, ",");
+        while (tokenizer.hasMoreTokens()) {
+          String senderId = tokenizer.nextToken();
+          // GatewaySender sender = cache.getGatewaySender(senderId);
+          // assertNotNull(sender);
+          fact.addGatewaySenderId(senderId);
+        }
+      }
+      PartitionAttributesFactory pfact = new PartitionAttributesFactory();
+      pfact.setTotalNumBuckets(totalNumBuckets);
+      pfact.setRedundantCopies(redundantCopies);
+      pfact.setRecoveryDelay(0);
+      fact.setPartitionAttributes(pfact.create());
+      fact.setOffHeap(offHeap);
+      Region r = cache.createRegionFactory(fact.create()).create(regionName);
+      assertNotNull(r);
+    }
+    finally {
+      exp.remove();
+      exp1.remove();
+    }
+  }
+  
+  // TODO:OFFHEAP: add offheap flavor
+  public static void createPartitionedRegionWithPersistence(String regionName,
+      String senderIds, Integer redundantCopies, Integer totalNumBuckets) {
+    ExpectedException exp = addExpectedException(ForceReattemptException.class
+        .getName());
+    ExpectedException exp1 = addExpectedException(PartitionOfflineException.class
+        .getName());
+    try {
+      AttributesFactory fact = new AttributesFactory();
+      if (senderIds != null) {
+        StringTokenizer tokenizer = new StringTokenizer(senderIds, ",");
+        while (tokenizer.hasMoreTokens()) {
+          String senderId = tokenizer.nextToken();
+          // GatewaySender sender = cache.getGatewaySender(senderId);
+          // assertNotNull(sender);
+          fact.addGatewaySenderId(senderId);
+        }
+      }
+      PartitionAttributesFactory pfact = new PartitionAttributesFactory();
+      pfact.setTotalNumBuckets(totalNumBuckets);
+      pfact.setRedundantCopies(redundantCopies);
+      pfact.setRecoveryDelay(0);
+      fact.setPartitionAttributes(pfact.create());
+      fact.setDataPolicy(DataPolicy.PERSISTENT_PARTITION);
+      Region r = cache.createRegionFactory(fact.create()).create(regionName);
+      assertNotNull(r);
+    }
+    finally {
+      exp.remove();
+      exp1.remove();
+    }
+  }
+  public static void createColocatedPartitionedRegion(String regionName,
+	      String senderIds, Integer redundantCopies, Integer totalNumBuckets, String colocatedWith) {
+	ExpectedException exp = addExpectedException(ForceReattemptException.class
+		.getName());
+	ExpectedException exp1 = addExpectedException(PartitionOfflineException.class
+		.getName());
+	try {
+	  AttributesFactory fact = new AttributesFactory();
+	  if (senderIds != null) {
+		  StringTokenizer tokenizer = new StringTokenizer(senderIds, ",");
+		  while (tokenizer.hasMoreTokens()) {
+			  String senderId = tokenizer.nextToken();
+	          // GatewaySender sender = cache.getGatewaySender(senderId);
+	          // assertNotNull(sender);
+			  fact.addGatewaySenderId(senderId);
+		  }
+	  }
+	  PartitionAttributesFactory pfact = new PartitionAttributesFactory();
+	  pfact.setTotalNumBuckets(totalNumBuckets);
+	  pfact.setRedundantCopies(redundantCopies);
+	  pfact.setRecoveryDelay(0);
+	  pfact.setColocatedWith(colocatedWith);
+	  fact.setPartitionAttributes(pfact.create());
+	  Region r = cache.createRegionFactory(fact.create()).create(regionName);
+	  assertNotNull(r);
+	}
+	finally {
+		exp.remove();
+		exp1.remove();
+	}
+  }
+  
+  public static void addSenderThroughAttributesMutator(String regionName,
+      String senderIds){
+    final Region r = cache.getRegion(Region.SEPARATOR + regionName);
+    assertNotNull(r);
+    AttributesMutator mutator = r.getAttributesMutator();
+    mutator.addGatewaySenderId(senderIds);
+  }
+  
+  public static void addAsyncEventQueueThroughAttributesMutator(
+      String regionName, String queueId) {
+    final Region r = cache.getRegion(Region.SEPARATOR + regionName);
+    assertNotNull(r);
+    AttributesMutator mutator = r.getAttributesMutator();
+    mutator.addAsyncEventQueueId(queueId);
+  }
+  
+  public static void createPartitionedRegionWithAsyncEventQueue(
+      String regionName, String asyncEventQueueId, Boolean offHeap) {
+    ExpectedException exp = addExpectedException(ForceReattemptException.class
+        .getName());
+    ExpectedException exp1 = addExpectedException(PartitionOfflineException.class
+        .getName());
+    try {
+      AttributesFactory fact = new AttributesFactory();
+
+      PartitionAttributesFactory pfact = new PartitionAttributesFactory();
+      pfact.setTotalNumBuckets(16);
+      fact.setPartitionAttributes(pfact.create());
+      fact.setOffHeap(offHeap);
+      Region r = cache.createRegionFactory(fact.create())
+          .addAsyncEventQueueId(asyncEventQueueId).create(regionName);
+      assertNotNull(r);
+    }
+    finally {
+      exp.remove();
+      exp1.remove();
+    }
+  }
+  
+  public static void createColocatedPartitionedRegionWithAsyncEventQueue(
+    String regionName, String asyncEventQueueId, Integer totalNumBuckets, String colocatedWith) {
+	
+	ExpectedException exp = addExpectedException(ForceReattemptException.class
+	  .getName());
+	ExpectedException exp1 = addExpectedException(PartitionOfflineException.class
+	  .getName());
+	try {
+	  AttributesFactory fact = new AttributesFactory();
+
+	  PartitionAttributesFactory pfact = new PartitionAttributesFactory();
+	  pfact.setTotalNumBuckets(totalNumBuckets);
+	  pfact.setColocatedWith(colocatedWith);
+	  fact.setPartitionAttributes(pfact.create());
+	  Region r = cache.createRegionFactory(fact.create())
+	    .addAsyncEventQueueId(asyncEventQueueId).create(regionName);
+	  assertNotNull(r);
+	}
+	finally {
+	  exp.remove();
+	  exp1.remove();
+	}
+  }
+  
+  public static void createPersistentPartitionedRegionWithAsyncEventQueue(
+      String regionName, String asyncEventQueueId) {
+    AttributesFactory fact = new AttributesFactory();
+
+    PartitionAttributesFactory pfact = new PartitionAttributesFactory();
+    fact.setDataPolicy(DataPolicy.PERSISTENT_PARTITION);
+    pfact.setTotalNumBuckets(16);
+    fact.setPartitionAttributes(pfact.create());
+    if (asyncEventQueueId != null) {
+      StringTokenizer tokenizer = new StringTokenizer(asyncEventQueueId, ",");
+      while (tokenizer.hasMoreTokens()) {
+        String asyncId = tokenizer.nextToken();
+        fact.addAsyncEventQueueId(asyncId);
+      }
+    }
+    Region r = cache.createRegionFactory(fact.create()).create(regionName);
+    assertNotNull(r);
+  }
+  
+  /**
+   * Create PartitionedRegion with 1 redundant copy
+   */
+  public static void createPRWithRedundantCopyWithAsyncEventQueue(
+      String regionName, String asyncEventQueueId, Boolean offHeap) {
+    ExpectedException exp = addExpectedException(ForceReattemptException.class
+        .getName());
+
+    try {
+      AttributesFactory fact = new AttributesFactory();
+
+      PartitionAttributesFactory pfact = new PartitionAttributesFactory();
+      pfact.setTotalNumBuckets(16);
+      pfact.setRedundantCopies(1);
+      fact.setPartitionAttributes(pfact.create());
+      fact.setOffHeap(offHeap);
+      Region r = cache.createRegionFactory(fact.create())
+          .addAsyncEventQueueId(asyncEventQueueId).create(regionName);
+      assertNotNull(r);
+    }
+    finally {
+      exp.remove();
+    }
+  }
+  
+  public static void createPartitionedRegionAccessorWithAsyncEventQueue(
+      String regionName, String asyncEventQueueId) {
+    AttributesFactory fact = new AttributesFactory();
+    PartitionAttributesFactory pfact = new PartitionAttributesFactory();
+    pfact.setTotalNumBuckets(16);
+    pfact.setLocalMaxMemory(0);
+    fact.setPartitionAttributes(pfact.create());
+    Region r = cache.createRegionFactory(
+    fact.create()).addAsyncEventQueueId(
+    asyncEventQueueId).create(regionName);
+    //fact.create()).create(regionName);
+    assertNotNull(r);
+  }
+  
+  public static void createPartitionedRegionAsAccessor(
+      String regionName, String senderIds, Integer redundantCopies, Integer totalNumBuckets){
+    AttributesFactory fact = new AttributesFactory();
+    if(senderIds!= null){
+      StringTokenizer tokenizer = new StringTokenizer(senderIds, ",");
+      while (tokenizer.hasMoreTokens()){
+        String senderId = tokenizer.nextToken();
+//        GatewaySender sender = cache.getGatewaySender(senderId);
+//        assertNotNull(sender);
+        fact.addGatewaySenderId(senderId);
+      }
+    }
+    PartitionAttributesFactory pfact = new PartitionAttributesFactory();
+    pfact.setTotalNumBuckets(totalNumBuckets);
+    pfact.setRedundantCopies(redundantCopies);
+    pfact.setLocalMaxMemory(0);
+    fact.setPartitionAttributes(pfact.create());
+    Region r = cache.createRegionFactory(fact.create()).create(regionName);
+    assertNotNull(r);
+  }
+  
+  public static void createPartitionedRegionWithSerialParallelSenderIds(String regionName, String serialSenderIds, String parallelSenderIds, String colocatedWith, Boolean offHeap){
+    AttributesFactory fact = new AttributesFactory();
+    if (serialSenderIds != null) {
+      StringTokenizer tokenizer = new StringTokenizer(serialSenderIds, ",");
+      while (tokenizer.hasMoreTokens()) {
+        String senderId = tokenizer.nextToken();
+        // GatewaySender sender = cache.getGatewaySender(senderId);
+        // assertNotNull(sender);
+        fact.addGatewaySenderId(senderId);
+      }
+    }
+    if (parallelSenderIds != null) {
+      StringTokenizer tokenizer = new StringTokenizer(parallelSenderIds, ",");
+      while (tokenizer.hasMoreTokens()) {
+        String senderId = tokenizer.nextToken();
+//        GatewaySender sender = cache.getGatewaySender(senderId);
+//        assertNotNull(sender);
+        fact.addGatewaySenderId(senderId);
+      }
+    }
+    PartitionAttributesFactory pfact = new PartitionAttributesFactory();
+    pfact.setColocatedWith(colocatedWith);
+    fact.setPartitionAttributes(pfact.create());
+    fact.setOffHeap(offHeap);
+    Region r = cache.createRegionFactory(fact.create()).create(regionName);
+    assertNotNull(r);
+  }
+  
+  public static void createPersistentPartitionedRegion(
+      String regionName, 
+      String senderIds, 
+      Integer redundantCopies, 
+      Integer totalNumBuckets,
+      Boolean offHeap){
+    
+    ExpectedException exp = addExpectedException(ForceReattemptException.class
+        .getName());
+    ExpectedException exp1 = addExpectedException(PartitionOfflineException.class
+        .getName());
+    try {
+
+      AttributesFactory fact = new AttributesFactory();
+      if (senderIds != null) {
+        StringTokenizer tokenizer = new StringTokenizer(senderIds, ",");
+        while (tokenizer.hasMoreTokens()) {
+          String senderId = tokenizer.nextToken();
+          // GatewaySender sender = cache.getGatewaySender(senderId);
+          // assertNotNull(sender);
+          fact.addGatewaySenderId(senderId);
+        }
+      }
+      PartitionAttributesFactory pfact = new PartitionAttributesFactory();
+      pfact.setTotalNumBuckets(totalNumBuckets);
+      pfact.setRedundantCopies(redundantCopies);
+      fact.setPartitionAttributes(pfact.create());
+      fact.setDataPolicy(DataPolicy.PERSISTENT_PARTITION);
+      fact.setOffHeap(offHeap);
+      Region r = cache.createRegionFactory(fact.create()).create(regionName);
+      assertNotNull(r);
+    }
+    finally {
+      exp.remove();
+      exp1.remove();
+    }
+  }
+  
+  public static void createCustomerOrderShipmentPartitionedRegion(
+      String regionName, String senderIds, Integer redundantCopies,
+      Integer totalNumBuckets, Boolean offHeap) {
+    ExpectedException exp = addExpectedException(ForceReattemptException.class
+        .getName());
+    try {
+      AttributesFactory fact = new AttributesFactory();
+      if (senderIds != null) {
+        StringTokenizer tokenizer = new StringTokenizer(senderIds, ",");
+        while (tokenizer.hasMoreTokens()) {
+          String senderId = tokenizer.nextToken();
+          // GatewaySender sender = cache.getGatewaySender(senderId);
+          // assertNotNull(sender);
+          fact.addGatewaySenderId(senderId);
+        }
+      }
+
+      PartitionAttributesFactory paf = new PartitionAttributesFactory();
+      // creating colocated Regions
+      paf = new PartitionAttributesFactory();
+      paf.setRedundantCopies(redundantCopies)
+          .setTotalNumBuckets(totalNumBuckets)
+          .setPartitionResolver(
+              new CustomerIDPartitionResolver("CustomerIDPartitionResolver"));
+      fact.setPartitionAttributes(paf.create());
+      fact.setOffHeap(offHeap);
+      customerRegion = (PartitionedRegion)cache.createRegionFactory(
+          fact.create()).create(customerRegionName);
+      assertNotNull(customerRegion);
+      getLogWriter().info(
+          "Partitioned Region CUSTOMER created Successfully :"
+              + customerRegion.toString());
+
+      paf = new PartitionAttributesFactory();
+      paf.setRedundantCopies(redundantCopies)
+          .setTotalNumBuckets(totalNumBuckets)
+          .setColocatedWith(customerRegionName)
+          .setPartitionResolver(
+              new CustomerIDPartitionResolver("CustomerIDPartitionResolver"));
+      fact = new AttributesFactory();
+      if (senderIds != null) {
+        StringTokenizer tokenizer = new StringTokenizer(senderIds, ",");
+        while (tokenizer.hasMoreTokens()) {
+          String senderId = tokenizer.nextToken();
+          // GatewaySender sender = cache.getGatewaySender(senderId);
+          // assertNotNull(sender);
+          fact.addGatewaySenderId(senderId);
+        }
+      }
+      fact.setPartitionAttributes(paf.create());
+      fact.setOffHeap(offHeap);
+      orderRegion = (PartitionedRegion)cache.createRegionFactory(fact.create())
+          .create(orderRegionName);
+      assertNotNull(orderRegion);
+      getLogWriter().info(
+          "Partitioned Region ORDER created Successfully :"
+              + orderRegion.toString());
+
+      paf = new PartitionAttributesFactory();
+      paf.setRedundantCopies(redundantCopies)
+          .setTotalNumBuckets(totalNumBuckets)
+          .setColocatedWith(orderRegionName)
+          .setPartitionResolver(
+              new CustomerIDPartitionResolver("CustomerIDPartitionResolver"));
+      fact = new AttributesFactory();
+      if (senderIds != null) {
+        StringTokenizer tokenizer = new StringTokenizer(senderIds, ",");
+        while (tokenizer.hasMoreTokens()) {
+          String senderId = tokenizer.nextToken();
+          // GatewaySender sender = cache.getGatewaySender(senderId);
+          // assertNotNull(sender);
+          fact.addGatewaySenderId(senderId);
+        }
+      }
+      fact.setPartitionAttributes(paf.create());
+      fact.setOffHeap(offHeap);
+      shipmentRegion = (PartitionedRegion)cache.createRegionFactory(
+          fact.create()).create(shipmentRegionName);
+      assertNotNull(shipmentRegion);
+      getLogWriter().info(
+          "Partitioned Region SHIPMENT created Successfully :"
+              + shipmentRegion.toString());
+    }
+    finally {
+      exp.remove();
+    }
+  }
+  
+  public static void createColocatedPartitionedRegions(String regionName, String senderIds, Integer redundantCopies, Integer totalNumBuckets, Boolean offHeap){
+    AttributesFactory fact = new AttributesFactory();
+    if(senderIds!= null){
+      StringTokenizer tokenizer = new StringTokenizer(senderIds, ",");
+      while (tokenizer.hasMoreTokens()){
+        String senderId = tokenizer.nextToken();
+//        GatewaySender sender = cache.getGatewaySender(senderId);
+//        assertNotNull(sender);
+        fact.addGatewaySenderId(senderId);
+      }
+    }
+    PartitionAttributesFactory pfact = new PartitionAttributesFactory();
+    pfact.setTotalNumBuckets(totalNumBuckets);
+    pfact.setRedundantCopies(redundantCopies);
+    fact.setPartitionAttributes(pfact.create());
+    fact.setOffHeap(offHeap);
+    Region r = cache.createRegionFactory(fact.create()).create(regionName);
+    assertNotNull(r);
+    
+    pfact.setColocatedWith(r.getName());
+    fact.setPartitionAttributes(pfact.create());
+    fact.setOffHeap(offHeap);
+    Region r1 = cache.createRegionFactory(fact.create()).create(regionName+"_child1");
+    assertNotNull(r1);    
+    
+    Region r2 = cache.createRegionFactory(fact.create()).create(regionName+"_child2");
+    assertNotNull(r2);
+  }
+  
+  public static void createColocatedPartitionedRegions2 (String regionName, String senderIds, Integer redundantCopies, Integer totalNumBuckets, Boolean offHeap){
+    AttributesFactory fact = new AttributesFactory();
+    if(senderIds!= null){
+      StringTokenizer tokenizer = new StringTokenizer(senderIds, ",");
+      while (tokenizer.hasMoreTokens()){
+        String senderId = tokenizer.nextToken();
+//        GatewaySender sender = cache.getGatewaySender(senderId);
+//        assertNotNull(sender);
+        fact.addGatewaySenderId(senderId);
+      }
+    }
+    PartitionAttributesFactory pfact = new PartitionAttributesFactory();
+    pfact.setTotalNumBuckets(totalNumBuckets);
+    pfact.setRedundantCopies(redundantCopies);
+    fact.setPartitionAttributes(pfact.create());
+    fact.setOffHeap(offHeap);
+    Region r = cache.createRegionFactory(fact.create()).create(regionName);
+    assertNotNull(r);
+    
+    
+    fact = new AttributesFactory();
+    pfact.setColocatedWith(r.getName());
+    fact.setPartitionAttributes(pfact.create());
+    fact.setOffHeap(offHeap);
+    Region r1 = cache.createRegionFactory(fact.create()).create(regionName+"_child1");
+    assertNotNull(r1);    
+    
+    Region r2 = cache.createRegionFactory(fact.create()).create(regionName+"_child2");
+    assertNotNull(r2);
+  }
+  
+  public static void createCache(Integer locPort){
+    createCache(false, locPort);
+  }
+  public static void createManagementCache(Integer locPort){
+    createCache(true, locPort);
+  }
+  
+  public static void createCacheConserveSockets(Boolean conserveSockets,Integer locPort){
+    WANTestBase test = new WANTestBase(testName);
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]");
+    props.setProperty(DistributionConfig.CONSERVE_SOCKETS_NAME, conserveSockets.toString());   
+    InternalDistributedSystem ds = test.getSystem(props);
+    cache = CacheFactory.create(ds);
+  }
+  
+  protected static void createCache(boolean management, Integer locPort) {
+    WANTestBase test = new WANTestBase(testName);
+    Properties props = new Properties();
+    if (management) {
+      props.setProperty(DistributionConfig.JMX_MANAGER_NAME, "true");
+      props.setProperty(DistributionConfig.JMX_MANAGER_START_NAME, "false");
+      props.setProperty(DistributionConfig.JMX_MANAGER_PORT_NAME, "0");
+      props.setProperty(DistributionConfig.JMX_MANAGER_HTTP_PORT_NAME, "0");
+    }
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]");
+    InternalDistributedSystem ds = test.getSystem(props);
+    cache = CacheFactory.create(ds);    
+  }
+  
+  protected static void createCacheWithSSL(Integer locPort) {
+    WANTestBase test = new WANTestBase(testName);
+
+    boolean gatewaySslenabled = true;
+    String  gatewaySslprotocols = "any";
+    String  gatewaySslciphers = "any";
+    boolean gatewaySslRequireAuth = true;
+    
+    Properties gemFireProps = new Properties();
+    gemFireProps.put(DistributionConfig.LOG_LEVEL_NAME, getDUnitLogLevel());
+    gemFireProps.put(DistributionConfig.GATEWAY_SSL_ENABLED_NAME, String.valueOf(gatewaySslenabled));
+    gemFireProps.put(DistributionConfig.GATEWAY_SSL_PROTOCOLS_NAME, gatewaySslprotocols);
+    gemFireProps.put(DistributionConfig.GATEWAY_SSL_CIPHERS_NAME, gatewaySslciphers);
+    gemFireProps.put(DistributionConfig.GATEWAY_SSL_REQUIRE_AUTHENTICATION_NAME, String.valueOf(gatewaySslRequireAuth));
+    
+    gemFireProps.put(DistributionConfig.GATEWAY_SSL_KEYSTORE_TYPE_NAME, "jks");
+    gemFireProps.put(DistributionConfig.GATEWAY_SSL_KEYSTORE_NAME, 
+        TestUtil.getResourcePath(WANTestBase.class, "/com/gemstone/gemfire/cache/client/internal/client.keystore"));
+    gemFireProps.put(DistributionConfig.GATEWAY_SSL_KEYSTORE_PASSWORD_NAME, "password");
+    gemFireProps.put(DistributionConfig.GATEWAY_SSL_TRUSTSTORE_NAME, 
+        TestUtil.getResourcePath(WANTestBase.class, "/com/gemstone/gemfire/cache/client/internal/client.truststore"));
+    gemFireProps.put(DistributionConfig.GATEWAY_SSL_TRUSTSTORE_PASSWORD_NAME, "password");
+    
+    gemFireProps.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    gemFireProps.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]");
+    
+    getLogWriter().info("Starting cache ds with following properties \n" + gemFireProps);
+    
+    InternalDistributedSystem ds = test.getSystem(gemFireProps);
+    cache = CacheFactory.create(ds);    
+  }
+  
+  public static void createCache_PDX(Integer locPort){
+    WANTestBase test = new WANTestBase(testName);
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]");
+    InternalDistributedSystem ds = test.getSystem(props);
+    CacheConfig cacheConfig = new CacheConfig();
+    cacheConfig.setPdxPersistent(true);
+    cacheConfig.setPdxDiskStore("PDX_TEST");
+    cache = GemFireCacheImpl.create(ds, false, cacheConfig);
+    
+    File pdxDir = new File(CacheTestCase.getDiskDir(), "pdx");
+    DiskStoreFactory dsf = cache.createDiskStoreFactory();
+    File [] dirs1 = new File[] {pdxDir};
+    DiskStore store = dsf.setDiskDirs(dirs1).setMaxOplogSize(1).create("PDX_TEST");
+  }
+  
+  public static void createCache(Integer locPort1, Integer locPort2){
+    WANTestBase test = new WANTestBase(testName);
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort1
+        + "],localhost[" + locPort2 + "]");
+    InternalDistributedSystem ds = test.getSystem(props);
+    cache = CacheFactory.create(ds);
+  }
+  
+  public static void createCacheWithoutLocator(Integer mCastPort){
+    WANTestBase test = new WANTestBase(testName);
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, ""+mCastPort);
+    InternalDistributedSystem ds = test.getSystem(props);
+    cache = CacheFactory.create(ds);
+  }
+  
+  /**
+   * Method that creates a bridge server
+   * 
+   * @return    Integer   Port on which the server is started.
+   */
+  public static Integer createCacheServer() {
+    CacheServer server1 = cache.addCacheServer();
+    assertNotNull(server1);
+    int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    server1.setPort(port);
+    try {
+      server1.start();
+    }
+    catch (IOException e) {
+      fail("Failed to start the Server", e);
+    }
+    assertTrue(server1.isRunning());
+
+    return new Integer(server1.getPort());
+  }
+  
+  /**
+   * Returns a Map that contains the count for number of bridge server and number
+   * of Receivers.
+   * 
+   * @return    Map
+   */
+  public static Map getCacheServers() {
+    List cacheServers = cache.getCacheServers();
+    
+    Map cacheServersMap = new HashMap();
+    Iterator itr = cacheServers.iterator();
+    int bridgeServerCounter = 0;
+    int receiverServerCounter = 0;
+    while (itr.hasNext()) {
+      CacheServerImpl cacheServer = (CacheServerImpl) itr.next();
+      if (cacheServer.getAcceptor().isGatewayReceiver()) {
+        receiverServerCounter++;
+      } else {
+        bridgeServerCounter++;
+      }
+    }
+    cacheServersMap.put("BridgeServer", bridgeServerCounter);
+    cacheServersMap.put("ReceiverServer", receiverServerCounter);
+    return cacheServersMap;
+  }
+  
+  public static void startSender(String senderId) {
+    final ExpectedException exln = addExpectedException("Could not connect");
+
+    ExpectedException exp = addExpectedException(ForceReattemptException.class
+        .getName());
+    ExpectedException exp1 = addExpectedException(InterruptedException.class
+        .getName());
+    try {
+      Set<GatewaySender> senders = cache.getGatewaySenders();
+      GatewaySender sender = null;
+      for (GatewaySender s : senders) {
+        if (s.getId().equals(senderId)) {
+          sender = s;
+          break;
+        }
+      }
+      sender.start();
+    } finally {
+      exp.remove();
+      exp1.remove();
+      exln.remove();
+    }
+
+  }
+  
+  public static void enableConflation(String senderId) {
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    AbstractGatewaySender sender = null;
+    for (GatewaySender s : senders) {
+      if (s.getId().equals(senderId)) {
+        sender = (AbstractGatewaySender)s;
+        break;
+      }
+    }
+    sender.test_setBatchConflationEnabled(true);
+  }
+  
+  public static void startAsyncEventQueue(String senderId) {
+    Set<AsyncEventQueue> queues = cache.getAsyncEventQueues();
+    AsyncEventQueue q = null;
+    for (AsyncEventQueue s : queues) {
+      if (s.getId().equals(senderId)) {
+        q = s;
+        break;
+      }
+    }
+    //merge42180: There is no start method on AsyncEventQueue. Cheetah has this method. Yet the code for AsyncEvnt Queue is not properly merged from cheetah to cedar
+    //q.start();
+  }
+  
+  /*
+  public static Map getSenderToReceiverConnectionInfo(String senderId){	
+	  Set<GatewaySender> senders = cache.getGatewaySenders();
+	  GatewaySender sender = null;
+	  for(GatewaySender s : senders){
+		  if(s.getId().equals(senderId)){
+			  sender = s;
+			  break;
+	      }
+	  }
+	  Map connectionInfo = null;
+	  if (!sender.isParallel() && ((AbstractGatewaySender) sender).isPrimary()) {
+		  connectionInfo = new HashMap();
+		  GatewaySenderEventDispatcher dispatcher = 
+			  ((AbstractGatewaySender)sender).getEventProcessor().getDispatcher();
+		  if (dispatcher instanceof GatewaySenderEventRemoteDispatcher) {
+			  ServerLocation serverLocation = 
+				  ((GatewaySenderEventRemoteDispatcher) dispatcher).getConnection().getServer();
+			  connectionInfo.put("serverHost", serverLocation.getHostName());
+			  connectionInfo.put("serverPort", serverLocation.getPort());
+			  
+		  }
+	  }
+	  return connectionInfo;
+  }
+  */
+  public static List<Integer> getSenderStats(String senderId, final int expectedQueueSize){
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    AbstractGatewaySender sender = null;
+    for (GatewaySender s : senders) {
+      if (s.getId().equals(senderId)) {
+        sender = (AbstractGatewaySender)s;
+        break;
+      }
+    }
+    final GatewaySenderStats statistics = ((AbstractGatewaySender)sender).getStatistics();
+    if (expectedQueueSize != -1) {
+      final RegionQueue regionQueue;
+      regionQueue = sender.getQueues().toArray(
+          new RegionQueue[1])[0];
+      WaitCriterion wc = new WaitCriterion() {
+        public boolean done() {
+          if (regionQueue.size() == expectedQueueSize) {
+            return true;
+          }
+          return false;
+        }
+
+        public String description() {
+          return "Expected queue entries: " + expectedQueueSize
+              + " but actual entries: " + regionQueue.size();
+        }
+      };
+      DistributedTestCase.waitForCriterion(wc, 120000, 500, true);
+    }
+    ArrayList<Integer> stats = new ArrayList<Integer>();
+    stats.add(statistics.getEventQueueSize());
+    stats.add(statistics.getEventsReceived());
+    stats.add(statistics.getEventsQueued());
+    stats.add(statistics.getEventsDistributed());
+    stats.add(statistics.getBatchesDistributed());
+    stats.add(statistics.getBatchesRedistributed());
+    stats.add(statistics.getEventsFiltered());
+    stats.add(statistics.getEventsNotQueuedConflated());
+    stats.add(statistics.getEventsConflatedFromBatches());
+    return stats;
+  }
+      
+  public static void checkQueueStats(String senderId, final int queueSize,
+      final int eventsReceived, final int eventsQueued,
+      final int eventsDistributed) {
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    GatewaySender sender = null;
+    for (GatewaySender s : senders) {
+      if (s.getId().equals(senderId)) {
+        sender = s;
+        break;
+      }
+    }
+    
+    final GatewaySenderStats statistics = ((AbstractGatewaySender)sender).getStatistics();
+    assertEquals(queueSize, statistics.getEventQueueSize());
+    assertEquals(eventsReceived, statistics.getEventsReceived());
+    assertEquals(eventsQueued, statistics.getEventsQueued());
+    assert(statistics.getEventsDistributed() >= eventsDistributed);
+  }
+
+  public static void checkAsyncEventQueueStats(String queueId, final int queueSize,
+      final int eventsReceived, final int eventsQueued,
+      final int eventsDistributed) {
+    Set<AsyncEventQueue> asyncQueues = cache.getAsyncEventQueues();
+    AsyncEventQueue queue = null;
+    for (AsyncEventQueue q : asyncQueues) {
+      if (q.getId().equals(queueId)) {
+        queue = q;
+        break;
+      }
+    }
+    final AsyncEventQueueStats statistics = ((AsyncEventQueueImpl)queue).getStatistics();
+    assertEquals(queueSize, statistics.getEventQueueSize()); 
+    assertEquals(eventsReceived, statistics.getEventsReceived());
+    assertEquals(eventsQueued, statistics.getEventsQueued());
+    assert(statistics.getEventsDistributed() >= eventsDistributed);
+  }
+  
+  public static void checkGatewayReceiverStats(int processBatches,
+      int eventsReceived, int creates) {
+    Set<GatewayReceiver> gatewayReceivers = cache.getGatewayReceivers();
+    GatewayReceiver receiver = (GatewayReceiver)gatewayReceivers.iterator().next();
+    CacheServerStats stats = ((CacheServerImpl)receiver.getServer())
+        .getAcceptor().getStats();
+
+    assertTrue(stats instanceof GatewayReceiverStats);
+    GatewayReceiverStats gatewayReceiverStats = (GatewayReceiverStats)stats;
+    assertTrue(gatewayReceiverStats.getProcessBatchRequests() >= processBatches);
+    assertEquals(eventsReceived, gatewayReceiverStats.getEventsReceived());
+    assertEquals(creates, gatewayReceiverStats.getCreateRequest());
+  }
+
+  public static void checkMinimumGatewayReceiverStats(int processBatches,
+      int eventsReceived) {
+    Set<GatewayReceiver> gatewayReceivers = cache.getGatewayReceivers();
+    GatewayReceiver receiver = (GatewayReceiver)gatewayReceivers.iterator().next();
+    CacheServerStats stats = ((CacheServerImpl)receiver.getServer())
+        .getAcceptor().getStats();
+
+    assertTrue(stats instanceof GatewayReceiverStats);
+    GatewayReceiverStats gatewayReceiverStats = (GatewayReceiverStats)stats;
+    assertTrue(gatewayReceiverStats.getProcessBatchRequests() >= processBatches);
+    assertTrue(gatewayReceiverStats.getEventsReceived()>= eventsReceived);
+  }
+  
+  public static void checkExcepitonStats(int exceptionsOccured) {
+    Set<GatewayReceiver> gatewayReceivers = cache.getGatewayReceivers();
+    GatewayReceiver receiver = (GatewayReceiver)gatewayReceivers.iterator().next();
+    CacheServerStats stats = ((CacheServerImpl)receiver.getServer())
+        .getAcceptor().getStats();
+
+    assertTrue(stats instanceof GatewayReceiverStats);
+    GatewayReceiverStats gatewayReceiverStats = (GatewayReceiverStats)stats;
+    if (exceptionsOccured == 0) {
+      assertEquals(exceptionsOccured, gatewayReceiverStats
+          .getExceptionsOccured());
+    }
+    else {
+      assertTrue(gatewayReceiverStats.getExceptionsOccured() >= exceptionsOccured);
+    }
+  }
+
+  public static void checkGatewayReceiverStatsHA(int processBatches,
+      int eventsReceived, int creates) {
+    Set<GatewayReceiver> gatewayReceivers = cache.getGatewayReceivers();
+    GatewayReceiver receiver = (GatewayReceiver)gatewayReceivers.iterator().next();
+    CacheServerStats stats = ((CacheServerImpl)receiver.getServer())
+        .getAcceptor().getStats();
+
+    assertTrue(stats instanceof GatewayReceiverStats);
+    GatewayReceiverStats gatewayReceiverStats = (GatewayReceiverStats)stats;
+    assertTrue(gatewayReceiverStats.getProcessBatchRequests() >= processBatches);
+    assertTrue(gatewayReceiverStats.getEventsReceived() >= eventsReceived);
+    assertTrue(gatewayReceiverStats.getCreateRequest() >= creates);
+  }
+  
+  public static void checkEventFilteredStats(String senderId, final int eventsFiltered) {
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    GatewaySender sender = null;
+    for (GatewaySender s : senders) {
+      if (s.getId().equals(senderId)) {
+        sender = s;
+        break;
+      }
+    }
+    final GatewaySenderStats statistics = ((AbstractGatewaySender)sender).getStatistics();
+    assertEquals(eventsFiltered, statistics.getEventsFiltered());
+  }
+  
+  public static void checkConflatedStats(String senderId, final int eventsConflated) {
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    GatewaySender sender = null;
+    for (GatewaySender s : senders) {
+      if (s.getId().equals(senderId)) {
+        sender = s;
+        break;
+      }
+    }
+    final GatewaySenderStats statistics = ((AbstractGatewaySender)sender).getStatistics();
+    assertEquals(eventsConflated, statistics.getEventsNotQueuedConflated());
+  }
+  
+  public static void checkAsyncEventQueueConflatedStats(
+      String asyncEventQueueId, final int eventsConflated) {
+    Set<AsyncEventQueue> queues = cache.getAsyncEventQueues();
+    AsyncEventQueue queue = null;
+    for (AsyncEventQueue q : queues) {
+      if (q.getId().equals(asyncEventQueueId)) {
+        queue = q;
+        break;
+      }
+    }
+    final AsyncEventQueueStats statistics = ((AsyncEventQueueImpl)queue)
+        .getStatistics();
+    assertEquals(eventsConflated, statistics.getEventsNotQueuedConflated());
+  }
+  
+  public static void checkStats_Failover(String senderId,
+      final int eventsReceived) {
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    GatewaySender sender = null;
+    for (GatewaySender s : senders) {
+      if (s.getId().equals(senderId)) {
+        sender = s;
+        break;
+      }
+    }
+    final GatewaySenderStats statistics = ((AbstractGatewaySender)sender)
+        .getStatistics();
+
+    assertEquals(eventsReceived, statistics.getEventsReceived());
+    assertEquals(eventsReceived, (statistics.getEventsQueued()
+        + statistics.getUnprocessedTokensAddedByPrimary() + statistics
+        .getUnprocessedEventsRemovedByPrimary()));
+  }
+  
+  public static void checkAsyncEventQueueStats_Failover(String asyncEventQueueId,
+      final int eventsReceived) {
+    Set<AsyncEventQueue> asyncEventQueues = cache.getAsyncEventQueues();
+    AsyncEventQueue queue = null;
+    for (AsyncEventQueue q : asyncEventQueues) {
+      if (q.getId().equals(asyncEventQueueId)) {
+        queue = q;
+        break;
+      }
+    }
+    final AsyncEventQueueStats statistics = ((AsyncEventQueueImpl) queue)
+        .getStatistics();
+
+    assertEquals(eventsReceived, statistics.getEventsReceived());
+    assertEquals(eventsReceived, (statistics.getEventsQueued()
+        + statistics.getUnprocessedTokensAddedByPrimary() + statistics
+        .getUnprocessedEventsRemovedByPrimary()));
+  }
+
+  public static void checkBatchStats(String senderId, final int batches) {
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    GatewaySender sender = null;
+    for (GatewaySender s : senders) {
+      if (s.getId().equals(senderId)) {
+        sender = s;
+        break;
+      }
+    }
+    final GatewaySenderStats statistics = ((AbstractGatewaySender)sender)
+        .getStatistics();
+    assert (statistics.getBatchesDistributed() >= batches);
+    assertEquals(0, statistics.getBatchesRedistributed());
+  }
+  
+  public static void checkAsyncEventQueueBatchStats(String asyncQueueId,
+      final int batches) {
+    Set<AsyncEventQueue> queues = cache.getAsyncEventQueues();
+    AsyncEventQueue queue = null;
+    for (AsyncEventQueue q : queues) {
+      if (q.getId().equals(asyncQueueId)) {
+        queue = q;
+        break;
+      }
+    }
+    final AsyncEventQueueStats statistics = ((AsyncEventQueueImpl)queue)
+        .getStatistics();
+    assert (statistics.getBatchesDistributed() >= batches);
+    assertEquals(0, statistics.getBatchesRedistributed());
+  }
+
+  public static void checkBatchStats(String senderId,
+      final boolean batchesDistributed, final boolean bathcesRedistributed) {
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    GatewaySender sender = null;
+    for (GatewaySender s : senders) {
+      if (s.getId().equals(senderId)) {
+        sender = s;
+        break;
+      }
+    }
+    final GatewaySenderStats statistics = ((AbstractGatewaySender)sender)
+        .getStatistics();
+    assertEquals(batchesDistributed, (statistics.getBatchesDistributed() > 0));
+    assertEquals(bathcesRedistributed,
+        (statistics.getBatchesRedistributed() > 0));
+  }
+
+  public static void checkUnProcessedStats(String senderId, int events) {
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    GatewaySender sender = null;
+    for (GatewaySender s : senders) {
+      if (s.getId().equals(senderId)) {
+        sender = s;
+        break;
+      }
+    }
+    final GatewaySenderStats statistics = ((AbstractGatewaySender)sender)
+        .getStatistics();
+    assertEquals(events,
+        (statistics.getUnprocessedEventsAddedBySecondary() + statistics
+            .getUnprocessedTokensRemovedBySecondary()));
+    assertEquals(events,
+        (statistics.getUnprocessedEventsRemovedByPrimary() + statistics
+            .getUnprocessedTokensAddedByPrimary()));
+  }
+  
+  public static void checkAsyncEventQueueUnprocessedStats(String asyncQueueId, int events) {
+    Set<AsyncEventQueue> asyncQueues = cache.getAsyncEventQueues();
+    AsyncEventQueue queue = null;
+    for (AsyncEventQueue q : asyncQueues) {
+      if (q.getId().equals(asyncQueueId)) {
+        queue = q;
+        break;
+      }
+    }
+    final AsyncEventQueueStats statistics = ((AsyncEventQueueImpl)queue).getStatistics();
+    assertEquals(events,
+        (statistics.getUnprocessedEventsAddedBySecondary() + statistics
+            .getUnprocessedTokensRemovedBySecondary()));
+    assertEquals(events,
+        (statistics.getUnprocessedEventsRemovedByPrimary() + statistics
+            .getUnprocessedTokensAddedByPrimary()));
+  }
+  
+  
+  public static void setRemoveFromQueueOnException(String senderId, boolean removeFromQueue){
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    GatewaySender sender = null;
+    for(GatewaySender s : senders){
+      if(s.getId().equals(senderId)){
+        sender = s;
+        break;
+      }
+    }
+    assertNotNull(sender);
+    ((AbstractGatewaySender)sender).setRemoveFromQueueOnException(removeFromQueue);
+  }
+  
+  public static void unsetRemoveFromQueueOnException(String senderId){
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    GatewaySender sender = null;
+    for(GatewaySender s : senders){
+      if(s.getId().equals(senderId)){
+        sender = s;
+        break;
+      }
+    }
+    assertNotNull(sender);
+    ((AbstractGatewaySender)sender).setRemoveFromQueueOnException(false);
+  }
+  
+  public static void waitForSenderRunningState(String senderId){
+    final ExpectedException exln = addExpectedException("Could not connect");
+    try {
+      Set<GatewaySender> senders = cache.getGatewaySenders();
+      final GatewaySender sender = getGatewaySenderById(senders, senderId);
+
+      WaitCriterion wc = new WaitCriterion() {
+        public boolean done() {
+          if (sender != null && sender.isRunning()) {
+            return true;
+          }
+          return false;
+        }
+
+        public String description() {
+          return "Expected sender isRunning state to be true but is false";
+        }
+      };
+      DistributedTestCase.waitForCriterion(wc, 300000, 500, true);
+    } finally {
+      exln.remove();
+    }
+  }
+  
+  public static void waitForSenderToBecomePrimary(String senderId){
+    Set<GatewaySender> senders = ((GemFireCacheImpl)cache).getAllGatewaySenders();
+    final GatewaySender sender = getGatewaySenderById(senders, senderId);
+    WaitCriterion wc = new WaitCriterion() {
+      public boolean done() {
+        if (sender != null && ((AbstractGatewaySender) sender).isPrimary()) {
+          return true;
+        }
+        return false;
+      }
+
+      public String description() {
+        return "Expected sender primary state to be true but is false";
+      }
+    };
+    DistributedTestCase.waitForCriterion(wc, 10000, 1000, true); 
+  }
+  
+  private static GatewaySender getGatewaySenderById(Set<GatewaySender> senders, String senderId) {
+    for(GatewaySender s : senders){
+      if(s.getId().equals(senderId)){
+        return s;
+      }
+    }
+    //if none of the senders matches with the supplied senderid, return null
+    return null;
+  }
+  
+  public static HashMap checkQueue(){
+    HashMap listenerAttrs = new HashMap();
+    listenerAttrs.put("Create", listener1.createList);
+    listenerAttrs.put("Update", listener1.updateList);
+    listenerAttrs.put("Destroy", listener1.destroyList);
+    return listenerAttrs;
+  }
+  
+  public static void checkQueueOnSecondary (final Map primaryUpdatesMap){
+    final HashMap secondaryUpdatesMap = new HashMap();
+    secondaryUpdatesMap.put("Create", listener1.createList);
+    secondaryUpdatesMap.put("Update", listener1.updateList);
+    secondaryUpdatesMap.put("Destroy", listener1.destroyList);
+    
+    WaitCriterion wc = new WaitCriterion() {
+      public boolean done() {
+        secondaryUpdatesMap.put("Create", listener1.createList);
+        secondaryUpdatesMap.put("Update", listener1.updateList);
+        secondaryUpdatesMap.put("Destroy", listener1.destroyList);
+        if (secondaryUpdatesMap.equals(primaryUpdatesMap)) {
+          return true;
+        }
+        return false;
+      }
+
+      public String description() {
+        return "Expected seconadry map to be " + primaryUpdatesMap + " but it is " + secondaryUpdatesMap;
+      }
+    };
+    DistributedTestCase.waitForCriterion(wc, 300000, 500, true); 
+  }
+  
+  public static HashMap checkQueue2(){
+    HashMap listenerAttrs = new HashMap();
+    listenerAttrs.put("Create", listener2.createList);
+    listenerAttrs.put("Update", listener2.updateList);
+    listenerAttrs.put("Destroy", listener2.destroyList);
+    return listenerAttrs;
+  }
+  
+  public static HashMap checkPR(String regionName){
+    PartitionedRegion region = (PartitionedRegion)cache.getRegion(regionName);
+    QueueListener listener = (QueueListener)region.getCacheListener();
+    
+    HashMap listenerAttrs = new HashMap();
+    listenerAttrs.put("Create", listener.createList);
+    listenerAttrs.put("Update", listener.updateList);
+    listenerAttrs.put("Destroy", listener.destroyList);
+    return listenerAttrs;
+  }
+  
+  public static HashMap checkBR(String regionName, int numBuckets){
+    PartitionedRegion region = (PartitionedRegion)cache.getRegion(regionName);
+    HashMap listenerAttrs = new HashMap();
+    for (int i = 0; i < numBuckets; i++) {
+      BucketRegion br = region.getBucketRegion(i);
+      QueueListener listener = (QueueListener)br.getCacheListener();
+      listenerAttrs.put("Create"+i, listener.createList);
+      listenerAttrs.put("Update"+i, listener.updateList);
+      listenerAttrs.put("Destroy"+i, listener.destroyList);
+    }
+    return listenerAttrs;
+  }
+  
+  public static HashMap checkQueue_PR(String senderId){
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    GatewaySender sender = null;
+    for(GatewaySender s : senders){
+      if(s.getId().equals(senderId)){
+        sender = s;
+        break;
+      }
+    }
+    
+    RegionQueue parallelQueue = (RegionQueue)((AbstractGatewaySender)sender)
+    .getQueues().toArray(new RegionQueue[1])[0];
+    
+    PartitionedRegion region = (PartitionedRegion)parallelQueue.getRegion();
+    QueueListener listener = (QueueListener)region.getCacheListener();
+    
+    HashMap listenerAttrs = new HashMap();
+    listenerAttrs.put("Create", listener.createList);
+    listenerAttrs.put("Update", listener.updateList);
+    listenerAttrs.put("Destroy", listener.destroyList);
+    return listenerAttrs;
+  }
+  
+  public static HashMap checkQueue_BR(String senderId, int numBuckets){
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    GatewaySender sender = null;
+    for(GatewaySender s : senders){
+      if(s.getId().equals(senderId)){
+        sender = s;
+        break;
+      }
+    }
+    RegionQueue parallelQueue = (RegionQueue)((AbstractGatewaySender)sender)
+    .getQueues().toArray(new RegionQueue[1])[0];
+    
+    PartitionedRegion region = (PartitionedRegion)parallelQueue.getRegion();
+    HashMap listenerAttrs = new HashMap();
+    for (int i = 0; i < numBuckets; i++) {
+      BucketRegion br = region.getBucketRegion(i);
+      if (br != null) {
+        QueueListener listener = (QueueListener)br.getCacheListener();
+        if (listener != null) {
+          listenerAttrs.put("Create"+i, listener.createList);
+          listenerAttrs.put("Update"+i, listener.updateList);
+          listenerAttrs.put("Destroy"+i, listener.destroyList);
+        }
+      }
+    }
+    return listenerAttrs;
+  }
+
+  public static void addListenerOnBucketRegion(String regionName, int numBuckets) {
+    WANTestBase test = new WANTestBase(testName);
+    test.addCacheListenerOnBucketRegion(regionName, numBuckets);
+  }
+  
+  private void addCacheListenerOnBucketRegion(String regionName, int numBuckets){
+    PartitionedRegion region = (PartitionedRegion)cache.getRegion(regionName);
+    for (int i = 0; i < numBuckets; i++) {
+      BucketRegion br = region.getBucketRegion(i);
+      AttributesMutator mutator = br.getAttributesMutator();
+      listener1 = new QueueListener();
+      mutator.addCacheListener(listener1);
+    }
+  }
+  
+  public static void addListenerOnQueueBucketRegion(String senderId, int numBuckets) {
+    WANTestBase test = new WANTestBase(testName);
+    test.addCacheListenerOnQueueBucketRegion(senderId, numBuckets);
+  }
+  
+  private void addCacheListenerOnQueueBucketRegion(String senderId, int numBuckets){
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    GatewaySender sender = null;
+    for(GatewaySender s : senders){
+      if(s.getId().equals(senderId)){
+        sender = s;
+        break;
+      }
+    }
+    RegionQueue parallelQueue = (RegionQueue)((AbstractGatewaySender)sender)
+    .getQueues().toArray(new RegionQueue[1])[0];
+    
+    PartitionedRegion region = (PartitionedRegion)parallelQueue.getRegion();
+    for (int i = 0; i < numBuckets; i++) {
+      BucketRegion br = region.getBucketRegion(i);
+      if (br != null) {
+        AttributesMutator mutator = br.getAttributesMutator();
+        CacheListener listener = new QueueListener();
+        mutator.addCacheListener(listener);
+      }
+    }
+    
+  }
+  
+  public static void addQueueListener(String senderId, boolean isParallel){
+    WANTestBase test = new WANTestBase(testName);
+    test.addCacheQueueListener(senderId, isParallel);
+  }
+  
+  public static void addSecondQueueListener(String senderId, boolean isParallel){
+    WANTestBase test = new WANTestBase(testName);
+    test.addSecondCacheQueueListener(senderId, isParallel);
+  }
+  
+  public static void addListenerOnRegion(String regionName){
+    WANTestBase test = new WANTestBase(testName);
+    test.addCacheListenerOnRegion(regionName);
+  }
+  private void addCacheListenerOnRegion(String regionName){
+    Region region = cache.getRegion(regionName);
+    AttributesMutator mutator = region.getAttributesMutator();
+    listener1 = new QueueListener();
+    mutator.addCacheListener(listener1);
+  }
+  
+  private void addCacheQueueListener(String senderId, boolean isParallel) {
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    GatewaySender sender = null;
+    for(GatewaySender s : senders){
+      if(s.getId().equals(senderId)){
+        sender = s;
+        break;
+      }
+    }
+    listener1 = new QueueListener();
+    if (!isParallel) {
+      Set<RegionQueue> queues = ((AbstractGatewaySender)sender).getQueues();
+      for(RegionQueue q: queues) {
+        q.addCacheListener(listener1);
+      }
+    }
+    else {
+      RegionQueue parallelQueue = (RegionQueue)((AbstractGatewaySender)sender)
+      .getQueues().toArray(new RegionQueue[1])[0];
+      parallelQueue.addCacheListener(listener1);
+    }
+  }
+
+  private void addSecondCacheQueueListener(String senderId, boolean isParallel) {
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    GatewaySender sender = null;
+    for (GatewaySender s : senders) {
+      if (s.getId().equals(senderId)) {
+        sender = s;
+        break;
+      }
+    }
+    listener2 = new QueueListener();
+    if (!isParallel) {
+      Set<RegionQueue> queues = ((AbstractGatewaySender)sender).getQueues();
+      for(RegionQueue q: queues) {
+        q.addCacheListener(listener2);
+      }
+    }
+    else {
+    	RegionQueue parallelQueue = (RegionQueue)((AbstractGatewaySender)sender)
+      .getQueues().toArray(new RegionQueue[1])[0];
+      parallelQueue.addCacheListener(listener2);
+    }
+  }
+  
+  public static void pauseSender(String senderId) {
+    final ExpectedException exln = addExpectedException("Could not connect");
+    ExpectedException exp = addExpectedException(ForceReattemptException.class
+        .getName());
+    try {
+      Set<GatewaySender> senders = cache.getGatewaySenders();
+      GatewaySender sender = null;
+      for (GatewaySender s : senders) {
+        if (s.getId().equals(senderId)) {
+          sender = s;
+          break;
+        }
+      }
+      sender.pause();
+    }
+    finally {
+      exp.remove();
+      exln.remove();
+    }
+  }
+  
+  public static void pauseSenderAndWaitForDispatcherToPause(String senderId) {
+    final ExpectedException exln = addExpectedException("Could not connect");
+    ExpectedException exp = addExpectedException(ForceReattemptException.class
+        .getName());
+    try {
+      Set<GatewaySender> senders = cache.getGatewaySenders();
+      GatewaySender sender = null;
+      for (GatewaySender s : senders) {
+        if (s.getId().equals(senderId)) {
+          sender = s;
+          break;
+        }
+      }
+      sender.pause();
+      ((AbstractGatewaySender)sender).getEventProcessor().waitForDispatcher

<TRUNCATED>


[45/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java
new file mode 100644
index 0000000..7d47dd6
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java
@@ -0,0 +1,1036 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.query.cq.dunit;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.query.CqAttributes;
+import com.gemstone.gemfire.cache.query.CqAttributesFactory;
+import com.gemstone.gemfire.cache.query.CqListener;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.cache.query.internal.DefaultQueryService;
+import com.gemstone.gemfire.cache.query.internal.cq.InternalCqQuery;
+import com.gemstone.gemfire.cache.query.internal.cq.ServerCQImpl;
+import com.gemstone.gemfire.cache.query.internal.cq.CqService;
+import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.cache30.CacheTestCase;
+import com.gemstone.gemfire.internal.AvailablePortHelper;
+
+import dunit.Host;
+import dunit.SerializableRunnable;
+import dunit.VM;
+
+/**
+ * This class tests the ContiunousQuery mechanism in GemFire.
+ * This includes the test with diffetent data activities.
+ *
+ * @author anil
+ */
+public class CqPerfDUnitTest extends CacheTestCase {
+
+  protected CqQueryDUnitTest cqDUnitTest = new CqQueryDUnitTest("CqPerfDUnitTest");
+  
+  public CqPerfDUnitTest(String name) {
+    super(name);
+  }
+  
+  public void setUp() throws Exception {
+    super.setUp();
+    
+    // avoid IllegalStateException from HandShake by connecting all vms tor
+    // system before creating connection pools
+    getSystem();
+    invokeInEveryVM(new SerializableRunnable("getSystem") {
+      public void run() {
+        getSystem();
+      }
+    });
+    
+  }
+    
+
+  /**
+   * Tests the cq performance.
+   * @throws Exception
+   */
+  public void perf_testCQPerf() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    
+    cqDUnitTest.createServer(server);
+    
+    final int port = server.invokeInt(CqQueryDUnitTest.class,
+    "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    
+    // Create client.
+    cqDUnitTest.createClient(client, port, host0);
+    final String cqName = "testCQPerf_0";    
+    
+    client.invoke(new CacheSerializableRunnable("Create CQ :" + cqName) {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Create CQ. ###" + cqName);
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+        // Create CQ Attributes.
+        CqAttributesFactory cqf = new CqAttributesFactory();
+        CqListener[] cqListeners = {new CqTimeTestListener(getLogWriter())};
+        ((CqTimeTestListener)cqListeners[0]).cqName = cqName;
+        
+        cqf.initCqListeners(cqListeners);
+        CqAttributes cqa = cqf.create();
+        
+        // Create and Execute CQ.
+        try {
+          CqQuery cq1 = cqService.newCq(cqName, cqDUnitTest.cqs[0], cqa);
+          assertTrue("newCq() state mismatch", cq1.getState().isStopped());
+          cq1.execute();
+        } catch (Exception ex){
+          getLogWriter().info("CqService is :" + cqService);
+          ex.printStackTrace();
+          AssertionError err = new AssertionError("Failed to create CQ " + cqName + " . ");
+          err.initCause(ex);
+          throw err;
+        }
+      }
+    });   
+    
+    final int size = 50;
+    
+    // Create values.
+    cqDUnitTest.createValuesWithTime(client, cqDUnitTest.regions[0], size);
+    pause(5000);
+    
+    // Update values
+    cqDUnitTest.createValuesWithTime(client, cqDUnitTest.regions[0], size);
+    
+    client.invoke(new CacheSerializableRunnable("Validate CQs") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Validating CQ. ### " + cqName);
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {          
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCqService.");
+        }
+        
+        CqQuery cQuery = cqService.getCq(cqName);
+        if (cQuery == null) {
+          fail("Failed to get CqQuery for CQ : " + cqName);
+        }
+        
+//        CqAttributes cqAttr = cQuery.getCqAttributes();
+//        CqListener cqListeners[] = cqAttr.getCqListeners();
+//        CqTimeTestListener listener = (CqTimeTestListener) cqListeners[0];
+        
+        // Wait for all the create to arrive.
+        //for (int i=1; i <= size; i++) {
+        //  listener.waitForCreated(cqDUnitTest.KEY+i);
+        //}
+        
+        // Wait for all the update to arrive.
+        //for (int i=1; i <= size; i++) {
+        //  listener.waitForUpdated(cqDUnitTest.KEY+i);
+        //}
+        //getLogWriter().info("### Time taken for Creation of " + size + " events is :" + listener.getTotalQueryCreateTime());
+        
+        //getLogWriter().info("### Time taken for Update of " + size + " events is :" + listener.getTotalQueryUpdateTime());
+      }
+    });
+    
+    pause( 10 * 60 * 1000);
+    
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server);
+    
+  }
+
+  /**
+   * Test for maintaining keys for update optimization.
+   * @throws Exception
+   */
+  public void testKeyMaintainance() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    
+    cqDUnitTest.createServer(server);
+    final int port = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    cqDUnitTest.createClient(client, port, host0);
+    
+
+    // HashSet for caching purpose will be created for cqs.
+    final int cqSize = 2;
+    
+    // Cq1
+    cqDUnitTest.createCQ(client, "testKeyMaintainance_0", cqDUnitTest.cqs[0]);
+    cqDUnitTest.executeCQ(client, "testKeyMaintainance_0", false, null);      
+
+    // Cq2
+    cqDUnitTest.createCQ(client, "testKeyMaintainance_1", cqDUnitTest.cqs[10]);
+    cqDUnitTest.executeCQ(client, "testKeyMaintainance_1", false, null);      
+
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], 1);
+    cqDUnitTest.waitForCreated(client, "testKeyMaintainance_0", CqQueryDUnitTest.KEY+1);
+
+    // Entry is made into the CQs cache hashset.
+    // testKeyMaintainance_0 with 1 entry and testKeyMaintainance_1 with 0
+    server.invoke(new CacheSerializableRunnable("LookForCachedEventKeys1"){
+      public void run2()throws CacheException {
+        CqService cqService = null;
+        try {
+          cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
+        } catch (Exception ex) {
+          getLogWriter().info("Failed to get the internal CqService.", ex);
+          fail ("Failed to get the internal CqService.", ex);
+        }
+
+        Collection<? extends InternalCqQuery> cqs = cqService.getAllCqs();
+        for (InternalCqQuery cq: cqs){
+          ServerCQImpl cqQuery = (ServerCQImpl)cq;
+          String serverCqName = (String)cqQuery.getServerCqName();
+          if (serverCqName.startsWith("testKeyMaintainance_0")){
+            assertEquals("The number of keys cached for cq testKeyMaintainance_0 is wrong.", 
+                1, cqQuery.getCqResultKeysSize());
+          } else if(serverCqName.startsWith("testKeyMaintainance_1")){
+            assertEquals("The number of keys cached for cq testKeyMaintainance_1 is wrong.",
+                0, cqQuery.getCqResultKeysSize());
+          }
+        }
+      }
+    });
+
+    // Update 1.
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], 10);
+    cqDUnitTest.waitForCreated(client, "testKeyMaintainance_0", CqQueryDUnitTest.KEY+10);
+    
+    // Entry/check is made into the CQs cache hashset.
+    // testKeyMaintainance_0 with 1 entry and testKeyMaintainance_1 with 1
+    server.invoke(new CacheSerializableRunnable("LookForCachedEventKeysAfterUpdate1"){
+      public void run2()throws CacheException {
+        CqService cqService = null;
+        try {
+          cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
+        } catch (Exception ex) {
+          getLogWriter().info("Failed to get the internal CqService.", ex);
+          fail ("Failed to get the internal CqService.", ex);
+        }
+        Collection<? extends InternalCqQuery> cqs = cqService.getAllCqs();
+        for (InternalCqQuery cq: cqs){
+          ServerCQImpl cqQuery = (ServerCQImpl)cq;
+
+          String serverCqName = (String)cqQuery.getServerCqName();
+          if (serverCqName.startsWith("testKeyMaintainance_0")){
+            assertEquals("The number of keys cached for cq testKeyMaintainance_0 is wrong.", 
+                10, cqQuery.getCqResultKeysSize());
+          } else if(serverCqName.startsWith("testKeyMaintainance_1")){
+            assertEquals("The number of keys cached for cq testKeyMaintainance_1 is wrong.",
+                5, cqQuery.getCqResultKeysSize());
+          }
+        }        
+      }
+    });
+
+    // Update.
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], 12);
+    cqDUnitTest.waitForCreated(client, "testKeyMaintainance_0", CqQueryDUnitTest.KEY+12);
+
+    // Entry/check is made into the CQs cache hashset.
+    // testKeyMaintainance_0 with 1 entry and testKeyMaintainance_1 with 1
+    server.invoke(new CacheSerializableRunnable("LookForCachedEventKeysAfterUpdate2"){
+      public void run2()throws CacheException {
+        CqService cqService = null;
+        try {
+          cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
+        } catch (Exception ex) {
+          getLogWriter().info("Failed to get the internal CqService.", ex);
+          fail ("Failed to get the internal CqService.", ex);
+        }
+
+        Collection<? extends InternalCqQuery> cqs = cqService.getAllCqs();
+        for (InternalCqQuery cq: cqs){
+          ServerCQImpl cqQuery = (ServerCQImpl)cq;
+          String serverCqName = (String)cqQuery.getServerCqName();
+          if (serverCqName.startsWith("testKeyMaintainance_0")){
+            assertEquals("The number of keys cached for cq testKeyMaintainance_0 is wrong.", 
+                12, cqQuery.getCqResultKeysSize());
+          } else if(serverCqName.startsWith("testKeyMaintainance_1")){
+            assertEquals("The number of keys cached for cq testKeyMaintainance_1 is wrong.",
+                6, cqQuery.getCqResultKeysSize());
+          }
+        }        
+        
+      }
+    });
+
+    // Delete.
+    cqDUnitTest.deleteValues(server, cqDUnitTest.regions[0], 6);
+    cqDUnitTest.waitForDestroyed(client, "testKeyMaintainance_0", CqQueryDUnitTest.KEY+6);
+
+    // Entry/check is made into the CQs cache hashset.
+    // testKeyMaintainance_0 with 1 entry and testKeyMaintainance_1 with 1
+    server.invoke(new CacheSerializableRunnable("LookForCachedEventKeysAfterUpdate2"){
+      public void run2()throws CacheException {
+        CqService cqService = null;
+        try {
+          cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
+        } catch (Exception ex) {
+          getLogWriter().info("Failed to get the internal CqService.", ex);
+          fail ("Failed to get the internal CqService.", ex);
+        }
+        Collection<? extends InternalCqQuery> cqs = cqService.getAllCqs();
+        for (InternalCqQuery cq: cqs){
+          ServerCQImpl cqQuery = (ServerCQImpl)cq;
+
+          String serverCqName = (String)cqQuery.getServerCqName();
+          if (serverCqName.startsWith("testKeyMaintainance_0")){
+            assertEquals("The number of keys cached for cq testKeyMaintainance_0 is wrong.", 
+                6, cqQuery.getCqResultKeysSize());
+          } else if(serverCqName.startsWith("testKeyMaintainance_1")){
+            assertEquals("The number of keys cached for cq testKeyMaintainance_1 is wrong.",
+                3, cqQuery.getCqResultKeysSize());
+          }
+        }        
+      }
+    });
+
+    // Stop CQ.
+    // This should still needs to process the events so that Results are up-to-date.
+    cqDUnitTest.stopCQ(client, "testKeyMaintainance_1");      
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], 12);
+
+    server.invoke(new CacheSerializableRunnable("LookForCachedEventKeysAfterUpdate2"){
+      public void run2()throws CacheException {
+        CqService cqService = null;
+        try {
+          cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
+        } catch (Exception ex) {
+          getLogWriter().info("Failed to get the internal CqService.", ex);
+          fail ("Failed to get the internal CqService.", ex);
+        }
+
+        Collection<? extends InternalCqQuery> cqs = cqService.getAllCqs();
+        for (InternalCqQuery cq: cqs){
+          ServerCQImpl cqQuery = (ServerCQImpl)cq;
+          String serverCqName = (String)cqQuery.getServerCqName();
+          if (serverCqName.startsWith("testKeyMaintainance_0")){
+            assertEquals("The number of keys cached for cq testKeyMaintainance_0 is wrong.", 
+                12,cqQuery.getCqResultKeysSize());
+          } else if(serverCqName.startsWith("testKeyMaintainance_1")){
+            assertEquals("The number of keys cached for cq testKeyMaintainance_1 is wrong.", 
+                6, cqQuery.getCqResultKeysSize());
+          }
+        }        
+        
+      }
+    });
+
+
+    // re-start the CQ.
+    cqDUnitTest.executeCQ(client, "testKeyMaintainance_1", false, null);      
+
+    // This will remove the caching for this CQ.
+    cqDUnitTest.closeCQ(client, "testKeyMaintainance_1");      
+    server.invoke(new CacheSerializableRunnable("LookForCachedEventKeysAfterUpdate2"){
+      public void run2()throws CacheException {
+        CqService cqService = null;
+        try {
+          cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
+        } catch (Exception ex) {
+          getLogWriter().info("Failed to get the internal CqService.", ex);
+          fail ("Failed to get the internal CqService.", ex);
+        }
+        Collection<? extends InternalCqQuery> cqs = cqService.getAllCqs();
+        for (InternalCqQuery cq: cqs){
+          ServerCQImpl cqQuery = (ServerCQImpl)cq;
+ 
+          String serverCqName = (String)cqQuery.getServerCqName();
+          if (serverCqName.startsWith("testKeyMaintainance_0")){
+            assertEquals("The number of keys cached for cq testKeyMaintainance_0 is wrong.", 
+                12, cqQuery.getCqResultKeysSize());
+          } else if(serverCqName.startsWith("testKeyMaintainance_1")){
+            fail("The key maintainance should not be present for this CQ.");
+          }
+        }
+        
+      }
+    });
+
+
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server);
+  }
+
+  /**
+   * Test for common CQs.
+   * To test the changes relating to, executing CQ only once for all similar CQs.
+   * @throws Exception
+   */
+  public void testMatchingCqs() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    
+    cqDUnitTest.createServer(server);
+    final int port = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    cqDUnitTest.createClient(client, port, host0);
+    
+    // Create and Execute same kind of CQs.
+    for (int i =0; i < 4; i++) {
+      cqDUnitTest.createCQ(client, "testMatchingCqs_"+i, cqDUnitTest.cqs[0]);
+      cqDUnitTest.executeCQ(client, "testMatchingCqs_"+i, false, null);      
+    }
+
+    validateMatchingCqs(server, 1, cqDUnitTest.cqs[0], 4);
+    
+    int size = 1; 
+    
+    // Create.
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], size);
+    cqDUnitTest.waitForCreated(client, "testMatchingCqs_0", CqQueryDUnitTest.KEY+size);
+    cqDUnitTest.waitForCreated(client, "testMatchingCqs_3", CqQueryDUnitTest.KEY+size);
+
+    // Close one of the CQ.
+    cqDUnitTest.closeCQ(client, "testMatchingCqs_0");      
+    validateMatchingCqs(server, 1, cqDUnitTest.cqs[0], 3);
+    
+    // Update.
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], size);
+    cqDUnitTest.waitForUpdated(client, "testMatchingCqs_3", CqQueryDUnitTest.KEY+size);
+    
+    // Stop one of the CQ.
+    cqDUnitTest.stopCQ(client, "testMatchingCqs_1");      
+    
+    validateMatchingCqs(server, 1, cqDUnitTest.cqs[0], 2);
+    
+    // Update - 2.
+    cqDUnitTest.clearCQListenerEvents(client, "testMatchingCqs_3");
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], size);
+    cqDUnitTest.waitForUpdated(client, "testMatchingCqs_3", CqQueryDUnitTest.KEY+size);
+
+    // stopped CQ should not receive 2nd/previous updates.
+    cqDUnitTest.validateCQ(client, "testMatchingCqs_1",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: once */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size * 2);
+
+    // Execute the stopped CQ.
+    cqDUnitTest.executeCQ(client, "testMatchingCqs_1", false, null);      
+
+    
+    // Update - 3.
+    cqDUnitTest.clearCQListenerEvents(client, "testMatchingCqs_3");
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], size);
+    cqDUnitTest.waitForUpdated(client, "testMatchingCqs_3", CqQueryDUnitTest.KEY+size);
+    
+    cqDUnitTest.validateCQ(client, "testMatchingCqs_1",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: 2 */ size * 2,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size * 2,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size * 3);
+
+    // Create different kind of CQs.
+    cqDUnitTest.createCQ(client, "testMatchingCqs_4", cqDUnitTest.cqs[1]);
+    cqDUnitTest.executeCQ(client, "testMatchingCqs_4", false, null);      
+
+    cqDUnitTest.createCQ(client, "testMatchingCqs_5", cqDUnitTest.cqs[1]);
+    cqDUnitTest.executeCQ(client, "testMatchingCqs_5", false, null);      
+    
+    cqDUnitTest.createCQ(client, "testMatchingCqs_6", cqDUnitTest.cqs[2]);
+    cqDUnitTest.executeCQ(client, "testMatchingCqs_6", false, null);      
+
+    validateMatchingCqs(server, 3, cqDUnitTest.cqs[1], 2);
+    
+    cqDUnitTest.closeCQ(client, "testMatchingCqs_6");
+    validateMatchingCqs(server, 2, cqDUnitTest.cqs[1], 2);
+
+    cqDUnitTest.closeCQ(client, "testMatchingCqs_5");
+    cqDUnitTest.closeCQ(client, "testMatchingCqs_4");
+    cqDUnitTest.closeCQ(client, "testMatchingCqs_3");
+    cqDUnitTest.closeCQ(client, "testMatchingCqs_2");
+    cqDUnitTest.closeCQ(client, "testMatchingCqs_1");
+
+    validateMatchingCqs(server, 0, null, 0);
+
+    // update 4
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], size);
+
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server);
+  }
+  
+  
+  /**
+   * Test for common CQs.
+   * To test the changes relating to, executing CQ only once for all similar CQs.
+   * @throws Exception
+   */
+  public void testMatchingCQWithMultipleClients() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client1 = host.getVM(1);
+    VM client2 = host.getVM(2);
+    VM client3 = host.getVM(3);
+    
+    VM clients[] = new VM[]{client1, client2, client3};
+    
+    cqDUnitTest.createServer(server);
+    final int port = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+        
+    for (int clientIndex=0; clientIndex < 3; clientIndex++){
+      cqDUnitTest.createClient(clients[clientIndex], port, host0);
+      // Create and Execute same kind of CQs.
+      for (int i =0; i < 4; i++) {
+        cqDUnitTest.createCQ(clients[clientIndex], "testMatchingCQWithMultipleClients_"+i, cqDUnitTest.cqs[0]);
+        cqDUnitTest.executeCQ(clients[clientIndex], 
+            "testMatchingCQWithMultipleClients_"+i, false, null);      
+      }
+    }
+    
+    validateMatchingCqs(server, 1, cqDUnitTest.cqs[0], clients.length * 4);
+    
+    int size = 1; 
+    
+    // Create.
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], size);
+    for (int clientIndex=0; clientIndex < 3; clientIndex++){
+      cqDUnitTest.waitForCreated(clients[clientIndex], 
+          "testMatchingCQWithMultipleClients_0", CqQueryDUnitTest.KEY+size);
+      cqDUnitTest.waitForCreated(clients[clientIndex], 
+          "testMatchingCQWithMultipleClients_3", CqQueryDUnitTest.KEY+size);
+    }
+
+    // Close one of the CQ.
+    cqDUnitTest.closeCQ(client1, "testMatchingCQWithMultipleClients_0");      
+    validateMatchingCqs(server, 1, cqDUnitTest.cqs[0], (clients.length * 4) - 1);
+    
+    // Update.
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], size);
+    
+    for (int clientIndex=0; clientIndex < 3; clientIndex++){
+      cqDUnitTest.waitForUpdated(clients[clientIndex], 
+          "testMatchingCQWithMultipleClients_3", CqQueryDUnitTest.KEY+size);
+    }
+
+    // Stop one of the CQ.
+    cqDUnitTest.stopCQ(client2, "testMatchingCQWithMultipleClients_1");      
+    
+    validateMatchingCqs(server, 1, cqDUnitTest.cqs[0], (clients.length * 4) - 2);
+    
+    // Update - 2.
+    for (int clientIndex=0; clientIndex < 3; clientIndex++){
+      cqDUnitTest.clearCQListenerEvents(clients[clientIndex], "testMatchingCQWithMultipleClients_3");
+    }
+
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], size);
+
+    for (int clientIndex=0; clientIndex < 3; clientIndex++){
+      cqDUnitTest.waitForUpdated(clients[clientIndex], 
+          "testMatchingCQWithMultipleClients_3", CqQueryDUnitTest.KEY+size);
+    }
+    
+    // stopped CQ should not receive 2nd/previous updates.
+    cqDUnitTest.validateCQ(client2, "testMatchingCQWithMultipleClients_1",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: once */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size * 2);
+
+    // Execute the stopped CQ.
+    cqDUnitTest.executeCQ(client2, "testMatchingCQWithMultipleClients_1", false, null);      
+
+    
+    // Update - 3.
+    for (int clientIndex=0; clientIndex < 3; clientIndex++){
+      cqDUnitTest.clearCQListenerEvents(clients[clientIndex], "testMatchingCQWithMultipleClients_3");
+    }
+
+    validateMatchingCqs(server, 1, cqDUnitTest.cqs[0], (clients.length * 4) - 1);
+    
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], size);
+
+    for (int clientIndex=0; clientIndex < 3; clientIndex++){
+      cqDUnitTest.waitForUpdated(clients[clientIndex], 
+          "testMatchingCQWithMultipleClients_3", CqQueryDUnitTest.KEY+size);
+    }
+
+    cqDUnitTest.validateCQ(client2, "testMatchingCQWithMultipleClients_1",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: 2 */ size * 2,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size * 2,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size * 3);
+
+    // Create different kind of CQs.
+    for (int clientIndex=0; clientIndex < 3; clientIndex++){
+      cqDUnitTest.createCQ(clients[clientIndex], "testMatchingCQWithMultipleClients_4", cqDUnitTest.cqs[1]);
+      cqDUnitTest.executeCQ(clients[clientIndex], 
+          "testMatchingCQWithMultipleClients_4", false, null);      
+
+      cqDUnitTest.createCQ(clients[clientIndex], "testMatchingCQWithMultipleClients_5", cqDUnitTest.cqs[1]);
+      cqDUnitTest.executeCQ(clients[clientIndex], 
+          "testMatchingCQWithMultipleClients_5", false, null);      
+
+      cqDUnitTest.createCQ(clients[clientIndex], "testMatchingCQWithMultipleClients_6", cqDUnitTest.cqs[2]);
+      cqDUnitTest.executeCQ(clients[clientIndex], 
+          "testMatchingCQWithMultipleClients_6", false, null);      
+    }
+    
+    validateMatchingCqs(server, 3, cqDUnitTest.cqs[1], 2 * clients.length);
+    
+    for (int clientIndex=0; clientIndex < 3; clientIndex++){
+      cqDUnitTest.closeCQ(clients[clientIndex], "testMatchingCQWithMultipleClients_6");
+    }
+
+    validateMatchingCqs(server, 2, cqDUnitTest.cqs[1], 2 * clients.length);
+
+
+    // update 4
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], size);
+
+    // Close.
+    cqDUnitTest.closeClient(client3);
+    validateMatchingCqs(server, 2, cqDUnitTest.cqs[1], 2 * (clients.length - 1));
+    
+    for (int clientIndex=0; clientIndex < 2; clientIndex++){      
+      cqDUnitTest.closeCQ(clients[clientIndex], "testMatchingCQWithMultipleClients_5");
+      cqDUnitTest.closeCQ(clients[clientIndex], "testMatchingCQWithMultipleClients_4");
+      cqDUnitTest.closeCQ(clients[clientIndex], "testMatchingCQWithMultipleClients_3");
+      cqDUnitTest.closeCQ(clients[clientIndex], "testMatchingCQWithMultipleClients_2");
+      cqDUnitTest.closeCQ(clients[clientIndex], "testMatchingCQWithMultipleClients_1");
+      if (clientIndex != 0) {
+        cqDUnitTest.closeCQ(clients[clientIndex], "testMatchingCQWithMultipleClients_0");
+      }
+    }
+
+    validateMatchingCqs(server, 0, null, 0);
+    
+    cqDUnitTest.closeClient(client2);
+    cqDUnitTest.closeClient(client1);
+    
+    cqDUnitTest.closeServer(server);
+  }
+
+  /**
+   * Test for CQ Fail over.
+   * @throws Exception
+   */
+  public void testMatchingCQsWithMultipleServers() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client1 = host.getVM(2);
+    VM client2 = host.getVM(3);
+    
+    cqDUnitTest.createServer(server1);
+    
+    VM clients[] = new VM[]{client1, client2};
+    
+    final int port1 = server1.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+    // Create client.
+    
+    // Create client with redundancyLevel -1
+    
+    final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(1);
+    
+    cqDUnitTest.createClient(client1, new int[] {port1, ports[0]}, host0, "-1");
+    cqDUnitTest.createClient(client2, new int[] {port1, ports[0]}, host0, "-1");
+    
+    int numCQs = 3;
+    
+    for (int i=0; i < numCQs; i++) {
+      cqDUnitTest.createCQ(client1, "testMatchingCQsWithMultipleServers_" + i, cqDUnitTest.cqs[i]);
+      cqDUnitTest.executeCQ(client1, "testMatchingCQsWithMultipleServers_" + i, 
+          false, null);
+      
+      cqDUnitTest.createCQ(client2, "testMatchingCQsWithMultipleServers_" + i, cqDUnitTest.cqs[i]);
+      cqDUnitTest.executeCQ(client2, "testMatchingCQsWithMultipleServers_" + i, 
+          false, null);
+    }
+    
+    validateMatchingCqs(server1, numCQs, cqDUnitTest.cqs[0], 1 * clients.length);
+    validateMatchingCqs(server1, numCQs, cqDUnitTest.cqs[1], 1 * clients.length);
+    
+    pause(1 * 1000);
+    
+    // CREATE.
+    cqDUnitTest.createValues(server1, cqDUnitTest.regions[0], 10);
+    cqDUnitTest.createValues(server1, cqDUnitTest.regions[1], 10);
+    
+    for (int i=1; i <= 10; i++) {
+      cqDUnitTest.waitForCreated(client1, "testMatchingCQsWithMultipleServers_0", CqQueryDUnitTest.KEY+i);
+    }
+
+    pause(1 * 1000);
+    
+    cqDUnitTest.createServer(server2, ports[0]);
+    
+    
+    final int port2 = server2.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    System.out.println("### Port on which server1 running : " + port1 + 
+        " Server2 running : " + port2);
+
+    pause(3 * 1000);
+    
+
+    // UPDATE - 1.
+    for (int k=0; k < numCQs; k++) {
+      cqDUnitTest.clearCQListenerEvents(client1, "testMatchingCQsWithMultipleServers_" + k);
+      cqDUnitTest.clearCQListenerEvents(client2, "testMatchingCQsWithMultipleServers_" + k);
+    }
+
+    cqDUnitTest.createValues(server1, cqDUnitTest.regions[0], 10);    
+    cqDUnitTest.createValues(server1, cqDUnitTest.regions[1], 10);
+
+    // Wait for updates on regions[0]
+    for (int i=1; i <= 10; i++) {
+      cqDUnitTest.waitForUpdated(client1, 
+          "testMatchingCQsWithMultipleServers_0", CqQueryDUnitTest.KEY+i);
+      cqDUnitTest.waitForUpdated(client2, 
+          "testMatchingCQsWithMultipleServers_0", CqQueryDUnitTest.KEY+i);
+    }
+
+    // Wait for updates on regions[1] - Waiting for last key is good enough.
+    cqDUnitTest.waitForUpdated(client1, 
+        "testMatchingCQsWithMultipleServers_2", CqQueryDUnitTest.KEY+4);
+    cqDUnitTest.waitForUpdated(client2, 
+        "testMatchingCQsWithMultipleServers_2", CqQueryDUnitTest.KEY+4);
+    
+    
+    int[] resultsCnt = new int[] {10, 1, 2};
+    
+    
+    for (int i=0; i < numCQs; i++) {
+      cqDUnitTest.validateCQ(client1, "testMatchingCQsWithMultipleServers_" + i, 
+        CqQueryDUnitTest.noTest, resultsCnt[i], resultsCnt[i], CqQueryDUnitTest.noTest);
+
+      cqDUnitTest.validateCQ(client2, "testMatchingCQsWithMultipleServers_" + i, 
+        CqQueryDUnitTest.noTest, resultsCnt[i], resultsCnt[i], CqQueryDUnitTest.noTest);
+    }    
+    
+    // Close server1.
+    cqDUnitTest.closeServer(server1);
+    
+    // Fail over should happen.
+    pause(5 * 1000);
+    
+    validateMatchingCqs(server2, numCQs, cqDUnitTest.cqs[0], 1 * clients.length);
+
+    for (int i=0; i < numCQs; i++) {
+      cqDUnitTest.validateCQ(client1, "testMatchingCQsWithMultipleServers_" + i, 
+        CqQueryDUnitTest.noTest, resultsCnt[i], resultsCnt[i], CqQueryDUnitTest.noTest);
+
+      cqDUnitTest.validateCQ(client2, "testMatchingCQsWithMultipleServers_" + i, 
+        CqQueryDUnitTest.noTest, resultsCnt[i], resultsCnt[i], CqQueryDUnitTest.noTest);
+    }    
+    
+    // UPDATE - 2
+    for (int k=0; k < numCQs; k++) {
+      cqDUnitTest.clearCQListenerEvents(client1, "testMatchingCQsWithMultipleServers_" + k);
+      cqDUnitTest.clearCQListenerEvents(client2, "testMatchingCQsWithMultipleServers_" + k);
+    }
+    
+    cqDUnitTest.createValues(server2, cqDUnitTest.regions[0], 10);
+    cqDUnitTest.createValues(server2, cqDUnitTest.regions[1], 10);
+
+ 
+    // Wait for cq1. on region[0]
+    for (int i=1; i <= resultsCnt[0]; i++) {
+      cqDUnitTest.waitForUpdated(client1, 
+          "testMatchingCQsWithMultipleServers_0", CqQueryDUnitTest.KEY+i);
+      cqDUnitTest.waitForUpdated(client2, 
+          "testMatchingCQsWithMultipleServers_0", CqQueryDUnitTest.KEY+i);
+    }  
+
+    // Wait for cq3. on region[1]
+    {
+      cqDUnitTest.waitForUpdated(client1, 
+          "testMatchingCQsWithMultipleServers_2", CqQueryDUnitTest.KEY+"4");
+      cqDUnitTest.waitForUpdated(client2, 
+          "testMatchingCQsWithMultipleServers_2", CqQueryDUnitTest.KEY+"4");
+    }
+
+        
+    for (int i=0; i < numCQs; i++) {
+      cqDUnitTest.validateCQ(client1, "testMatchingCQsWithMultipleServers_" + i, 
+        CqQueryDUnitTest.noTest, resultsCnt[i], resultsCnt[i] * 2, CqQueryDUnitTest.noTest);
+
+      cqDUnitTest.validateCQ(client2, "testMatchingCQsWithMultipleServers_" + i, CqQueryDUnitTest.noTest, 
+        resultsCnt[i], resultsCnt[i] * 2, CqQueryDUnitTest.noTest);
+    }    
+    
+
+    // Close.
+    cqDUnitTest.closeClient(client1);
+
+    validateMatchingCqs(server2, numCQs, cqDUnitTest.cqs[0], 1 * (clients.length - 1));
+
+    cqDUnitTest.closeClient(client2);
+    cqDUnitTest.closeServer(server2);
+  }
+
+  
+  /**
+   * Test for CQ Fail over.
+   * @throws Exception
+   */
+  public void testMatchingCQsOnDataNodeWithMultipleServers() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client1 = host.getVM(2);
+    VM client2 = host.getVM(3);
+    
+    cqDUnitTest.createServerOnly(server1, 0);
+    cqDUnitTest.createServerOnly(server2, 0);
+    cqDUnitTest.createPartitionRegion(server1, cqDUnitTest.regions);
+    cqDUnitTest.createPartitionRegion(server2, cqDUnitTest.regions);
+    
+    VM clients[] = new VM[]{client1, client2};
+    
+    final int port1 = server1.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+    final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(1);
+    
+    cqDUnitTest.createLocalRegion(client1, new int[] {port1, ports[0]}, host0, "-1", cqDUnitTest.regions);
+    cqDUnitTest.createLocalRegion(client2, new int[] {port1, ports[0]}, host0, "-1", cqDUnitTest.regions);
+    
+    int numCQs = cqDUnitTest.prCqs.length;
+    
+    for (int i=0; i < numCQs; i++) {
+      cqDUnitTest.createCQ(client1, "testMatchingCQsWithMultipleServers_" + i, cqDUnitTest.prCqs[i]);
+      cqDUnitTest.executeCQ(client1, "testMatchingCQsWithMultipleServers_" + i, 
+          false, null);
+      
+      cqDUnitTest.createCQ(client2, "testMatchingCQsWithMultipleServers_" + i, cqDUnitTest.prCqs[i]);
+      cqDUnitTest.executeCQ(client2, "testMatchingCQsWithMultipleServers_" + i, 
+          false, null);
+    }
+    
+    validateMatchingCqs(server1, numCQs, cqDUnitTest.prCqs[0], 1 * clients.length);
+    validateMatchingCqs(server1, numCQs, cqDUnitTest.prCqs[1], 1 * clients.length);
+    
+    validateMatchingCqs(server2, numCQs, cqDUnitTest.prCqs[0], 1 * clients.length);
+    validateMatchingCqs(server2, numCQs, cqDUnitTest.prCqs[1], 1 * clients.length);
+
+    // Close.
+    cqDUnitTest.closeClient(client1);
+    cqDUnitTest.closeClient(client2);
+    cqDUnitTest.closeServer(server1);
+    cqDUnitTest.closeServer(server2);
+  }
+
+  /**
+   * Performance test for Matching CQ optimization changes.
+   * @throws Exception
+   */
+  public void perf_testPerformanceForMatchingCQs() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client1 = host.getVM(2);
+    VM client2 = host.getVM(3);
+    
+    cqDUnitTest.createServer(server1);
+    cqDUnitTest.createServer(server2);
+    
+//    VM clients[] = new VM[]{client1, client2};
+    
+    final int port1 = server1.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final int port2 = server2.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+
+    // Create client.
+//    final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(1);
+    
+    // Client1 connects to server1.
+    cqDUnitTest.createClient(client1, new int[] {port1}, host0, "-1");
+    
+    // Client2 connects to server2.
+    cqDUnitTest.createClient(client2, new int[] {port2}, host0, "-1");
+    
+    // Client1 registers matching CQs on server1.
+    boolean uniqueQueries = false;
+    String[] matchingCqs = this.generateCqQueries(uniqueQueries); 
+    for (int i=0; i < matchingCqs.length; i++) {
+      cqDUnitTest.createCQ(client1, "testPerformanceForMatchingCQs_" + i, matchingCqs[i]);
+      cqDUnitTest.executeCQ(client1, "testPerformanceForMatchingCQs_" + i, 
+          false, null);
+    }
+
+    // Client2 registers non-matching CQs on server2.
+    uniqueQueries = true;
+    matchingCqs = this.generateCqQueries(uniqueQueries); 
+    for (int i=0; i < matchingCqs.length; i++) {
+      cqDUnitTest.createCQ(client2, "testPerformanceForMatchingCQs_" + i, matchingCqs[i]);
+      cqDUnitTest.executeCQ(client2, "testPerformanceForMatchingCQs_" + i, 
+          false, null);
+    }
+
+    pause(1 * 1000);
+    
+    // CREATE.
+    int size = 1000;
+    cqDUnitTest.createValues(server1, cqDUnitTest.regions[0], size);
+    cqDUnitTest.createValues(server2, cqDUnitTest.regions[1], size);
+   
+    // Update couple of times;
+    for (int j=0; j < 5; j++){
+      cqDUnitTest.createValues(server1, cqDUnitTest.regions[0], size-1);
+      cqDUnitTest.createValues(server2, cqDUnitTest.regions[1], size-1);      
+    }
+
+    for (int j=0; j < 4; j++){
+      cqDUnitTest.createValues(server2, cqDUnitTest.regions[0], size-1);
+      cqDUnitTest.createValues(server1, cqDUnitTest.regions[1], size-1);      
+    }
+
+    // Update the last key.
+    cqDUnitTest.createValues(server2, cqDUnitTest.regions[0], size);
+    cqDUnitTest.createValues(server1, cqDUnitTest.regions[1], size);      
+    
+    for (int k=1; k <= size; k++){
+      cqDUnitTest.waitForUpdated(client1, 
+          "testPerformanceForMatchingCQs_0", CqQueryDUnitTest.KEY+k);
+    }
+ 
+    pause(1 * 1000);
+    printCqQueryExecutionTime(server1);
+    printCqQueryExecutionTime(server2);
+    
+    // Close.
+    cqDUnitTest.closeClient(client1);
+    cqDUnitTest.closeClient(client2);
+    cqDUnitTest.closeServer(server2);
+    cqDUnitTest.closeServer(server1);
+
+  }
+
+  public void validateMatchingCqs(VM server, final int mapSize, final String query, final int numCqSize){
+    server.invoke(new CacheSerializableRunnable("validateMatchingCqs"){
+      public void run2()throws CacheException {
+        CqServiceImpl cqService = null;
+        try {
+          cqService = (CqServiceImpl) ((DefaultQueryService)getCache().getQueryService()).getCqService();
+        } catch (Exception ex) {
+          getLogWriter().info("Failed to get the internal CqService.", ex);
+          fail ("Failed to get the internal CqService.", ex);
+        }
+
+        HashMap matchedCqMap = cqService.getMatchingCqMap();
+        assertEquals("The number of matched cq is not as expected.", mapSize, matchedCqMap.size());
+
+        if (query != null) {        
+          if (!matchedCqMap.containsKey(query))
+          {
+            fail("Query not found in the matched cq map. Query:" + query);
+          }
+          Collection cqs = (Collection)matchedCqMap.get(query);
+          assertEquals("Number of matched cqs are not equal to the expected matched cqs", numCqSize, cqs.size());
+        }
+      }
+    });
+  }
+
+  public void printCqQueryExecutionTime(VM server){
+    server.invoke(new CacheSerializableRunnable("printCqQueryExecutionTime"){
+      public void run2()throws CacheException {
+        CqServiceImpl cqService = null;
+        try {
+          cqService = (CqServiceImpl) ((DefaultQueryService)getCache().getQueryService()).getCqService();
+        } catch (Exception ex) {
+          getLogWriter().info("Failed to get the internal CqService.", ex);
+          fail ("Failed to get the internal CqService.", ex);
+        }
+
+        long timeTaken = cqService.getCqServiceVsdStats().getCqQueryExecutionTime();
+        getLogWriter().info("Total Time taken to Execute CQ Query :" + timeTaken);
+        //System.out.println("Total Time taken to Execute CQ Query :" + timeTaken);
+      }
+    });
+  }
+
+  public String[] generateCqQueries(boolean uniqueQueries){
+    ArrayList initQueries = new ArrayList();
+    // From Portfolio object.
+    String[] names={"aaa","bbb","ccc","ddd"};
+    int nameIndex = 0;
+    
+    // Construct few unique Queries.
+    for(int i=0; i < 3; i++){
+      for(int cnt=0; cnt < 5; cnt++){
+        String query = cqDUnitTest.cqs[i];
+        if (cnt > 0){
+          nameIndex = (cnt % names.length);
+          query += " or p.names[" + nameIndex + "] = '" + names[nameIndex] + cnt + "'"; 
+        }
+        initQueries.add(query);
+      }
+    }
+    
+    int numMatchedQueries = 10;
+    ArrayList cqQueries = new ArrayList();
+    Iterator iter = initQueries.iterator();
+    while (iter.hasNext()) {
+      String query = (String)iter.next();
+      for (int cnt=0; cnt < numMatchedQueries; cnt++){
+         if (uniqueQueries){
+           // Append blank string, so that query string is different but the 
+           // Query constraint remains same.
+           query+= " ";
+         }
+         cqQueries.add(query);
+      }
+    }
+    String[] queries = new String[cqQueries.size()];
+    cqQueries.toArray(queries);
+    return queries; 
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
new file mode 100644
index 0000000..883e6ee
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
@@ -0,0 +1,996 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.query.cq.dunit;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.query.CqAttributes;
+import com.gemstone.gemfire.cache.query.CqAttributesFactory;
+import com.gemstone.gemfire.cache.query.CqListener;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.cache.query.internal.DefaultQueryService;
+import com.gemstone.gemfire.cache.query.internal.cq.ServerCQImpl;
+import com.gemstone.gemfire.cache.query.internal.cq.CqService;
+import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
+import com.gemstone.gemfire.cache.query.internal.cq.InternalCqQuery;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.cache30.CacheTestCase;
+import com.gemstone.gemfire.internal.AvailablePortHelper;
+
+import dunit.Host;
+import dunit.SerializableRunnable;
+import dunit.VM;
+
+/**
+ * This class tests the ContiunousQuery mechanism in GemFire.
+ * This includes the test with diffetent data activities.
+ *
+ * @author anil
+ */
+public class CqPerfUsingPoolDUnitTest extends CacheTestCase {
+
+  protected CqQueryUsingPoolDUnitTest cqDUnitTest = new CqQueryUsingPoolDUnitTest("CqPerfUsingPoolDUnitTest");
+  
+  public CqPerfUsingPoolDUnitTest(String name) {
+    super(name);
+  }
+  
+  public void setUp() throws Exception {
+    super.setUp();
+    
+    // avoid IllegalStateException from HandShake by connecting all vms tor
+    // system before creating connection pools
+    getSystem();
+    invokeInEveryVM(new SerializableRunnable("getSystem") {
+      public void run() {
+        getSystem();
+      }
+    });
+    
+  }
+    
+
+  /**
+   * Tests the cq performance.
+   * @throws Exception
+   */
+  public void perf_testCQPerf() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    
+    cqDUnitTest.createServer(server);
+    
+    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class,
+    "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    
+    // Create client.
+    cqDUnitTest.createClient(client, port, host0);
+    final String cqName = "testCQPerf_0";    
+    
+    client.invoke(new CacheSerializableRunnable("Create CQ :" + cqName) {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Create CQ. ###" + cqName);
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+        // Create CQ Attributes.
+        CqAttributesFactory cqf = new CqAttributesFactory();
+        CqListener[] cqListeners = {new CqTimeTestListener(getLogWriter())};
+        ((CqTimeTestListener)cqListeners[0]).cqName = cqName;
+        
+        cqf.initCqListeners(cqListeners);
+        CqAttributes cqa = cqf.create();
+        
+        // Create and Execute CQ.
+        try {
+          CqQuery cq1 = cqService.newCq(cqName, cqDUnitTest.cqs[0], cqa);
+          assertTrue("newCq() state mismatch", cq1.getState().isStopped());
+          cq1.execute();
+        } catch (Exception ex){
+          getLogWriter().info("CqService is :" + cqService);
+          ex.printStackTrace();
+          AssertionError err = new AssertionError("Failed to create CQ " + cqName + " . ");
+          err.initCause(ex);
+          throw err;
+        }
+      }
+    });   
+    
+    final int size = 50;
+    
+    // Create values.
+    cqDUnitTest.createValuesWithTime(client, cqDUnitTest.regions[0], size);
+    pause(5000);
+    
+    // Update values
+    cqDUnitTest.createValuesWithTime(client, cqDUnitTest.regions[0], size);
+    
+    client.invoke(new CacheSerializableRunnable("Validate CQs") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Validating CQ. ### " + cqName);
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {          
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCqService.");
+        }
+        
+        CqQuery cQuery = cqService.getCq(cqName);
+        if (cQuery == null) {
+          fail("Failed to get CqQuery for CQ : " + cqName);
+        }
+        
+//        CqAttributes cqAttr = cQuery.getCqAttributes();
+//        CqListener cqListeners[] = cqAttr.getCqListeners();
+//        CqTimeTestListener listener = (CqTimeTestListener) cqListeners[0];
+        
+        // Wait for all the create to arrive.
+        //for (int i=1; i <= size; i++) {
+        //  listener.waitForCreated(cqDUnitTest.KEY+i);
+        //}
+        
+        // Wait for all the update to arrive.
+        //for (int i=1; i <= size; i++) {
+        //  listener.waitForUpdated(cqDUnitTest.KEY+i);
+        //}
+        //getLogWriter().info("### Time taken for Creation of " + size + " events is :" + listener.getTotalQueryCreateTime());
+        
+        //getLogWriter().info("### Time taken for Update of " + size + " events is :" + listener.getTotalQueryUpdateTime());
+      }
+    });
+    
+    pause( 10 * 60 * 1000);
+    
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server);
+    
+  }
+
+  /**
+   * Test for maintaining keys for update optimization.
+   * @throws Exception
+   */
+  public void testKeyMaintenance() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    
+    cqDUnitTest.createServer(server);
+    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    // cqDUnitTest.createClient(client, port, host0);
+
+    String poolName = "testKeyMaintainance";
+    cqDUnitTest.createPool(client, poolName, host0, port);
+
+    // HashSet for caching purpose will be created for cqs.
+    final int cqSize = 2;
+    
+    // Cq1
+    cqDUnitTest.createCQ(client, poolName, "testKeyMaintainance_0", cqDUnitTest.cqs[0]);
+    cqDUnitTest.executeCQ(client, "testKeyMaintainance_0", false, null);      
+
+    // Cq2
+    cqDUnitTest.createCQ(client, poolName, "testKeyMaintainance_1", cqDUnitTest.cqs[10]);
+    cqDUnitTest.executeCQ(client, "testKeyMaintainance_1", false, null);      
+
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], 1);
+    cqDUnitTest.waitForCreated(client, "testKeyMaintainance_0", CqQueryUsingPoolDUnitTest.KEY+1);
+
+    // Entry is made into the CQs cache hashset.
+    // testKeyMaintainance_0 with 1 entry and testKeyMaintainance_1 with 0
+    server.invoke(new CacheSerializableRunnable("LookForCachedEventKeys1"){
+      public void run2()throws CacheException {
+        CqService cqService = null;
+        try {
+          cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
+        } catch (Exception ex) {
+          getLogWriter().info("Failed to get the internal CqService.", ex);
+          fail ("Failed to get the internal CqService.", ex);
+        }
+
+        Collection<? extends InternalCqQuery> cqs = cqService.getAllCqs();
+        for (InternalCqQuery cq: cqs){
+          ServerCQImpl cqQuery = (ServerCQImpl)cq;
+
+          String serverCqName = (String)cqQuery.getServerCqName();
+          if (serverCqName.startsWith("testKeyMaintainance_0")){
+            assertEquals("The number of keys cached for cq testKeyMaintainance_0 is wrong.", 
+                1, cqQuery.getCqResultKeysSize());
+          } else if(serverCqName.startsWith("testKeyMaintainance_1")){
+            assertEquals("The number of keys cached for cq testKeyMaintainance_1 is wrong.",
+                0, cqQuery.getCqResultKeysSize());
+          }
+        }
+      }
+    });
+
+    // Update 1.
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], 10);
+    cqDUnitTest.waitForCreated(client, "testKeyMaintainance_0", CqQueryDUnitTest.KEY+10);
+    
+    // Entry/check is made into the CQs cache hashset.
+    // testKeyMaintainance_0 with 1 entry and testKeyMaintainance_1 with 1
+    server.invoke(new CacheSerializableRunnable("LookForCachedEventKeysAfterUpdate1"){
+      public void run2()throws CacheException {
+        CqService cqService = null;
+        try {
+          cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
+        } catch (Exception ex) {
+          getLogWriter().info("Failed to get the internal CqService.", ex);
+          fail ("Failed to get the internal CqService.", ex);
+        }
+        Collection<? extends InternalCqQuery> cqs = cqService.getAllCqs();
+        for (InternalCqQuery cq: cqs){
+          ServerCQImpl cqQuery = (ServerCQImpl)cq;
+
+          String serverCqName = (String)cqQuery.getServerCqName();
+          if (serverCqName.startsWith("testKeyMaintainance_0")){
+            assertEquals("The number of keys cached for cq testKeyMaintainance_0 is wrong.", 
+                10, cqQuery.getCqResultKeysSize());
+          } else if(serverCqName.startsWith("testKeyMaintainance_1")){
+            assertEquals("The number of keys cached for cq testKeyMaintainance_1 is wrong.",
+                5, cqQuery.getCqResultKeysSize());
+          }
+        }        
+      }
+    });
+
+    // Update.
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], 12);
+    cqDUnitTest.waitForCreated(client, "testKeyMaintainance_0", CqQueryDUnitTest.KEY+12);
+
+    // Entry/check is made into the CQs cache hashset.
+    // testKeyMaintainance_0 with 1 entry and testKeyMaintainance_1 with 1
+    server.invoke(new CacheSerializableRunnable("LookForCachedEventKeysAfterUpdate2"){
+      public void run2()throws CacheException {
+        CqService cqService = null;
+        try {
+          cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
+        } catch (Exception ex) {
+          getLogWriter().info("Failed to get the internal CqService.", ex);
+          fail ("Failed to get the internal CqService.", ex);
+        }
+
+        Collection<? extends InternalCqQuery> cqs = cqService.getAllCqs();
+        for (InternalCqQuery cq: cqs){
+          ServerCQImpl cqQuery = (ServerCQImpl)cq;
+
+          String serverCqName = (String)cqQuery.getServerCqName();
+          if (serverCqName.startsWith("testKeyMaintainance_0")){
+            assertEquals("The number of keys cached for cq testKeyMaintainance_0 is wrong.", 
+                12, cqQuery.getCqResultKeysSize());
+          } else if(serverCqName.startsWith("testKeyMaintainance_1")){
+            assertEquals("The number of keys cached for cq testKeyMaintainance_1 is wrong.",
+                6, cqQuery.getCqResultKeysSize());
+          }
+        }        
+        
+      }
+    });
+
+    // Delete.
+    cqDUnitTest.deleteValues(server, cqDUnitTest.regions[0], 6);
+    cqDUnitTest.waitForDestroyed(client, "testKeyMaintainance_0", CqQueryDUnitTest.KEY+6);
+
+    // Entry/check is made into the CQs cache hashset.
+    // testKeyMaintainance_0 with 1 entry and testKeyMaintainance_1 with 1
+    server.invoke(new CacheSerializableRunnable("LookForCachedEventKeysAfterUpdate2"){
+      public void run2()throws CacheException {
+        CqService cqService = null;
+        try {
+          cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
+        } catch (Exception ex) {
+          getLogWriter().info("Failed to get the internal CqService.", ex);
+          fail ("Failed to get the internal CqService.", ex);
+        }
+        Collection<? extends InternalCqQuery> cqs = cqService.getAllCqs();
+        for (InternalCqQuery cq: cqs){
+          ServerCQImpl cqQuery = (ServerCQImpl)cq;
+          
+          String serverCqName = (String)cqQuery.getServerCqName();
+          if (serverCqName.startsWith("testKeyMaintainance_0")){
+            assertEquals("The number of keys cached for cq testKeyMaintainance_0 is wrong.", 
+                6, cqQuery.getCqResultKeysSize());
+          } else if(serverCqName.startsWith("testKeyMaintainance_1")){
+            assertEquals("The number of keys cached for cq testKeyMaintainance_1 is wrong.",
+                3, cqQuery.getCqResultKeysSize());
+          }
+        }        
+      }
+    });
+
+    // This should still needs to process the events so that Results are uptodate.
+    cqDUnitTest.stopCQ(client, "testKeyMaintainance_1");      
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], 12);
+
+    server.invoke(new CacheSerializableRunnable("LookForCachedEventKeysAfterUpdate2"){
+      public void run2()throws CacheException {
+        CqService cqService = null;
+        try {
+          cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
+        } catch (Exception ex) {
+          getLogWriter().info("Failed to get the internal CqService.", ex);
+          fail ("Failed to get the internal CqService.", ex);
+        }
+
+        Collection<? extends InternalCqQuery> cqs = cqService.getAllCqs();
+        for (InternalCqQuery cq: cqs){
+          ServerCQImpl cqQuery = (ServerCQImpl)cq;
+          String serverCqName = (String)cqQuery.getServerCqName();
+          if (serverCqName.startsWith("testKeyMaintainance_0")){
+            assertEquals("The number of keys cached for cq testKeyMaintainance_0 is wrong.", 
+                12, cqQuery.getCqResultKeysSize());
+          } else if(serverCqName.startsWith("testKeyMaintainance_1")){
+            assertEquals("The number of keys cached for cq testKeyMaintainance_1 is wrong.", 
+                6, cqQuery.getCqResultKeysSize());
+          }
+        }        
+        
+      }
+    });
+
+    // This should re-start the caching for this CQ.
+    cqDUnitTest.executeCQ(client, "testKeyMaintainance_1", false, null);      
+
+    // This will remove the caching for this CQ.
+    cqDUnitTest.closeCQ(client, "testKeyMaintainance_1");      
+    server.invoke(new CacheSerializableRunnable("LookForCachedEventKeysAfterUpdate2"){
+      public void run2()throws CacheException {
+        CqService cqService = null;
+        try {
+          cqService = ((DefaultQueryService)getCache().getQueryService()).getCqService();
+        } catch (Exception ex) {
+          getLogWriter().info("Failed to get the internal CqService.", ex);
+          fail ("Failed to get the internal CqService.", ex);
+        }
+        Collection<? extends InternalCqQuery> cqs = cqService.getAllCqs();
+        for (InternalCqQuery cq: cqs){
+          ServerCQImpl cqQuery = (ServerCQImpl)cq;
+          String serverCqName = (String)cqQuery.getServerCqName();
+          if (serverCqName.startsWith("testKeyMaintainance_0")){
+            assertEquals("The number of keys cached for cq testKeyMaintainance_0 is wrong.", 
+                12, cqQuery.getCqResultKeysSize());
+          } else if(serverCqName.startsWith("testKeyMaintainance_1")){
+            fail("The key maintainance should not be present for this CQ.");
+          }
+        }
+        
+      }
+    });
+
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server);
+  }
+
+  /**
+   * Test for common CQs.
+   * To test the changes relating to, executing CQ only once for all similar CQs.
+   * @throws Exception
+   */
+  public void testMatchingCqs() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    
+    cqDUnitTest.createServer(server);
+    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    //cqDUnitTest.createClient(client, port, host0);
+    
+    String poolName = "testMatchingCqs";
+    cqDUnitTest.createPool(client, poolName, host0, port);
+
+    // Create and Execute same kind of CQs.
+    for (int i =0; i < 4; i++) {
+      cqDUnitTest.createCQ(client, poolName, "testMatchingCqs_"+i, cqDUnitTest.cqs[0]);
+      cqDUnitTest.executeCQ(client, "testMatchingCqs_"+i, false, null);      
+    }
+
+    validateMatchingCqs(server, 1, cqDUnitTest.cqs[0], 4);
+    
+    int size = 1; 
+    
+    // Create.
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], size);
+    cqDUnitTest.waitForCreated(client, "testMatchingCqs_0", CqQueryUsingPoolDUnitTest.KEY+size);
+    cqDUnitTest.waitForCreated(client, "testMatchingCqs_3", CqQueryUsingPoolDUnitTest.KEY+size);
+
+    // Close one of the CQ.
+    cqDUnitTest.closeCQ(client, "testMatchingCqs_0");      
+    validateMatchingCqs(server, 1, cqDUnitTest.cqs[0], 3);
+    
+    // Update.
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], size);
+    cqDUnitTest.waitForUpdated(client, "testMatchingCqs_3", CqQueryUsingPoolDUnitTest.KEY+size);
+    
+    // Stop one of the CQ.
+    cqDUnitTest.stopCQ(client, "testMatchingCqs_1");      
+    
+    validateMatchingCqs(server, 1, cqDUnitTest.cqs[0], 2);
+    
+    // Update - 2.
+    cqDUnitTest.clearCQListenerEvents(client, "testMatchingCqs_3");
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], size);
+    cqDUnitTest.waitForUpdated(client, "testMatchingCqs_3", CqQueryUsingPoolDUnitTest.KEY+size);
+
+    // stopped CQ should not receive 2nd/previous updates.
+    cqDUnitTest.validateCQ(client, "testMatchingCqs_1",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: once */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size * 2);
+
+    // Execute the stopped CQ.
+    cqDUnitTest.executeCQ(client, "testMatchingCqs_1", false, null);      
+
+    
+    // Update - 3.
+    cqDUnitTest.clearCQListenerEvents(client, "testMatchingCqs_3");
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], size);
+    cqDUnitTest.waitForUpdated(client, "testMatchingCqs_3", CqQueryUsingPoolDUnitTest.KEY+size);
+    
+    cqDUnitTest.validateCQ(client, "testMatchingCqs_1",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: 2 */ size * 2,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size * 2,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size * 3);
+
+    // Create different kind of CQs.
+    cqDUnitTest.createCQ(client, poolName, "testMatchingCqs_4", cqDUnitTest.cqs[1]);
+    cqDUnitTest.executeCQ(client, "testMatchingCqs_4", false, null);      
+
+    cqDUnitTest.createCQ(client, poolName, "testMatchingCqs_5", cqDUnitTest.cqs[1]);
+    cqDUnitTest.executeCQ(client, "testMatchingCqs_5", false, null);      
+    
+    cqDUnitTest.createCQ(client, poolName, "testMatchingCqs_6", cqDUnitTest.cqs[2]);
+    cqDUnitTest.executeCQ(client, "testMatchingCqs_6", false, null);      
+
+    validateMatchingCqs(server, 3, cqDUnitTest.cqs[1], 2);
+    
+    cqDUnitTest.closeCQ(client, "testMatchingCqs_6");
+    validateMatchingCqs(server, 2, cqDUnitTest.cqs[1], 2);
+
+    cqDUnitTest.closeCQ(client, "testMatchingCqs_5");
+    cqDUnitTest.closeCQ(client, "testMatchingCqs_4");
+    cqDUnitTest.closeCQ(client, "testMatchingCqs_3");
+    cqDUnitTest.closeCQ(client, "testMatchingCqs_2");
+    cqDUnitTest.closeCQ(client, "testMatchingCqs_1");
+
+    validateMatchingCqs(server, 0, null, 0);
+
+    // update 4
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], size);
+
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server);
+  }
+  
+  
+  /**
+   * Test for common CQs.
+   * To test the changes relating to, executing CQ only once for all similar CQs.
+   * @throws Exception
+   */
+  public void testMatchingCQWithMultipleClients() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client1 = host.getVM(1);
+    VM client2 = host.getVM(2);
+    VM client3 = host.getVM(3);
+    
+    VM clients[] = new VM[]{client1, client2, client3};
+    
+    cqDUnitTest.createServer(server);
+    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    String poolName = "testMatchingCQWithMultipleClients";     
+    for (int clientIndex=0; clientIndex < 3; clientIndex++){
+      String cPoolName = "testMatchingCQWithMultipleClients" + clientIndex;
+      cqDUnitTest.createPool(clients[clientIndex], cPoolName, host0, port);
+
+      //cqDUnitTest.createClient(clients[clientIndex], port, host0);
+      // Create and Execute same kind of CQs.
+      for (int i =0; i < 4; i++) {
+        cqDUnitTest.createCQ(clients[clientIndex], cPoolName, "testMatchingCQWithMultipleClients_"+i, cqDUnitTest.cqs[0]);
+        cqDUnitTest.executeCQ(clients[clientIndex], 
+            "testMatchingCQWithMultipleClients_"+i, false, null);      
+      }
+    }
+    
+    validateMatchingCqs(server, 1, cqDUnitTest.cqs[0], clients.length * 4);
+    
+    int size = 1; 
+    
+    // Create.
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], size);
+    for (int clientIndex=0; clientIndex < 3; clientIndex++){
+      cqDUnitTest.waitForCreated(clients[clientIndex], 
+          "testMatchingCQWithMultipleClients_0", CqQueryUsingPoolDUnitTest.KEY+size);
+      cqDUnitTest.waitForCreated(clients[clientIndex], 
+          "testMatchingCQWithMultipleClients_3", CqQueryUsingPoolDUnitTest.KEY+size);
+    }
+
+    // Close one of the CQ.
+    cqDUnitTest.closeCQ(client1, "testMatchingCQWithMultipleClients_0");      
+    validateMatchingCqs(server, 1, cqDUnitTest.cqs[0], (clients.length * 4) - 1);
+    
+    // Update.
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], size);
+    
+    for (int clientIndex=0; clientIndex < 3; clientIndex++){
+      cqDUnitTest.waitForUpdated(clients[clientIndex], 
+          "testMatchingCQWithMultipleClients_3", CqQueryUsingPoolDUnitTest.KEY+size);
+    }
+
+    // Stop one of the CQ.
+    cqDUnitTest.stopCQ(client2, "testMatchingCQWithMultipleClients_1");      
+    
+    validateMatchingCqs(server, 1, cqDUnitTest.cqs[0], (clients.length * 4) - 2);
+    
+    // Update - 2.
+    for (int clientIndex=0; clientIndex < 3; clientIndex++){
+      cqDUnitTest.clearCQListenerEvents(clients[clientIndex], "testMatchingCQWithMultipleClients_3");
+    }
+
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], size);
+
+    for (int clientIndex=0; clientIndex < 3; clientIndex++){
+      cqDUnitTest.waitForUpdated(clients[clientIndex], 
+          "testMatchingCQWithMultipleClients_3", CqQueryUsingPoolDUnitTest.KEY+size);
+    }
+    
+    // stopped CQ should not receive 2nd/previous updates.
+    cqDUnitTest.validateCQ(client2, "testMatchingCQWithMultipleClients_1",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: once */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size * 2);
+
+    // Execute the stopped CQ.
+    cqDUnitTest.executeCQ(client2, "testMatchingCQWithMultipleClients_1", false, null);      
+
+    
+    // Update - 3.
+    for (int clientIndex=0; clientIndex < 3; clientIndex++){
+      cqDUnitTest.clearCQListenerEvents(clients[clientIndex], "testMatchingCQWithMultipleClients_3");
+    }
+
+    validateMatchingCqs(server, 1, cqDUnitTest.cqs[0], (clients.length * 4) - 1);
+    
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], size);
+
+    for (int clientIndex=0; clientIndex < 3; clientIndex++){
+      cqDUnitTest.waitForUpdated(clients[clientIndex], 
+          "testMatchingCQWithMultipleClients_3", CqQueryUsingPoolDUnitTest.KEY+size);
+    }
+
+    cqDUnitTest.validateCQ(client2, "testMatchingCQWithMultipleClients_1",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: 2 */ size * 2,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size * 2,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size * 3);
+
+    // Create different kind of CQs.
+    for (int clientIndex=0; clientIndex < 3; clientIndex++){
+      String cPoolName = poolName + clientIndex;
+      cqDUnitTest.createCQ(clients[clientIndex], cPoolName, "testMatchingCQWithMultipleClients_4", cqDUnitTest.cqs[1]);
+      cqDUnitTest.executeCQ(clients[clientIndex], 
+          "testMatchingCQWithMultipleClients_4", false, null);      
+
+      cqDUnitTest.createCQ(clients[clientIndex], cPoolName, "testMatchingCQWithMultipleClients_5", cqDUnitTest.cqs[1]);
+      cqDUnitTest.executeCQ(clients[clientIndex], 
+          "testMatchingCQWithMultipleClients_5", false, null);      
+
+      cqDUnitTest.createCQ(clients[clientIndex], cPoolName, "testMatchingCQWithMultipleClients_6", cqDUnitTest.cqs[2]);
+      cqDUnitTest.executeCQ(clients[clientIndex], 
+          "testMatchingCQWithMultipleClients_6", false, null);      
+    }
+    
+    validateMatchingCqs(server, 3, cqDUnitTest.cqs[1], 2 * clients.length);
+    
+    for (int clientIndex=0; clientIndex < 3; clientIndex++){
+      cqDUnitTest.closeCQ(clients[clientIndex], "testMatchingCQWithMultipleClients_6");
+    }
+
+    validateMatchingCqs(server, 2, cqDUnitTest.cqs[1], 2 * clients.length);
+
+
+    // update 4
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], size);
+
+    // Close.
+    cqDUnitTest.closeClient(client3);
+    validateMatchingCqs(server, 2, cqDUnitTest.cqs[1], 2 * (clients.length - 1));
+    
+    for (int clientIndex=0; clientIndex < 2; clientIndex++){      
+      cqDUnitTest.closeCQ(clients[clientIndex], "testMatchingCQWithMultipleClients_5");
+      cqDUnitTest.closeCQ(clients[clientIndex], "testMatchingCQWithMultipleClients_4");
+      cqDUnitTest.closeCQ(clients[clientIndex], "testMatchingCQWithMultipleClients_3");
+      cqDUnitTest.closeCQ(clients[clientIndex], "testMatchingCQWithMultipleClients_2");
+      cqDUnitTest.closeCQ(clients[clientIndex], "testMatchingCQWithMultipleClients_1");
+      if (clientIndex != 0) {
+        cqDUnitTest.closeCQ(clients[clientIndex], "testMatchingCQWithMultipleClients_0");
+      }
+    }
+
+    validateMatchingCqs(server, 0, null, 0);
+    
+    cqDUnitTest.closeClient(client2);
+    cqDUnitTest.closeClient(client1);
+    
+    cqDUnitTest.closeServer(server);
+  }
+
+  /**
+   * Test for CQ Fail over.
+   * @throws Exception
+   */
+  public void testMatchingCQsWithMultipleServers() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client1 = host.getVM(2);
+    VM client2 = host.getVM(3);
+    
+    cqDUnitTest.createServer(server1);
+    
+    VM clients[] = new VM[]{client1, client2};
+    
+    final int port1 = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+    // Create client.
+    
+    // Create client with redundancyLevel -1
+    
+    final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(1);
+    String poolName1 = "testClientWithFeederAndCQ1";
+    String poolName2 = "testClientWithFeederAndCQ2";
+    
+    cqDUnitTest.createPool(client1, poolName1, new String[] {host0, host0}, new int[] {port1, ports[0]});
+    cqDUnitTest.createPool(client2, poolName2, new String[] {host0, host0}, new int[] {port1, ports[0]});
+
+    //cqDUnitTest.createClient(client1, new int[] {port1, ports[0]}, host0, "-1");
+    //cqDUnitTest.createClient(client2, new int[] {port1, ports[0]}, host0, "-1");
+    
+    int numCQs = 3;
+    
+    for (int i=0; i < numCQs; i++) {
+      cqDUnitTest.createCQ(client1, poolName1, "testMatchingCQsWithMultipleServers_" + i, cqDUnitTest.cqs[i]);
+      cqDUnitTest.executeCQ(client1, "testMatchingCQsWithMultipleServers_" + i, 
+          false, null);
+      
+      cqDUnitTest.createCQ(client2, poolName2, "testMatchingCQsWithMultipleServers_" + i, cqDUnitTest.cqs[i]);
+      cqDUnitTest.executeCQ(client2, "testMatchingCQsWithMultipleServers_" + i, 
+          false, null);
+    }
+    
+    validateMatchingCqs(server1, numCQs, cqDUnitTest.cqs[0], 1 * clients.length);
+    validateMatchingCqs(server1, numCQs, cqDUnitTest.cqs[1], 1 * clients.length);
+    
+    pause(1 * 1000);
+    
+    // CREATE.
+    cqDUnitTest.createValues(server1, cqDUnitTest.regions[0], 10);
+    cqDUnitTest.createValues(server1, cqDUnitTest.regions[1], 10);
+
+    for (int i=1; i <= 10; i++) {
+      cqDUnitTest.waitForCreated(client1, 
+          "testMatchingCQsWithMultipleServers_0", CqQueryUsingPoolDUnitTest.KEY+i);
+    }
+
+    pause(1 * 1000);
+    
+    cqDUnitTest.createServer(server2, ports[0]);
+    
+    
+    final int port2 = server2.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    System.out.println("### Port on which server1 running : " + port1 + 
+        " Server2 running : " + port2);
+
+    pause(3 * 1000);
+    
+
+    // UPDATE - 1.
+    for (int k=0; k < numCQs; k++) {
+      cqDUnitTest.clearCQListenerEvents(client1, "testMatchingCQsWithMultipleServers_" + k);
+      cqDUnitTest.clearCQListenerEvents(client2, "testMatchingCQsWithMultipleServers_" + k);
+    }
+    
+    cqDUnitTest.createValues(server1, cqDUnitTest.regions[0], 10);    
+    cqDUnitTest.createValues(server1, cqDUnitTest.regions[1], 10);
+    
+    // Wait for updates on regions[0]
+    for (int i=1; i <= 10; i++) {
+      cqDUnitTest.waitForUpdated(client1, 
+          "testMatchingCQsWithMultipleServers_0", CqQueryDUnitTest.KEY+i);
+      cqDUnitTest.waitForUpdated(client2, 
+          "testMatchingCQsWithMultipleServers_0", CqQueryDUnitTest.KEY+i);
+    }
+
+    // Wait for updates on regions[1] - Waiting for last key is good enough.
+    cqDUnitTest.waitForUpdated(client1, 
+        "testMatchingCQsWithMultipleServers_2", CqQueryDUnitTest.KEY+4);
+    cqDUnitTest.waitForUpdated(client2, 
+        "testMatchingCQsWithMultipleServers_2", CqQueryDUnitTest.KEY+4);
+        
+    int[] resultsCnt = new int[] {10, 1, 2};
+    
+    for (int i=0; i < numCQs; i++) {
+      cqDUnitTest.validateCQ(client1, "testMatchingCQsWithMultipleServers_" + i, 
+        CqQueryUsingPoolDUnitTest.noTest, resultsCnt[i], resultsCnt[i], CqQueryUsingPoolDUnitTest.noTest);
+
+      cqDUnitTest.validateCQ(client2, "testMatchingCQsWithMultipleServers_" + i, 
+        CqQueryUsingPoolDUnitTest.noTest, resultsCnt[i], resultsCnt[i], CqQueryUsingPoolDUnitTest.noTest);
+    }    
+    
+    // Close server1.
+    cqDUnitTest.closeServer(server1);
+    
+    // Fail over should happen.
+    pause(5 * 1000);
+    
+    validateMatchingCqs(server2, numCQs, cqDUnitTest.cqs[0], 1 * clients.length);
+
+    for (int i=0; i < numCQs; i++) {
+      cqDUnitTest.validateCQ(client1, "testMatchingCQsWithMultipleServers_" + i, 
+        CqQueryUsingPoolDUnitTest.noTest, resultsCnt[i], resultsCnt[i], CqQueryUsingPoolDUnitTest.noTest);
+
+      cqDUnitTest.validateCQ(client2, "testMatchingCQsWithMultipleServers_" + i, 
+        CqQueryUsingPoolDUnitTest.noTest, resultsCnt[i], resultsCnt[i], CqQueryUsingPoolDUnitTest.noTest);
+    }    
+    
+    // UPDATE - 2
+    for (int k=0; k < numCQs; k++) {
+      cqDUnitTest.clearCQListenerEvents(client1, "testMatchingCQsWithMultipleServers_" + k);
+      cqDUnitTest.clearCQListenerEvents(client2, "testMatchingCQsWithMultipleServers_" + k);
+    }
+    
+    cqDUnitTest.createValues(server2, cqDUnitTest.regions[0], 10);
+    cqDUnitTest.createValues(server2, cqDUnitTest.regions[1], 10);
+
+ 
+    // Wait for cq1. on region[0]
+    for (int i=1; i <= resultsCnt[0]; i++) {
+      cqDUnitTest.waitForUpdated(client1, 
+          "testMatchingCQsWithMultipleServers_0", CqQueryUsingPoolDUnitTest.KEY+i);
+      cqDUnitTest.waitForUpdated(client2, 
+          "testMatchingCQsWithMultipleServers_0", CqQueryUsingPoolDUnitTest.KEY+i);
+    }  
+
+    // Wait for cq3. on region[1]
+    {
+      cqDUnitTest.waitForUpdated(client1, 
+          "testMatchingCQsWithMultipleServers_2", CqQueryUsingPoolDUnitTest.KEY+"4");
+      cqDUnitTest.waitForUpdated(client2, 
+          "testMatchingCQsWithMultipleServers_2", CqQueryUsingPoolDUnitTest.KEY+"4");
+    }
+
+        
+    for (int i=0; i < numCQs; i++) {
+      cqDUnitTest.validateCQ(client1, "testMatchingCQsWithMultipleServers_" + i, 
+        CqQueryUsingPoolDUnitTest.noTest, resultsCnt[i], resultsCnt[i] * 2, CqQueryUsingPoolDUnitTest.noTest);
+
+      cqDUnitTest.validateCQ(client2, "testMatchingCQsWithMultipleServers_" + i, CqQueryUsingPoolDUnitTest.noTest, 
+        resultsCnt[i], resultsCnt[i] * 2, CqQueryUsingPoolDUnitTest.noTest);
+    }    
+    
+
+    // Close.
+    cqDUnitTest.closeClient(client1);
+
+    validateMatchingCqs(server2, numCQs, cqDUnitTest.cqs[0], 1 * (clients.length - 1));
+
+    cqDUnitTest.closeClient(client2);
+    cqDUnitTest.closeServer(server2);
+  }
+
+  /**
+   * Performance test for Matching CQ optimization changes.
+   * @throws Exception
+   */
+  public void perf_testPerformanceForMatchingCQs() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client1 = host.getVM(2);
+    VM client2 = host.getVM(3);
+    
+    cqDUnitTest.createServer(server1);
+    cqDUnitTest.createServer(server2);
+    
+//    VM clients[] = new VM[]{client1, client2};
+    
+    final int port1 = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final int port2 = server2.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+
+    // Create client.
+//    final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(1);
+    
+    // Client1 connects to server1.
+    cqDUnitTest.createClient(client1, new int[] {port1}, host0, "-1", null);
+    
+    // Client2 connects to server2.
+    cqDUnitTest.createClient(client2, new int[] {port2}, host0, "-1", null);
+    
+    // Client1 registers matching CQs on server1.
+    boolean uniqueQueries = false;
+    String[] matchingCqs = this.generateCqQueries(uniqueQueries); 
+    for (int i=0; i < matchingCqs.length; i++) {
+      cqDUnitTest.createCQ(client1, "testPerformanceForMatchingCQs_" + i, matchingCqs[i]);
+      cqDUnitTest.executeCQ(client1, "testPerformanceForMatchingCQs_" + i, 
+          false, null);
+    }
+
+    // Client2 registers non-matching CQs on server2.
+    uniqueQueries = true;
+    matchingCqs = this.generateCqQueries(uniqueQueries); 
+    for (int i=0; i < matchingCqs.length; i++) {
+      cqDUnitTest.createCQ(client2, "testPerformanceForMatchingCQs_" + i, matchingCqs[i]);
+      cqDUnitTest.executeCQ(client2, "testPerformanceForMatchingCQs_" + i, 
+          false, null);
+    }
+
+    pause(1 * 1000);
+    
+    // CREATE.
+    int size = 1000;
+    cqDUnitTest.createValues(server1, cqDUnitTest.regions[0], size);
+    cqDUnitTest.createValues(server2, cqDUnitTest.regions[1], size);
+   
+    // Update couple of times;
+    for (int j=0; j < 5; j++){
+      cqDUnitTest.createValues(server1, cqDUnitTest.regions[0], size-1);
+      cqDUnitTest.createValues(server2, cqDUnitTest.regions[1], size-1);      
+    }
+
+    for (int j=0; j < 4; j++){
+      cqDUnitTest.createValues(server2, cqDUnitTest.regions[0], size-1);
+      cqDUnitTest.createValues(server1, cqDUnitTest.regions[1], size-1);      
+    }
+
+    // Update the last key.
+    cqDUnitTest.createValues(server2, cqDUnitTest.regions[0], size);
+    cqDUnitTest.createValues(server1, cqDUnitTest.regions[1], size);      
+    
+    for (int k=1; k <= size; k++){
+      cqDUnitTest.waitForUpdated(client1, 
+          "testPerformanceForMatchingCQs_0", CqQueryUsingPoolDUnitTest.KEY+k);
+    }
+ 
+    pause(1 * 1000);
+    printCqQueryExecutionTime(server1);
+    printCqQueryExecutionTime(server2);
+    
+    // Close.
+    cqDUnitTest.closeClient(client1);
+    cqDUnitTest.closeClient(client2);
+    cqDUnitTest.closeServer(server2);
+    cqDUnitTest.closeServer(server1);
+
+  }
+
+  public void validateMatchingCqs(VM server, final int mapSize, final String query, final int numCqSize){
+    server.invoke(new CacheSerializableRunnable("validateMatchingCqs"){
+      public void run2()throws CacheException {
+        CqServiceImpl cqService = null;
+        try {
+          cqService = (CqServiceImpl) ((DefaultQueryService)getCache().getQueryService()).getCqService();
+        } catch (Exception ex) {
+          getLogWriter().info("Failed to get the internal CqService.", ex);
+          fail ("Failed to get the internal CqService.", ex);
+        }
+
+        HashMap matchedCqMap = cqService.getMatchingCqMap();
+        assertEquals("The number of matched cq is not as expected.", mapSize, matchedCqMap.size());
+
+        if (query != null) {        
+          if (!matchedCqMap.containsKey(query))
+          {
+            fail("Query not found in the matched cq map. Query:" + query);
+          }
+          Collection cqs = (Collection)matchedCqMap.get(query);
+          assertEquals("Number of matched cqs are not equal to the expected matched cqs", numCqSize, cqs.size());
+        }
+      }
+    });
+  }
+
+  public void printCqQueryExecutionTime(VM server){
+    server.invoke(new CacheSerializableRunnable("printCqQueryExecutionTime"){
+      public void run2()throws CacheException {
+        CqServiceImpl cqService = null;
+        try {
+          cqService = (CqServiceImpl) ((DefaultQueryService)getCache().getQueryService()).getCqService();
+        } catch (Exception ex) {
+          getLogWriter().info("Failed to get the internal CqService.", ex);
+          fail ("Failed to get the internal CqService.", ex);
+        }
+
+        long timeTaken = cqService.getCqServiceVsdStats().getCqQueryExecutionTime();
+        getLogWriter().info("Total Time taken to Execute CQ Query :" + timeTaken);
+        System.out.println("Total Time taken to Execute CQ Query :" + timeTaken);
+      }
+    });
+  }
+
+  public String[] generateCqQueries(boolean uniqueQueries){
+    ArrayList initQueries = new ArrayList();
+    // From Portfolio object.
+    String[] names={"aaa","bbb","ccc","ddd"};
+    int nameIndex = 0;
+    
+    // Construct few unique Queries.
+    for(int i=0; i < 3; i++){
+      for(int cnt=0; cnt < 5; cnt++){
+        String query = cqDUnitTest.cqs[i];
+        if (cnt > 0){
+          nameIndex = (cnt % names.length);
+          query += " or p.names[" + nameIndex + "] = '" + names[nameIndex] + cnt + "'"; 
+        }
+        initQueries.add(query);
+      }
+    }
+    
+    int numMatchedQueries = 10;
+    ArrayList cqQueries = new ArrayList();
+    Iterator iter = initQueries.iterator();
+    while (iter.hasNext()) {
+      String query = (String)iter.next();
+      for (int cnt=0; cnt < numMatchedQueries; cnt++){
+         if (uniqueQueries){
+           // Append blank string, so that query string is different but the 
+           // Query constraint remains same.
+           query+= " ";
+         }
+         cqQueries.add(query);
+      }
+    }
+    String[] queries = new String[cqQueries.size()];
+    cqQueries.toArray(queries);
+    return queries; 
+  }
+}


[07/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
new file mode 100644
index 0000000..c9f7054
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
@@ -0,0 +1,1440 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.wan.parallel;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import com.gemstone.gemfire.cache.EntryExistsException;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.client.ServerOperationException;
+import com.gemstone.gemfire.cache.wan.GatewaySender;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.cache.RegionQueue;
+import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
+import com.gemstone.gemfire.internal.cache.wan.BatchException70;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase.MyGatewayEventFilter;
+
+import dunit.AsyncInvocation;
+
+public class ParallelWANPropagationDUnitTest extends WANTestBase {
+  private static final long serialVersionUID = 1L;
+
+  public ParallelWANPropagationDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+  }
+
+  public void test_ParallelGatewaySenderMetaRegionNotExposedToUser_Bug44216() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    createCache(lnPort);
+    createSender("ln", 2, true, 100, 300, false, false,
+        null, true);
+    createPartitionedRegion(testName + "_PR", "ln", 1, 100, isOffHeap());
+
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    GatewaySender sender = null;
+    for (GatewaySender s : senders) {
+      if (s.getId().equals("ln")) {
+        sender = s;
+        break;
+      }
+    }
+    try {
+      sender.start();
+    } catch (Exception e) {
+      e.printStackTrace();
+      fail("Failed with IOException");
+    }
+
+    GemFireCacheImpl gemCache = (GemFireCacheImpl)cache;
+    Set regionSet = gemCache.rootRegions();
+
+    for (Object r : regionSet) {
+      if (((Region)r).getName().equals(
+          ((AbstractGatewaySender)sender).getQueues().toArray(new RegionQueue[1])[0].getRegion().getName())) {
+        fail("The shadowPR is exposed to the user");
+      }
+    }
+  }
+  
+  public void testParallelPropagation_withoutRemoteSite() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    //keep a larger batch to minimize number of exception occurrences in the log
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 300, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 300, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 300, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 300, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", false });
+    vm5.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", false});
+    vm6.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", false });
+    vm7.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", false });
+    
+    //make sure all the senders are running before doing any puts
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+      1000 });
+
+    
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 1, 100, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 1, 100, isOffHeap()  });
+    
+    //verify all buckets drained on all sender nodes.
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    
+    // Just making sure that though the remote site is started later,
+    // remote site is still able to get the data. Since the receivers are
+    // started before creating partition region it is quite possible that the
+    // region may loose some of the events. This needs to be handled by the code
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 1000 });
+  }
+  
+  /**
+   * Normal happy scenario test case.
+   * @throws Exception
+   */
+  public void testParallelPropagation() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap()  });
+
+    //before doing any puts, let the senders be running in order to ensure that
+    //not a single event will be lost
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+        1000 });
+    
+    //verify all buckets drained on all sender nodes.
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 1000 });
+  }
+
+  public void testParallelPropagation_ManualStart() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, false });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, false });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, false });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, false });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap()  });
+
+    //before doing any puts, let the senders be running in order to ensure that
+    //not a single event will be lost
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+        1000 });
+    
+    //verify all buckets drained on all sender nodes.
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 1000 });
+  }
+  
+  /**
+   * Normal happy scenario test case2.
+   * @throws Exception
+   */
+  public void testParallelPropagationPutBeforeSenderStart() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+      1000 });
+    
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    AsyncInvocation inv2 = vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    AsyncInvocation inv3 = vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    AsyncInvocation inv4 = vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    try{
+      inv1.join();
+      inv2.join();
+      inv3.join();
+      inv4.join();
+    }
+    catch(InterruptedException ie) {
+      fail("Caught interrupted exception");
+    }
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap()  });
+
+    //before doing any puts, let the senders be running in order to ensure that
+    //not a single event will be lost
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+        1000 });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 1000 });
+  }
+  
+  /**
+   * Local and remote sites are up and running.
+   * Local site cache is closed and the site is built again.
+   * Puts are done to local site.
+   * Expected: Remote site should receive all the events put after the local
+   * site was built back.
+   * 
+   * @throws Exception
+   */
+  public void testParallelPropagationWithLocalCacheClosedAndRebuilt() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap()  });
+
+    //before doing any puts, let the senders be running in order to ensure that
+    //not a single event will be lost
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+      1000 });
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+              testName + "_PR", 1000 });
+    //-------------------Close and rebuild local site ---------------------------------
+
+    vm4.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm5.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm6.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm7.invoke(WANTestBase.class, "killSender", new Object[] {});
+    
+    Integer regionSize = 
+      (Integer) vm2.invoke(WANTestBase.class, "getRegionSize", new Object[] {testName + "_PR" });
+    getLogWriter().info("Region size on remote is: " + regionSize);
+    
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
+    vm5.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
+    vm6.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
+    vm7.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
+    
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    //------------------------------------------------------------------------------------
+    
+    addExpectedException(EntryExistsException.class.getName());
+    addExpectedException(BatchException70.class.getName());
+    addExpectedException(ServerOperationException.class.getName());
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+    
+    //verify all buckets drained on all sender nodes.
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 1000 });
+  }
+  
+  public void testParallelColocatedPropagation() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
+        new Object[] { testName, "ln", 1, 100, isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
+        new Object[] { testName, "ln", 1, 100, isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
+        new Object[] { testName, "ln", 1, 100, isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
+        new Object[] { testName, "ln", 1, 100, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
+        new Object[] { testName, null, 1, 100, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
+        new Object[] { testName, null, 1, 100, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 1000 });
+    
+    //verify all buckets drained on all sender nodes.
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 1000 });
+  }
+  /**
+   * Create colocated partitioned regions.
+   * Parent region has PGS attached and child region doesn't.
+   * 
+   * Validate that events for parent region reaches remote site.
+   * 
+   * @throws Exception
+   */
+
+  public void testParallelColocatedPropagation2() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createColocatedPartitionedRegions2",
+        new Object[] { testName, "ln", 1, 100, isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createColocatedPartitionedRegions2",
+        new Object[] { testName, "ln", 1, 100, isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createColocatedPartitionedRegions2",
+        new Object[] { testName, "ln", 1, 100, isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createColocatedPartitionedRegions2",
+        new Object[] { testName, "ln", 1, 100, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createColocatedPartitionedRegions2",
+        new Object[] { testName, null, 1, 100, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createColocatedPartitionedRegions2",
+        new Object[] { testName, null, 1, 100, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 1000 });
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName+"_child1", 1000 });
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName+"_child2", 1000 });
+    
+    //verify all buckets drained on all sender nodes.
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 1000 });
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName+"_child1", 0 });
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName+"_child2", 0 });
+  }
+
+  
+  public void testParallelPropagationWihtOverflow() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap()  });
+
+    //let all the senders start before doing any puts to ensure that none of the events is lost
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "doHeavyPuts", new Object[] { testName, 150 });
+
+    //verify all buckets drained on all sender nodes.
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 150 });
+  }
+
+  public void testSerialReplicatedAndParallePartitionedPropagation()
+      throws Exception {
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial",
+        2, false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial",
+        2, false, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "lnParallel",
+        2, true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "lnParallel",
+        2, true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "lnParallel",
+        2, true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "lnParallel",
+        2, true, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "lnSerial", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "lnSerial", isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "lnSerial", isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "lnSerial", isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "lnParallel", 1, 100, isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "lnParallel", 1, 100, isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "lnParallel", 1, 100, isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "lnParallel", 1, 100, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial" });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "lnParallel" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnParallel" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "lnParallel" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "lnParallel" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+    vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+        1000 });
+    
+    //verify all buckets drained on all sender nodes.
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"lnParallel"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"lnParallel"});
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"lnParallel"});
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"lnParallel"});
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 1000 });
+  }
+
+  public void testPartitionedParallelPropagationToTwoWanSites()
+      throws Exception {
+    Integer lnPort = createFirstLocatorWithDSId(1);
+    Integer nyPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer tkPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 3, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "lnParallel1",
+        2, true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "lnParallel1",
+        2, true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "lnParallel1",
+        2, true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "lnParallel1",
+        2, true, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "lnParallel2",
+        3, true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "lnParallel2",
+        3, true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "lnParallel2",
+        3, true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "lnParallel2",
+        3, true, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "lnParallel1,lnParallel2", 1, 100, isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "lnParallel1,lnParallel2", 1, 100, isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "lnParallel1,lnParallel2", 1, 100, isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "lnParallel1,lnParallel2", 1, 100, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "lnParallel1" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnParallel1" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "lnParallel1" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "lnParallel1" });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "lnParallel2" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnParallel2" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "lnParallel2" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "lnParallel2" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap()  });
+
+    //before doing puts, make sure that the senders are started.
+    //this will ensure that not a single events is lost
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "lnParallel1" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "lnParallel1" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "lnParallel1" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "lnParallel1" });
+
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "lnParallel2" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "lnParallel2" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "lnParallel2" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "lnParallel2" });
+    
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+        1000 });
+    
+    //verify all buckets drained on all sender nodes.
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"lnParallel1"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"lnParallel1"});
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"lnParallel1"});
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"lnParallel1"});
+    
+    //verify all buckets drained on all sender nodes.
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"lnParallel2"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"lnParallel2"});
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"lnParallel2"});
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"lnParallel2"});
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 1000 });
+  }
+
+  public void testPartitionedParallelPropagationHA() throws Exception {
+    addExpectedException("Broken pipe");
+    addExpectedException("Connection reset");
+    addExpectedException("Unexpected IOException");
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
+    vm5.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
+    vm6.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
+    vm7.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
+    
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 2, 100, isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 2, 100, isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 2, 100, isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 2, 100, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap()  });
+
+    AsyncInvocation inv1 = vm7.invokeAsync(WANTestBase.class, "doPuts",
+        new Object[] { testName + "_PR", 5000 });
+    pause(500);
+    AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "killSender");
+    AsyncInvocation inv3 = vm6.invokeAsync(WANTestBase.class, "doPuts",
+        new Object[] { testName + "_PR", 10000 });
+    pause(1500);
+    AsyncInvocation inv4 = vm5.invokeAsync(WANTestBase.class, "killSender");
+    inv1.join();
+    inv2.join();
+    inv3.join();
+    inv4.join();
+    
+    vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 10000 });
+    vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 10000 });
+    
+    //verify all buckets drained on the sender nodes that up and running.
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 10000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 10000 });
+  }
+
+  public void testParallelPropagationWithFilter() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false,
+        new MyGatewayEventFilter(), true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false,
+        new MyGatewayEventFilter(), true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false,
+        new MyGatewayEventFilter(), true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false,
+        new MyGatewayEventFilter(), true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap()  });
+
+    //wait for senders to be running before doing any puts. This will ensure that
+    //not a single events is lost
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 800 });
+  }
+  
+  
+  public void testParallelPropagationWithPutAll() throws Exception {
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap()  });
+
+    //before doing any puts, let the senders be running in order to ensure that
+    //not a single event will be lost
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "doPutAll", new Object[] { testName + "_PR",
+        100 , 50 });
+    
+    //verify all buckets drained on all sender nodes.
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 5000 });
+  
+  }
+  
+  /**
+   * There was a bug that all destroy events were being put into different buckets of sender queue
+   * against the key 0. Bug# 44304
+   *  
+   * @throws Exception
+   */
+  public void testParallelPropagationWithDestroy() throws Exception {
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 100, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 100, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 100, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 100, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap()  });
+
+    //before doing any puts, let the senders be running in order to ensure that
+    //not a single event will be lost
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    
+    pause(2000);
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+    vm4.invoke(WANTestBase.class, "doDestroys", new Object[] { testName + "_PR", 500 });
+    
+    
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueBucketSize", new Object[] { "ln", 15 });
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueBucketSize", new Object[] { "ln", 15 });
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueBucketSize", new Object[] { "ln", 15 });
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueBucketSize", new Object[] { "ln", 15 });
+
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    
+    //give some time for the queue to drain
+    pause(5000);
+    
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] { "ln" });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 500 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 500 });
+  
+  }
+  
+  /**
+   * Normal happy scenario test case. But with Tx operations
+   * @throws Exception
+   */
+  public void testParallelPropagationTxOperations() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    //vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    //vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    //vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+    //    true, 100, 10, false, false, null, true });
+    //vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+    //    true, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+//    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+//        testName + "_PR", "ln", true, 1, 100, isOffHeap()  });
+//    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+//        testName + "_PR", "ln", true, 1, 100, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+//    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+//    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap()  });
+
+    //before doing any puts, let the senders be running in order to ensure that
+    //not a single event will be lost
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+//    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+//    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm4.invoke(WANTestBase.class, "doTxPuts", new Object[] { testName + "_PR",
+        1000 });
+    
+    //verify all buckets drained on all sender nodes.
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+//    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+//    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 3 });
+  }
+
+  public void disable_testParallelGatewaySenderQueueLocalSize() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    
+    /*
+     * Remember pausing sender does not guarantee that peek will be paused
+     * immediately as its quite possible event processor is already in peeking
+     * events and send them after peeking without a check for pause. hence below
+     * pause of 1 sec to allow dispatching to be paused
+     */
+//    vm4.invoke(WANTestBase.class, "waitForSenderPausedState", new Object[] { "ln" });
+//    vm5.invoke(WANTestBase.class, "waitForSenderPausedState", new Object[] { "ln" });
+    pause(1000);
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+        10 });
+    
+    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln", 10 });
+    vm5.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln", 10 });
+    
+    // instead of checking size as 5 and 5. check that combined size is 10
+    Integer localSize1 = (Integer)vm4.invoke(WANTestBase.class, "getPRQLocalSize", new Object[] { "ln"});
+    Integer localSize2 = (Integer)vm5.invoke(WANTestBase.class, "getPRQLocalSize", new Object[] { "ln"});
+    assertEquals(10,  localSize1 + localSize2);
+  }
+  
+
+
+  public void tParallelGatewaySenderQueueLocalSizeWithHA() {
+    addExpectedException("Broken pipe");
+    addExpectedException("Connection reset");
+    addExpectedException("Unexpected IOException");
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    
+    /*
+     * Remember pausing sender does not guarantee that peek will be paused
+     * immediately as its quite possible event processor is already in peeking
+     * events and send them after peeking without a check for pause. hence below
+     * pause of 1 sec to allow dispatching to be paused
+     */
+//    vm4.invoke(WANTestBase.class, "waitForSenderPausedState", new Object[] { "ln" });
+//    vm5.invoke(WANTestBase.class, "waitForSenderPausedState", new Object[] { "ln" });
+    pause(1000);
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+        10 });
+    
+    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln", 10 });
+    vm5.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln", 10 });
+    
+    Integer localSize1 = (Integer)vm4.invoke(WANTestBase.class, "getPRQLocalSize", new Object[] { "ln"});
+    Integer localSize2 = (Integer)vm5.invoke(WANTestBase.class, "getPRQLocalSize", new Object[] { "ln"});
+    assertEquals(10,  localSize1 + localSize2);
+    
+    vm5.invoke(WANTestBase.class, "killSender", new Object[] { });
+    
+    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln", 10 });
+    vm4.invoke(WANTestBase.class, "checkPRQLocalSize", new Object[] { "ln", 10 });
+    
+  }
+  
+  /**
+   * Added for defect #50364 Can't colocate region that has AEQ with a region that does not have that same AEQ
+   */
+  public void testParallelSenderAttachedToChildRegionButNotToParentRegion() {
+	Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+	  "createFirstLocatorWithDSId", new Object[] { 1 });
+	Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+	  "createFirstRemoteLocator", new Object[] { 2, lnPort });
+	    
+	//create cache and receiver on site2
+	vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+	//create cache on site1
+	vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });   
+	
+	//create sender on site1
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true });
+    
+    //start sender on site1
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    //create leader (parent) PR on site1
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "PARENT_PR", null, 0, 100, isOffHeap() });
+    String parentRegionFullPath = 
+      (String) vm3.invoke(WANTestBase.class, "getRegionFullPath", new Object[] { testName + "PARENT_PR"});
+    
+    //create colocated (child) PR on site1
+    vm3.invoke(WANTestBase.class, "createColocatedPartitionedRegion", new Object[] {
+        testName + "CHILD_PR", "ln", 0, 100, parentRegionFullPath });
+    
+    //create leader and colocated PR on site2
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "PARENT_PR", null, 0, 100, isOffHeap() });
+    vm2.invoke(WANTestBase.class, "createColocatedPartitionedRegion", new Object[] {
+        testName + "CHILD_PR", null, 0, 100, parentRegionFullPath });
+    
+    //do puts in colocated (child) PR on site1
+    vm3.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "CHILD_PR", 1000 });
+    
+    //verify the puts reach site2
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "CHILD_PR", 1000 });
+  }
+  
+  public void testParallelPropagationWithFilter_AfterAck() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm6.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm7.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm2.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true,
+        100, 10, false, false, new MyGatewayEventFilter_AfterAck(), true });
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true,
+        100, 10, false, false, new MyGatewayEventFilter_AfterAck(), true });
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true,
+        100, 10, false, false, new MyGatewayEventFilter_AfterAck(), true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true,
+        100, 10, false, false, new MyGatewayEventFilter_AfterAck(), true });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+
+    vm2.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap() });
+
+    // wait for senders to be running before doing any puts. This will ensure
+    // that
+    // not a single events is lost
+    vm2.invoke(WANTestBase.class, "waitForSenderRunningState",
+        new Object[] { "ln" });
+    vm3.invoke(WANTestBase.class, "waitForSenderRunningState",
+        new Object[] { "ln" });
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState",
+        new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState",
+        new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 1000 });
+
+    vm2.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
+        0 });
+    vm3.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
+        0 });
+    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
+        0 });
+    vm5.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
+        0 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName, 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName, 1000 });
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName, 1000 });
+    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName, 1000 });
+    
+    vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName, 1000 });
+    vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName, 1000 });
+    
+    Integer vm2Acks = (Integer)vm2.invoke(WANTestBase.class,
+        "validateAfterAck", new Object[] { "ln"});
+    Integer vm3Acks = (Integer)vm3.invoke(WANTestBase.class,
+        "validateAfterAck", new Object[] { "ln"});
+    Integer vm4Acks = (Integer)vm4.invoke(WANTestBase.class,
+        "validateAfterAck", new Object[] { "ln"});
+    Integer vm5Acks = (Integer)vm5.invoke(WANTestBase.class,
+        "validateAfterAck", new Object[] { "ln"});
+
+    assertEquals(2000, (vm2Acks + vm3Acks + vm4Acks + vm5Acks));
+        
+  } 
+}


[10/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
new file mode 100644
index 0000000..ee8b5d6
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
@@ -0,0 +1,523 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.wan.parallel;
+
+import java.io.File;
+import java.util.Properties;
+import java.util.Set;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.DiskStore;
+import com.gemstone.gemfire.cache.DiskStoreFactory;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.wan.GatewayEventFilter;
+import com.gemstone.gemfire.cache.wan.GatewaySender;
+import com.gemstone.gemfire.cache.wan.GatewaySenderFactory;
+import com.gemstone.gemfire.cache.wan.GatewayTransportFilter;
+import com.gemstone.gemfire.cache30.MyGatewayEventFilter1;
+import com.gemstone.gemfire.cache30.MyGatewayTransportFilter1;
+import com.gemstone.gemfire.cache30.MyGatewayTransportFilter2;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.internal.cache.RegionQueue;
+import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+
+import dunit.VM;
+
+/**
+ * DUnit for ParallelSenderQueue overflow operations.
+ * 
+ * @author pdeole
+ *
+ */
+public class ParallelGatewaySenderQueueOverflowDUnitTest extends WANTestBase {
+
+  private static final long serialVersionUID = 1L;
+  
+  public ParallelGatewaySenderQueueOverflowDUnitTest(String name) {
+    super(name);
+  }
+  
+  public void setUp() throws Exception {
+    super.setUp();
+  }
+  
+  public void testParallelSenderQueueEventsOverflow_NoDiskStoreSpecified() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSenderWithoutDiskStore", new Object[] { "ln", 2,
+        true, 10, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSenderWithoutDiskStore", new Object[] { "ln", 2,
+        true, 10, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSenderWithoutDiskStore", new Object[] { "ln", 2,
+        true, 10, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSenderWithoutDiskStore", new Object[] { "ln", 2,
+        true, 10, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    
+    //give some time for the senders to pause
+    pause(1000);
+    
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap() });
+
+    int numEventPuts = 50;
+    vm4.invoke(WANTestBase.class, "doHeavyPuts", new Object[] { testName, numEventPuts });
+    
+    long numOvVm4 = (Long) vm4.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
+    long numOvVm5 = (Long) vm5.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
+    long numOvVm6 = (Long) vm6.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
+    long numOvVm7 = (Long) vm7.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
+    
+    long numMemVm4 = (Long) vm4.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
+    long numMemVm5 = (Long) vm5.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
+    long numMemVm6 = (Long) vm6.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
+    long numMemVm7 = (Long) vm7.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
+    
+    getLogWriter().info("Entries overflown to disk: " + numOvVm4 + "," + numOvVm5 + "," + numOvVm6 + "," + numOvVm7);
+    getLogWriter().info("Entries in VM: " + numMemVm4 + "," + numMemVm5 + "," + numMemVm6 + "," + numMemVm7);
+    
+    long totalOverflown = numOvVm4 + numOvVm5 + numOvVm6 + numOvVm7; 
+    //considering a memory limit of 40 MB, maximum of 40 events can be in memory. Rest should be on disk.
+    assertTrue("Total number of entries overflown to disk should be at least greater than 55", (totalOverflown > 55));
+    
+    long totalInMemory = numMemVm4 + numMemVm5 + numMemVm6 + numMemVm7;
+    //expected is twice the number of events put due to redundancy level of 1  
+    assertEquals("Total number of entries on disk and in VM is incorrect", (numEventPuts*2), (totalOverflown + totalInMemory));
+    
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName, 50 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName, 50 });
+  }
+  
+  /**
+   * Keep same max memory limit for all the VMs
+   *   
+   * @throws Exception
+   */
+  public void _testParallelSenderQueueEventsOverflow() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 10, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 10, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 10, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 10, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    
+    //give some time for the senders to pause
+    pause(1000);
+    
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap() });
+
+    int numEventPuts = 50;
+    vm4.invoke(WANTestBase.class, "doHeavyPuts", new Object[] { testName, numEventPuts });
+    
+    long numOvVm4 = (Long) vm4.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
+    long numOvVm5 = (Long) vm5.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
+    long numOvVm6 = (Long) vm6.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
+    long numOvVm7 = (Long) vm7.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
+    
+    long numMemVm4 = (Long) vm4.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
+    long numMemVm5 = (Long) vm5.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
+    long numMemVm6 = (Long) vm6.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
+    long numMemVm7 = (Long) vm7.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
+    
+    getLogWriter().info("Entries overflown to disk: " + numOvVm4 + "," + numOvVm5 + "," + numOvVm6 + "," + numOvVm7);
+    getLogWriter().info("Entries in VM: " + numMemVm4 + "," + numMemVm5 + "," + numMemVm6 + "," + numMemVm7);
+    
+    long totalOverflown = numOvVm4 + numOvVm5 + numOvVm6 + numOvVm7; 
+    //considering a memory limit of 40 MB, maximum of 40 events can be in memory. Rest should be on disk.
+    assertTrue("Total number of entries overflown to disk should be at least greater than 55", (totalOverflown > 55));
+    
+    long totalInMemory = numMemVm4 + numMemVm5 + numMemVm6 + numMemVm7;
+    //expected is twice the number of events put due to redundancy level of 1  
+    assertEquals("Total number of entries on disk and in VM is incorrect", (numEventPuts*2), (totalOverflown + totalInMemory));
+    
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName, 50 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName, 50 });
+  }
+
+  /**
+   * Set a different memory limit for each VM and make sure that all the VMs are utilized to
+   * full extent of available memory.
+   * 
+   * @throws Exception
+   */
+  public void _testParallelSenderQueueEventsOverflow_2() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 10, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 5, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 5, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 20, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    
+    //give some time for the senders to pause
+    pause(1000);
+    
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap() });
+
+    int numEventPuts = 50;
+    vm4.invoke(WANTestBase.class, "doHeavyPuts", new Object[] { testName, numEventPuts });
+    
+    long numOvVm4 = (Long) vm4.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
+    long numOvVm5 = (Long) vm5.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
+    long numOvVm6 = (Long) vm6.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
+    long numOvVm7 = (Long) vm7.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
+    
+    long numMemVm4 = (Long) vm4.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
+    long numMemVm5 = (Long) vm5.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
+    long numMemVm6 = (Long) vm6.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
+    long numMemVm7 = (Long) vm7.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
+    
+    getLogWriter().info("Entries overflown to disk: " + numOvVm4 + "," + numOvVm5 + "," + numOvVm6 + "," + numOvVm7);
+    getLogWriter().info("Entries in VM: " + numMemVm4 + "," + numMemVm5 + "," + numMemVm6 + "," + numMemVm7);
+    
+    long totalOverflown = numOvVm4 + numOvVm5 + numOvVm6 + numOvVm7; 
+    //considering a memory limit of 40 MB, maximum of 40 events can be in memory. Rest should be on disk.
+    assertTrue("Total number of entries overflown to disk should be at least greater than 55", (totalOverflown > 55));
+    
+    long totalInMemory = numMemVm4 + numMemVm5 + numMemVm6 + numMemVm7;
+    //expected is twice the number of events put due to redundancy level of 1  
+    assertEquals("Total number of entries on disk and in VM is incorrect", (numEventPuts*2), (totalOverflown + totalInMemory));
+    
+    //assert the numbers for each VM
+    assertTrue("Number of entries in memory VM4 is incorrect. Should be less than 10", (numMemVm4 < 10));
+    assertTrue("Number of entries in memory VM5 is incorrect. Should be less than 5", (numMemVm5 < 5));
+    assertTrue("Number of entries in memory VM6 is incorrect. Should be less than 5", (numMemVm6 < 5));
+    assertTrue("Number of entries in memory VM7 is incorrect. Should be less than 20", (numMemVm7 < 20));
+    
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName, 50 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName, 50 });
+  }
+
+  public void _testParallelSenderQueueNoEventsOverflow() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 10, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 10, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 10, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 10, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    
+    //give some time for the senders to pause
+    pause(1000);
+    
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap() });
+
+    int numEventPuts = 15;
+    vm4.invoke(WANTestBase.class, "doHeavyPuts", new Object[] { testName, numEventPuts });
+    
+    long numOvVm4 = (Long) vm4.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
+    long numOvVm5 = (Long) vm5.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
+    long numOvVm6 = (Long) vm6.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
+    long numOvVm7 = (Long) vm7.invoke(WANTestBase.class, "getNumberOfEntriesOverflownToDisk", new Object[] { "ln" });
+    
+    long numMemVm4 = (Long) vm4.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
+    long numMemVm5 = (Long) vm5.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
+    long numMemVm6 = (Long) vm6.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
+    long numMemVm7 = (Long) vm7.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" });
+    
+    getLogWriter().info("Entries overflown to disk: " + numOvVm4 + "," + numOvVm5 + "," + numOvVm6 + "," + numOvVm7);
+    getLogWriter().info("Entries in VM: " + numMemVm4 + "," + numMemVm5 + "," + numMemVm6 + "," + numMemVm7);
+    
+    long totalOverflown = numOvVm4 + numOvVm5 + numOvVm6 + numOvVm7; 
+    //all 30 (considering redundant copies) events should accommodate in 40 MB space given to 4 senders
+    assertEquals("Total number of entries overflown to disk is incorrect", 0, totalOverflown);
+    
+    long totalInMemory = numMemVm4 + numMemVm5 + numMemVm6 + numMemVm7;
+    //expected is twice the number of events put due to redundancy level of 1  
+    assertEquals("Total number of entries on disk and in VM is incorrect", (numEventPuts*2), (totalOverflown + totalInMemory));
+    
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName, 15 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName, 15 });
+  }
+  
+  /**
+   * Test to validate that ParallelGatewaySenderQueue diskSynchronous attribute
+   * when persistence of sender is enabled. 
+   */
+  public void _test_ValidateParallelGatewaySenderQueueAttributes_1() {
+    Integer localLocPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    
+    Integer remoteLocPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, localLocPort });
+    
+    WANTestBase test = new WANTestBase(testName);
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + localLocPort + "]");
+    InternalDistributedSystem ds = test.getSystem(props);
+    cache = CacheFactory.create(ds);  
+
+    File directory = new File("TKSender" + "_disk_"
+        + System.currentTimeMillis() + "_" + VM.getCurrentVMNum());
+    directory.mkdir();
+    File[] dirs1 = new File[] { directory };
+    DiskStoreFactory dsf = cache.createDiskStoreFactory();
+    dsf.setDiskDirs(dirs1);
+    DiskStore diskStore = dsf.create("FORNY");
+    
+    GatewaySenderFactory fact = cache.createGatewaySenderFactory();
+    fact.setParallel(true);//set parallel to true
+    fact.setBatchConflationEnabled(true);
+    fact.setBatchSize(200);
+    fact.setBatchTimeInterval(300);
+    fact.setPersistenceEnabled(true);//enable the persistence
+    fact.setDiskSynchronous(true);
+    fact.setDiskStoreName("FORNY");
+    fact.setMaximumQueueMemory(200);
+    fact.setAlertThreshold(1200);
+    GatewayEventFilter myeventfilter1 = new MyGatewayEventFilter1();
+    fact.addGatewayEventFilter(myeventfilter1);
+    GatewayTransportFilter myStreamfilter1 = new MyGatewayTransportFilter1();
+    fact.addGatewayTransportFilter(myStreamfilter1);
+    GatewayTransportFilter myStreamfilter2 = new MyGatewayTransportFilter2();
+    fact.addGatewayTransportFilter(myStreamfilter2);
+    final ExpectedException exTKSender = addExpectedException("Could not connect");
+    try {
+      GatewaySender sender1 = fact.create("TKSender", 2);
+
+      AttributesFactory factory = new AttributesFactory();
+      factory.addGatewaySenderId(sender1.getId());
+      factory.setDataPolicy(DataPolicy.PERSISTENT_PARTITION);
+      Region region = cache.createRegionFactory(factory.create()).create(
+          "test_ValidateGatewaySenderAttributes");
+      Set<GatewaySender> senders = cache.getGatewaySenders();
+      assertEquals(senders.size(), 1);
+      GatewaySender gatewaySender = senders.iterator().next();
+      Set<RegionQueue> regionQueues = ((AbstractGatewaySender) gatewaySender)
+          .getQueues();
+      assertEquals(regionQueues.size(), 1);
+      RegionQueue regionQueue = regionQueues.iterator().next();
+      assertEquals(true, regionQueue.getRegion().getAttributes()
+          .isDiskSynchronous());
+    } finally {
+      exTKSender.remove();
+    }
+  }
+  
+  /**
+   * Test to validate that ParallelGatewaySenderQueue diskSynchronous attribute
+   * when persistence of sender is not enabled. 
+   */
+  public void _test_ValidateParallelGatewaySenderQueueAttributes_2() {
+    Integer localLocPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    
+    Integer remoteLocPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, localLocPort });
+    
+    WANTestBase test = new WANTestBase(testName);
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + localLocPort + "]");
+    InternalDistributedSystem ds = test.getSystem(props);
+    cache = CacheFactory.create(ds);  
+
+    GatewaySenderFactory fact = cache.createGatewaySenderFactory();
+    fact.setParallel(true);//set parallel to true
+    fact.setBatchConflationEnabled(true);
+    fact.setBatchSize(200);
+    fact.setBatchTimeInterval(300);
+    fact.setPersistenceEnabled(false);//set persistence to false
+    fact.setDiskSynchronous(true);
+    fact.setMaximumQueueMemory(200);
+    fact.setAlertThreshold(1200);
+    GatewayEventFilter myeventfilter1 = new MyGatewayEventFilter1();
+    fact.addGatewayEventFilter(myeventfilter1);
+    GatewayTransportFilter myStreamfilter1 = new MyGatewayTransportFilter1();
+    fact.addGatewayTransportFilter(myStreamfilter1);
+    GatewayTransportFilter myStreamfilter2 = new MyGatewayTransportFilter2();
+    fact.addGatewayTransportFilter(myStreamfilter2);
+    final ExpectedException ex = addExpectedException("Could not connect");
+    try {
+      GatewaySender sender1 = fact.create("TKSender", 2);
+      AttributesFactory factory = new AttributesFactory();
+      factory.addGatewaySenderId(sender1.getId());
+      factory.setDataPolicy(DataPolicy.PARTITION);
+      Region region = cache.createRegionFactory(factory.create()).create(
+          "test_ValidateGatewaySenderAttributes");
+      Set<GatewaySender> senders = cache.getGatewaySenders();
+      assertEquals(senders.size(), 1);
+      GatewaySender gatewaySender = senders.iterator().next();
+      Set<RegionQueue> regionQueues = ((AbstractGatewaySender) gatewaySender)
+          .getQueues();
+      assertEquals(regionQueues.size(), 1);
+      RegionQueue regionQueue = regionQueues.iterator().next();
+      assertEquals(false, regionQueue.getRegion().getAttributes()
+          .isDiskSynchronous());
+    } finally {
+      ex.remove();
+    }
+  }
+
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
new file mode 100644
index 0000000..79a34c8
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
@@ -0,0 +1,791 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+/**
+ * 
+ */
+package com.gemstone.gemfire.internal.cache.wan.parallel;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+
+/**
+ * @author skumar
+ * 
+ */
+public class ParallelWANConflationDUnitTest extends WANTestBase {
+  private static final long serialVersionUID = 1L;
+
+  public ParallelWANConflationDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+    addExpectedException("java.net.ConnectException");
+  }
+
+  public void testParallelPropagationConflationDisabled() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true  });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true  });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true  });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    pause(3000);
+
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap() });
+
+    pause(2000);
+    
+    final Map keyValues = new HashMap();
+    final Map updateKeyValues = new HashMap();
+    for(int i=0; i< 1000; i++) {
+      keyValues.put(i, i);
+    }
+    
+    
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, keyValues });
+
+    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() });
+    for(int i=0;i<500;i++) {
+      updateKeyValues.put(i, i+"_updated");
+    }
+    
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues });
+
+    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", (keyValues.size() + updateKeyValues.size()) });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 0 });
+
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+
+    keyValues.putAll(updateKeyValues);
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, keyValues.size() });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName, keyValues.size() });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
+        testName, keyValues });
+    vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
+        testName, keyValues });
+    
+  }
+
+  /**
+   * This test is desabled as it is not guaranteed to pass it everytime. This
+   * test is related to the conflation in batch. yet did find any way to
+   * ascertain that the vents in the batch will always be conflated.
+   * 
+   * @throws Exception
+   */
+  public void testParallelPropagationBatchConflation() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 50, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 50, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 50, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+    true, 100, 50, false, false, null, true });
+  
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap() });
+    
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap() });
+
+    final Map keyValues = new HashMap();
+    
+    for (int i = 1; i <= 100; i++) {
+      for (int j = 1; j <= 10; j++) {
+        keyValues.put(j, i) ;
+      }
+      vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] {
+        testName, keyValues });
+    }
+    
+    vm4.invoke(WANTestBase.class, "enableConflation", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "enableConflation", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "enableConflation", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "enableConflation", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    
+    pause(2000);
+    ArrayList<Integer> v4List = (ArrayList<Integer>)vm4.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
+    ArrayList<Integer> v5List = (ArrayList<Integer>)vm5.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
+    ArrayList<Integer> v6List = (ArrayList<Integer>)vm6.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
+    ArrayList<Integer> v7List = (ArrayList<Integer>)vm7.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
+    
+    getLogWriter().info("KBKBKB: batch conflated events : vm4 : " + v4List.get(8));
+    getLogWriter().info("KBKBKB: batch conflated events : vm5 : " + v5List.get(8));
+    getLogWriter().info("KBKBKB: batch conflated events : vm6 : " + v6List.get(8));
+    getLogWriter().info("KBKBKB: batch conflated events : vm7 : " + v7List.get(8));
+    getLogWriter().info("KBKBKB: batch conflated events : " + (v4List.get(8) + v5List.get(8) + v6List.get(8) + v7List.get(8)));
+    assertTrue("No events conflated in batch", (v4List.get(8) + v5List.get(8) + v6List.get(8) + v7List.get(8)) > 0);
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName, 10 });
+
+  }
+  
+  public void testParallelPropagationConflation() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, true, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, true, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, true, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, true, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    pause(3000);
+
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap() });
+
+    pause(2000);
+    
+    final Map keyValues = new HashMap();
+    final Map updateKeyValues = new HashMap();
+    for(int i=0; i< 1000; i++) {
+      keyValues.put(i, i);
+    }
+    
+    
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, keyValues });
+
+    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() });
+    for(int i=0;i<500;i++) {
+      updateKeyValues.put(i, i+"_updated");
+    }
+    
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues });
+
+    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() + updateKeyValues.size() }); // creates aren't conflated
+    
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues });
+
+    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() + updateKeyValues.size() }); // creates aren't conflated
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 0 });
+
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+
+    keyValues.putAll(updateKeyValues);
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, keyValues.size() });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName, keyValues.size() });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
+        testName, keyValues });
+    vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
+        testName, keyValues });
+  }
+  
+
+  /**
+   * Reproduce the bug #47213.
+   * The test is same as above test, with the only difference that 
+   * redundancy is set to 1.
+   * @throws Exception
+   */
+  public void testParallelPropagationConflation_Bug47213() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, true, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, true, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, true, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, true, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 2, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 2, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 2, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 2, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    pause(3000);
+
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap() });
+
+    pause(2000);//give some time for all the senders to pause
+    
+    final Map keyValues = new HashMap();
+    final Map updateKeyValues = new HashMap();
+    for(int i=0; i< 1000; i++) {
+      keyValues.put(i, i);
+    }
+    
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, keyValues });
+
+    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() });
+    for(int i=0;i<500;i++) {
+      updateKeyValues.put(i, i+"_updated");
+    }
+    
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues });
+
+    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() + updateKeyValues.size() }); // creates aren't conflated
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 0 });
+
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+
+    keyValues.putAll(updateKeyValues);
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, keyValues.size() });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName, keyValues.size() });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
+        testName, keyValues });
+    vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
+        testName, keyValues });
+  }
+  
+  public void testParallelPropagationConflationOfRandomKeys() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, true, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, true, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, true, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, true, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    pause(3000);
+
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap() });
+
+    pause(2000);
+
+    final Map keyValues = new HashMap();
+    final Map updateKeyValues = new HashMap();
+    for(int i=0; i< 1000; i++) {
+      keyValues.put(i, i);
+    }
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, keyValues });
+
+    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() });
+    
+    while(updateKeyValues.size()!=500) {
+      int key = (new Random()).nextInt(keyValues.size());
+      updateKeyValues.put(key, key+"_updated");
+    }
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues });
+
+    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() + updateKeyValues.size() });
+
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues });
+
+    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() + updateKeyValues.size() });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 0 });
+
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+
+    
+    keyValues.putAll(updateKeyValues);
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, keyValues.size() });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName, keyValues.size() });
+    vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
+      testName, keyValues });
+    vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
+      testName, keyValues });
+    
+  }
+  
+  public void testParallelPropagationColocatedRegionConflation()
+      throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, true, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, true, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, true, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, true, false, null, true });
+
+    vm4.invoke(WANTestBase.class,
+        "createCustomerOrderShipmentPartitionedRegion", new Object[] {
+            testName, "ln", 0, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class,
+        "createCustomerOrderShipmentPartitionedRegion", new Object[] {
+            testName, "ln", 0, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class,
+        "createCustomerOrderShipmentPartitionedRegion", new Object[] {
+            testName, "ln", 0, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class,
+        "createCustomerOrderShipmentPartitionedRegion", new Object[] {
+            testName, "ln", 0, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    pause(3000);
+
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class,
+        "createCustomerOrderShipmentPartitionedRegion", new Object[] {
+            testName, null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class,
+        "createCustomerOrderShipmentPartitionedRegion", new Object[] {
+            testName, null, 1, 100, isOffHeap() });
+
+    pause(2000);
+
+    Map custKeyValues = (Map)vm4.invoke(WANTestBase.class, "putCustomerPartitionedRegion",
+        new Object[] { 1000 });
+    Map orderKeyValues = (Map)vm4.invoke(WANTestBase.class, "putOrderPartitionedRegion",
+        new Object[] { 1000 });
+    Map shipmentKeyValues = (Map)vm4.invoke(WANTestBase.class, "putShipmentPartitionedRegion",
+        new Object[] { 1000 });
+
+    vm4.invoke(
+        WANTestBase.class,
+        "checkQueueSize",
+        new Object[] {
+            "ln",
+            (custKeyValues.size() + orderKeyValues.size() + shipmentKeyValues
+                .size()) });
+
+    Map updatedCustKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateCustomerPartitionedRegion",
+        new Object[] { 500 });
+    Map updatedOrderKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateOrderPartitionedRegion",
+        new Object[] { 500 });
+    Map updatedShipmentKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateShipmentPartitionedRegion",
+        new Object[] { 500 });
+
+    vm4.invoke(
+        WANTestBase.class,
+        "checkQueueSize",
+        new Object[] {
+            "ln",
+            (custKeyValues.size() + orderKeyValues.size() + shipmentKeyValues
+                .size())
+                + updatedCustKeyValues.size()
+                + updatedOrderKeyValues.size()
+                + updatedShipmentKeyValues.size() });
+
+    updatedCustKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateCustomerPartitionedRegion",
+        new Object[] { 500 });
+    updatedOrderKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateOrderPartitionedRegion",
+        new Object[] { 500 });
+    updatedShipmentKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateShipmentPartitionedRegion",
+        new Object[] { 500 });
+
+    vm4.invoke(
+        WANTestBase.class,
+        "checkQueueSize",
+        new Object[] {
+            "ln",
+            (custKeyValues.size() + orderKeyValues.size() + shipmentKeyValues
+                .size())
+                + updatedCustKeyValues.size()
+                + updatedOrderKeyValues.size()
+                + updatedShipmentKeyValues.size() });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        WANTestBase.customerRegionName, 0 });
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        WANTestBase.orderRegionName, 0 });
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        WANTestBase.shipmentRegionName, 0 });
+
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    
+    custKeyValues.putAll(updatedCustKeyValues);
+    orderKeyValues.putAll(updatedOrderKeyValues);
+    shipmentKeyValues.putAll(updatedShipmentKeyValues);
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        WANTestBase.customerRegionName, custKeyValues.size() });
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        WANTestBase.orderRegionName, orderKeyValues.size() });
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        WANTestBase.shipmentRegionName, shipmentKeyValues.size() });
+
+    vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
+        WANTestBase.customerRegionName, custKeyValues });
+    vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
+        WANTestBase.orderRegionName, orderKeyValues });
+    vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
+        WANTestBase.shipmentRegionName, shipmentKeyValues });
+    
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        WANTestBase.customerRegionName, custKeyValues.size() });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        WANTestBase.orderRegionName, orderKeyValues.size() });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        WANTestBase.shipmentRegionName, shipmentKeyValues.size() });
+
+    vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
+        WANTestBase.customerRegionName, custKeyValues });
+    vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
+        WANTestBase.orderRegionName, orderKeyValues });
+    vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
+        WANTestBase.shipmentRegionName, shipmentKeyValues });
+    
+  }
+  
+  public void testParallelPropagationColoatedRegionConflationSameKey()
+      throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, true, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, true, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, true, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, true, false, null, true });
+
+    vm4.invoke(WANTestBase.class,
+        "createCustomerOrderShipmentPartitionedRegion", new Object[] {
+            testName, "ln", 0, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class,
+        "createCustomerOrderShipmentPartitionedRegion", new Object[] {
+            testName, "ln", 0, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class,
+        "createCustomerOrderShipmentPartitionedRegion", new Object[] {
+            testName, "ln", 0, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class,
+        "createCustomerOrderShipmentPartitionedRegion", new Object[] {
+            testName, "ln", 0, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    pause(3000);
+
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class,
+        "createCustomerOrderShipmentPartitionedRegion", new Object[] {
+            testName, null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class,
+        "createCustomerOrderShipmentPartitionedRegion", new Object[] {
+            testName, null, 1, 100, isOffHeap() });
+
+    pause(2000);
+
+    Map custKeyValues = (Map)vm4.invoke(WANTestBase.class, "putCustomerPartitionedRegion",
+        new Object[] { 1000 });
+    Map orderKeyValues = (Map)vm4.invoke(WANTestBase.class, "putOrderPartitionedRegionUsingCustId",
+        new Object[] { 1000 });
+    Map shipmentKeyValues = (Map)vm4.invoke(WANTestBase.class, "putShipmentPartitionedRegionUsingCustId",
+        new Object[] { 1000 });
+
+    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", (custKeyValues.size() + orderKeyValues.size() + shipmentKeyValues
+      .size()) });
+
+    Map updatedCustKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateCustomerPartitionedRegion",
+        new Object[] { 500 });
+    Map updatedOrderKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateOrderPartitionedRegionUsingCustId",
+        new Object[] { 500 });
+    Map updatedShipmentKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateShipmentPartitionedRegionUsingCustId",
+        new Object[] { 500 });
+
+    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", (custKeyValues.size() + orderKeyValues.size() + shipmentKeyValues
+        .size()) + updatedCustKeyValues.size() + updatedOrderKeyValues.size() + updatedShipmentKeyValues.size() });
+
+    updatedCustKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateCustomerPartitionedRegion",
+        new Object[] { 500 });
+    updatedOrderKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateOrderPartitionedRegionUsingCustId",
+        new Object[] { 500 });
+    updatedShipmentKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateShipmentPartitionedRegionUsingCustId",
+        new Object[] { 500 });
+
+    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", (custKeyValues.size() + orderKeyValues.size() + shipmentKeyValues
+        .size()) + updatedCustKeyValues.size() + updatedOrderKeyValues.size() + updatedShipmentKeyValues.size() });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        WANTestBase.customerRegionName, 0 });
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        WANTestBase.orderRegionName, 0 });
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        WANTestBase.shipmentRegionName, 0 });
+
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+
+    custKeyValues.putAll(updatedCustKeyValues);
+    orderKeyValues.putAll(updatedOrderKeyValues);
+    shipmentKeyValues.putAll(updatedShipmentKeyValues);
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        WANTestBase.customerRegionName, custKeyValues.size() });
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        WANTestBase.orderRegionName, orderKeyValues.size() });
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        WANTestBase.shipmentRegionName, shipmentKeyValues.size() });
+
+    vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
+        WANTestBase.customerRegionName, custKeyValues });
+    vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
+        WANTestBase.orderRegionName, orderKeyValues });
+    vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
+        WANTestBase.shipmentRegionName, shipmentKeyValues });
+
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        WANTestBase.customerRegionName, custKeyValues.size() });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        WANTestBase.orderRegionName, orderKeyValues.size() });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        WANTestBase.shipmentRegionName, shipmentKeyValues.size() });
+
+    vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
+        WANTestBase.customerRegionName, custKeyValues });
+    vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
+        WANTestBase.orderRegionName, orderKeyValues });
+    vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
+        WANTestBase.shipmentRegionName, shipmentKeyValues });
+  }
+  
+}


[36/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
new file mode 100644
index 0000000..92f2817
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
@@ -0,0 +1,1292 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.query.dunit;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Properties;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.DiskStore;
+import com.gemstone.gemfire.cache.DiskStoreFactory;
+import com.gemstone.gemfire.cache.EvictionAction;
+import com.gemstone.gemfire.cache.EvictionAttributes;
+import com.gemstone.gemfire.cache.PartitionAttributesFactory;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.client.Pool;
+import com.gemstone.gemfire.cache.client.PoolFactory;
+import com.gemstone.gemfire.cache.client.PoolManager;
+import com.gemstone.gemfire.cache.query.IndexType;
+import com.gemstone.gemfire.cache.query.Query;
+import com.gemstone.gemfire.cache.query.QueryExecutionTimeoutException;
+import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.cache.query.cq.dunit.CqQueryDUnitTest;
+import com.gemstone.gemfire.cache.query.data.Portfolio;
+import com.gemstone.gemfire.cache.query.internal.DefaultQuery;
+import com.gemstone.gemfire.cache.query.internal.QueryMonitor;
+import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
+import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.cache30.CacheTestCase;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+
+import dunit.AsyncInvocation;
+import dunit.DistributedTestCase;
+import dunit.Host;
+import dunit.SerializableRunnable;
+import dunit.VM;
+
+/**
+ * Tests for QueryMonitoring service.
+ * @author agingade
+ * @since 6.0
+ */
+public class QueryMonitorDUnitTest extends CacheTestCase {
+
+  private static int bridgeServerPort;
+
+  private final String exampleRegionName = "exampleRegion";
+  private final String exampleRegionName2 = "exampleRegion2";
+  private final String poolName = "serverConnectionPool";
+  
+  /* Some of the queries are commented out as they were taking less time */
+  String[]  queryStr = {
+      "SELECT ID FROM /root/exampleRegion p WHERE  p.ID > 100",
+      //"SELECT DISTINCT * FROM /root/exampleRegion x, x.positions.values WHERE  x.pk != '1000'",
+      //"SELECT DISTINCT * FROM /root/exampleRegion x, x.positions.values WHERE  x.pkid != '1'",
+      //"SELECT DISTINCT * FROM /root/exampleRegion p, p.positions.values WHERE  p.pk > '1'",
+      //"SELECT DISTINCT * FROM /root/exampleRegion p, p.positions.values WHERE  p.pkid != '53'",
+      //"SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos WHERE  pos.Id > 100",
+      //"SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos WHERE  pos.Id > 100 and pos.secId IN SET('YHOO', 'IBM', 'AMZN')",
+      //"SELECT * FROM /root/exampleRegion p WHERE  p.ID > 100 and p.status = 'active' and p.ID < 100000",
+      "SELECT * FROM /root/exampleRegion WHERE  ID > 100 and status = 'active'",
+      //"SELECT DISTINCT * FROM /root/exampleRegion p WHERE  p.ID > 100 and p.status = 'active' and p.ID < 100000",
+      //"SELECT DISTINCT ID FROM /root/exampleRegion WHERE  status = 'active'",
+      //"SELECT DISTINCT ID FROM /root/exampleRegion p WHERE  p.status = 'active'",
+      //"SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos WHERE  pos.secId IN SET('YHOO', 'IBM', 'AMZN')",
+      //"SELECT DISTINCT proj1:p, proj2:itrX FROM /root/exampleRegion p, (SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos"
+      //+ " WHERE  pos.secId = 'YHOO') as itrX",
+      //"SELECT DISTINCT * FROM /root/exampleRegion p, (SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos"
+      //+ " WHERE  pos.secId = 'YHOO') as itrX",
+      //"SELECT DISTINCT * FROM /root/exampleRegion p, (SELECT DISTINCT p.ID FROM /root/exampleRegion x"
+      //+ " WHERE  x.ID = p.ID) as itrX",
+      "SELECT DISTINCT * FROM /root/exampleRegion p, (SELECT DISTINCT pos FROM /root/exampleRegion x, x.positions.values pos"
+      + " WHERE  x.ID = p.ID) as itrX",
+      //"SELECT DISTINCT x.ID FROM /root/exampleRegion x, x.positions.values v WHERE  "
+      //+ "v.secId = element(SELECT DISTINCT vals.secId FROM /root/exampleRegion p, p.positions.values vals WHERE  vals.secId = 'YHOO')",
+      "SELECT DISTINCT * FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.status = 'active'",
+      //"SELECT DISTINCT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID",
+      "SELECT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID and p.status = 'active' and p2.status = 'active'",
+      //"SELECT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID and p.status = 'active' and p.status = p2.status",
+      "SELECT DISTINCT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID and p.ID > 100 and p2.ID < 100000",
+      //"SELECT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID and p.ID > 100 and p2.ID < 100000 or p.status = p2.status",
+      "SELECT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID and p.ID > 100 and p2.ID < 100000 or p.status = 'active'",
+      //"SELECT DISTINCT * FROM /root/exampleRegion p, positions.values pos WHERE   (p.ID > 1 or p.status = 'active') or (true AND pos.secId ='IBM')", 
+      //"SELECT DISTINCT * FROM /root/exampleRegion p, positions.values pos WHERE   (p.ID > 1 or p.status = 'active') or (true AND pos.secId !='IBM')",
+      //"SELECT DISTINCT structset.sos, structset.key " 
+      //+ "FROM /root/exampleRegion p, p.positions.values outerPos, " 
+      //+ "(SELECT DISTINCT key: key, sos: pos.sharesOutstanding "
+      //+ "FROM /root/exampleRegion.entries pf, pf.value.positions.values pos "
+      //+ "where outerPos.secId != 'IBM' AND "
+      //+ "pf.key IN (SELECT DISTINCT * FROM pf.value.collectionHolderMap['0'].arr)) structset "
+      //+ "where structset.sos > 2000",
+      "SELECT DISTINCT * "
+      + "FROM /root/exampleRegion p, p.positions.values outerPos, "
+      + "(SELECT DISTINCT key: key, sos: pos.sharesOutstanding "
+      + "FROM /root/exampleRegion.entries pf, pf.value.positions.values pos "
+      + "where outerPos.secId != 'IBM' AND " 
+      + "pf.key IN (SELECT DISTINCT * FROM pf.value.collectionHolderMap['0'].arr)) structset "
+      + "where structset.sos > 2000",
+      //"SELECT DISTINCT * FROM /root/exampleRegion p, p.positions.values position "
+      //+ "WHERE (true = null OR position.secId = 'SUN') AND true", 
+  };
+
+  String[]  prQueryStr = {
+      "SELECT ID FROM /root/exampleRegion p WHERE  p.ID > 100 and p.status = 'active'",
+      "SELECT * FROM /root/exampleRegion WHERE  ID > 100 and status = 'active'",
+      "SELECT DISTINCT * FROM /root/exampleRegion p WHERE   p.ID > 100 and p.status = 'active' and p.ID < 100000",
+      "SELECT DISTINCT p.ID FROM /root/exampleRegion p WHERE p.ID > 100 and p.ID < 100000 and p.status = 'active'",
+      "SELECT DISTINCT * FROM /root/exampleRegion p, positions.values pos WHERE (p.ID > 1 or p.status = 'active') or (pos.secId != 'IBM')", 
+  };
+  
+  private int numServers;
+
+  public QueryMonitorDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setup(int numServers) throws Exception {
+    super.setUp();
+    Host host = Host.getHost(0);
+    this.numServers = numServers;
+    
+    // avoid IllegalStateException from HandShake by connecting all vms tor
+    // system before creating connection pools
+    getSystem();
+    
+    SerializableRunnable r = new SerializableRunnable("getSystem") {
+      public void run() {
+        getSystem();
+      }
+    };
+    
+    for (int i=0; i<numServers; i++) {
+      host.getVM(i).invoke(r);
+    }
+    
+    r = new SerializableRunnable("getClientSystem") {
+      public void run() {
+        Properties props = getAllDistributedSystemProperties(new Properties());
+        props.put(DistributionConfigImpl.LOCATORS_NAME, "");
+        getSystem(props);
+      }
+    };
+    
+    for (int i=numServers; i<4; i++) {
+      host.getVM(i).invoke(r);
+    }
+  }
+  
+  @Override
+  public void tearDown2() throws Exception {
+    Host host = Host.getHost(0);
+    disconnectFromDS();
+    // shut down clients before servers
+    for (int i=numServers; i<4; i++) {
+      host.getVM(i).invoke(CacheTestCase.class, "disconnectFromDS");
+    }
+    super.tearDown2();
+  }
+  
+  public void createRegion(VM vm){
+    createRegion(vm, false, null);
+  }
+
+  public void createRegion(VM vm, final boolean eviction, final String dirName){
+    vm.invoke(new CacheSerializableRunnable("Create Regions") {
+      public void run2() throws CacheException {
+        AttributesFactory factory = new AttributesFactory();
+        factory.setScope(Scope.LOCAL);
+        factory.setDataPolicy(DataPolicy.REPLICATE);
+        // setting the eviction attributes.
+        if (eviction) {
+          File []f = new File[1];            
+          f[0] = new File(dirName);
+          f[0].mkdir();
+          DiskStoreFactory dsf = GemFireCacheImpl.getInstance().createDiskStoreFactory();
+          DiskStore ds1 = dsf.setDiskDirs(f).create("ds1");
+          factory.setDiskStoreName("ds1");
+          EvictionAttributes evictAttrs = EvictionAttributes
+            .createLRUEntryAttributes(100, EvictionAction.OVERFLOW_TO_DISK);
+          factory.setEvictionAttributes(evictAttrs);
+        }
+        // Create region
+        createRegion(exampleRegionName, factory.create());
+        createRegion(exampleRegionName2, factory.create());
+      }
+    });
+  }
+
+  public void createPRRegion(VM vm){
+    vm.invoke(new CacheSerializableRunnable("Create Regions") {
+      public void run2() throws CacheException {
+        AttributesFactory factory = new AttributesFactory();
+        //factory.setDataPolicy(DataPolicy.PARTITION);
+        factory.setPartitionAttributes((new PartitionAttributesFactory()).setTotalNumBuckets(8).create());
+        
+        createRegion(exampleRegionName, factory.create());
+        createRegion(exampleRegionName2, factory.create());
+        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
+        exampleRegion.getCache().getLogger().fine("#### CREATING PR REGION....");
+      }
+    });
+  }
+
+  public void configServer(VM server, final int queryMonitorTime, final String testName){
+    SerializableRunnable initServer = new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        try {
+          startBridgeServer(0, false);
+        } catch (Exception ex) {
+          fail("While starting CacheServer", ex);
+        }
+        pause(1000);
+        Cache cache = getCache();
+        GemFireCacheImpl.getInstance().TEST_MAX_QUERY_EXECUTION_TIME = queryMonitorTime;
+        cache.getLogger().fine("#### RUNNING TEST : " + testName);
+        DefaultQuery.testHook = new QueryTimeoutHook(queryMonitorTime);
+        //((GemFireCache)cache).TEST_MAX_QUERY_EXECUTION_TIME = queryMonitorTime;
+        System.out.println("MAX_QUERY_EXECUTION_TIME is set to: " + ((GemFireCacheImpl)cache).TEST_MAX_QUERY_EXECUTION_TIME);
+      }
+    };
+    server.invoke(initServer);
+  }
+
+  // Stop server
+  public void stopServer(VM server){
+    SerializableRunnable stopServer = new SerializableRunnable("Stop CacheServer") {      
+      public void run() {
+        // Reset the test flag.
+        Cache cache = getCache();
+        DefaultQuery.testHook = null;
+        GemFireCacheImpl.getInstance().TEST_MAX_QUERY_EXECUTION_TIME = -1;
+        stopBridgeServer(getCache());
+        System.out.println("MAX_QUERY_EXECUTION_TIME is set to: " + ((GemFireCacheImpl)cache).TEST_MAX_QUERY_EXECUTION_TIME);
+      }
+    };
+    server.invoke(stopServer);
+  }
+  
+  public void configClient(VM client, VM[] server){
+    final int[] port = new int[server.length];
+    for (int i=0; i < server.length; i++){
+      port[i] = server[i].invokeInt(QueryMonitorDUnitTest.class, "getCacheServerPort");
+    }
+    final String host0 = getServerHostName(server[0].getHost());
+
+    SerializableRunnable initClient = new CacheSerializableRunnable("Init client") {
+      public void run2() throws CacheException {
+        AttributesFactory factory = new AttributesFactory();
+        factory.setScope(Scope.LOCAL);
+        PoolFactory poolFactory = PoolManager.createFactory();
+        poolFactory.setReadTimeout(10 * 60 * 1000); // 10 mins.
+        ClientServerTestCase.configureConnectionPoolWithNameAndFactory(factory, host0, port, true, -1, -1, null, poolName, poolFactory);
+      }
+    };
+    client.invoke(initClient);    
+  }
+  
+  public void verifyException(Exception e) {
+    e.printStackTrace();
+    String error = e.getMessage();
+    if (e.getCause() != null) {
+      error = e.getCause().getMessage();
+    }
+    
+    if (error.contains("Query execution cancelled after exceeding max execution time") ||
+        error.contains("The Query completed sucessfully before it got canceled") ||
+        error.contains("The QueryMonitor thread may be sleeping longer than the set sleep time") ||
+        error.contains("The query task could not be found but the query is marked as having been canceled")){
+      // Expected exception.
+      return;      
+    }
+
+    System.out.println("Unexpected exception:");
+    if (e.getCause() != null) {
+      e.getCause().printStackTrace();
+    } else {
+      e.printStackTrace();
+    }
+    
+    fail("Expected exception Not found. Expected exception with message: \n" +
+        "\"Query execution taking more than the max execution time\"" + "\n Found \n" +
+        error);    
+  }
+  
+  /**
+   * Tests query execution from client to server (single server).
+   */
+  public void testQueryMonitorClientServer() throws Exception {
+
+    setup(1);
+    
+    final Host host = Host.getHost(0);
+    
+    VM server = host.getVM(0);
+    VM client1 = host.getVM(1);
+    VM client2 = host.getVM(2);
+    VM client3 = host.getVM(3);
+
+    final int numberOfEntries = 800;
+
+    // Start server
+    configServer(server, 40, "testQueryMonitorClientServer"); // All the queries taking more than 40ms should be canceled by Query monitor.
+    createRegion(server);
+    
+    // Initialize server regions.
+    server.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
+        Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
+        for (int i= (1 + 100); i <= (numberOfEntries + 100); i++) {
+          exampleRegion.put(""+i, new Portfolio(i));
+        }
+        for (int i= (1 + 100); i <= 200; i++) {
+          exampleRegion2.put(""+i, new Portfolio(i));
+        }
+      }
+    });
+
+    // Initialize Client1 and create client regions.
+    configClient(client1, new VM[] {server});
+    createRegion(client1);
+    
+    // Initialize Client2 and create client regions.
+    configClient(client2, new VM[] {server});
+    createRegion(client2);
+    
+    // Initialize Client3 and create client regions.
+    configClient(client3, new VM[] {server});
+    createRegion(client3);
+
+    // Execute client queries
+    SerializableRunnable executeQuery = new CacheSerializableRunnable("Execute queries") {
+      public void run2() throws CacheException {
+        try {
+          Pool pool = PoolManager.find(poolName);
+          QueryService queryService = pool.getQueryService();
+          for (int k=0; k < queryStr.length; k++) {
+            String qStr = queryStr[k];
+            try {
+              GemFireCacheImpl.getInstance().getLogger().fine("Executing query :" + qStr);
+              Query query = queryService.newQuery(qStr);
+              query.execute();
+              fail("The query should have been canceled by the QueryMonitor. Query: " + qStr);
+            }catch (Exception e){
+              verifyException(e);
+            }
+          }
+        } catch (Exception ex){
+          GemFireCacheImpl.getInstance().getLogger().fine("Exception creating the query service", ex);
+        }
+      }
+    };
+
+    client1.invoke(executeQuery);
+    client2.invoke(executeQuery);
+    client3.invoke(executeQuery);
+
+    stopServer(server);
+  }
+
+  /**
+   * Tests query execution from client to server (multi server).
+   */
+  public void testQueryMonitorMultiClientMultiServer() throws Exception {
+
+    setup(2);
+    
+    final Host host = Host.getHost(0);
+    
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client1 = host.getVM(2);
+    VM client2 = host.getVM(3);
+
+    final int numberOfEntries = 800;
+
+    // Start server
+    configServer(server1, 40, "testQueryMonitorMultiClientMultiServer"); // All the queries taking more than 40ms should be canceled by Query monitor.
+    createRegion(server1);
+
+    configServer(server2, 40, "testQueryMonitorMultiClientMultiServer"); // All the queries taking more than 40ms should be canceled by Query monitor.
+    createRegion(server2);
+
+    // Initialize server regions.
+    server1.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
+        Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
+        for (int i= (1 + 100); i <= (numberOfEntries + 100); i++) {
+          exampleRegion.put(""+i, new Portfolio(i));
+        }
+        for (int i= (1 + 100); i <= 200; i++) {
+          exampleRegion2.put(""+i, new Portfolio(i));
+        }
+      }
+    });
+
+    // Initialize server regions.
+    server2.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
+        Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
+        for (int i= (1 + 100); i <= (numberOfEntries + 100); i++) {
+          exampleRegion.put(""+i, new Portfolio(i));
+        }
+        for (int i= (1 + 100); i <= 200; i++) {
+          exampleRegion2.put(""+i, new Portfolio(i));
+        }
+      }
+    });
+
+    // Initialize Client1 and create client regions.
+    configClient(client1, new VM[] {server1, server2});
+    createRegion(client1);
+    
+    // Initialize Client2 and create client regions.
+    configClient(client2, new VM[] {server1, server2});
+    createRegion(client2);
+    
+    // Execute client queries
+    SerializableRunnable executeQuery = new CacheSerializableRunnable("Execute queries") {
+      public void run2() throws CacheException {
+        try {
+          Pool pool = PoolManager.find(poolName);
+          QueryService queryService = pool.getQueryService();
+          for (int k=0; k < queryStr.length; k++) {
+            String qStr = queryStr[k];
+            try {
+              GemFireCacheImpl.getInstance().getLogger().fine("Executing query :" + qStr);
+              Query query = queryService.newQuery(qStr);
+              query.execute();
+              fail("The query should have been canceled by the QueryMonitor. Query: " + qStr);
+            }catch (Exception e){
+              verifyException(e);            
+            }
+          }
+        } catch (Exception ex){
+          GemFireCacheImpl.getInstance().getLogger().fine("Exception creating the query service", ex);
+        }
+      }
+    };
+
+    client1.invoke(executeQuery);
+    client2.invoke(executeQuery);
+
+    stopServer(server1);
+    stopServer(server2);
+  }
+
+  /**
+   * Tests query execution on local vm.
+   */
+  public void testQueryExecutionLocally() throws Exception {
+
+    setup(2);
+    
+    final Host host = Host.getHost(0);
+    
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+
+    final int numberOfEntries = 800;
+
+    // Start server
+    configServer(server1, 40, "testQueryExecutionLocally"); // All the queries taking more than 40ms should be canceled by Query monitor.
+    createRegion(server1);
+
+    configServer(server2, 40, "testQueryExecutionLocally"); // All the queries taking more than 40ms should be canceled by Query monitor.
+    createRegion(server2);
+
+    // Initialize server regions.
+    server1.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
+        Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
+        for (int i= (1 + 100); i <= (numberOfEntries + 100); i++) {
+          exampleRegion.put(""+i, new Portfolio(i));
+        }
+        for (int i= (1 + 100); i <= 200; i++) {
+          exampleRegion2.put(""+i, new Portfolio(i));
+        }
+      }
+    });
+
+    // Initialize server regions.
+    server2.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
+        Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
+        for (int i= (1 + 100); i <= (numberOfEntries + 100); i++) {
+          exampleRegion.put(""+i, new Portfolio(i));
+        }
+        for (int i= (1 + 100); i <= 200; i++) {
+          exampleRegion2.put(""+i, new Portfolio(i));
+        }
+      }
+    });
+
+    // Execute server queries
+    SerializableRunnable executeQuery = new CacheSerializableRunnable("Execute queries") {
+      public void run2() throws CacheException {
+        try {
+          QueryService queryService = GemFireCacheImpl.getInstance().getQueryService();
+          for (int k=0; k < queryStr.length; k++) {
+            String qStr = queryStr[k];
+            try {
+              GemFireCacheImpl.getInstance().getLogger().fine("Executing query :" + qStr);
+              Query query = queryService.newQuery(qStr);
+              query.execute();
+              fail("The query should have been canceled by the QueryMonitor. Query: " + qStr);
+            }catch (Exception e){
+              verifyException(e);
+            }
+          }
+        } catch (Exception ex){
+          GemFireCacheImpl.getInstance().getLogger().fine("Exception creating the query service", ex);
+        }
+      }
+    };
+
+    server1.invoke(executeQuery);
+    server2.invoke(executeQuery);
+
+    stopServer(server1);
+    stopServer(server2);
+  }
+
+  /**
+   * Tests query execution on local vm.
+   */
+  public void testQueryExecutionLocallyAndCacheOp() throws Exception {
+
+    setup(2);
+    
+    final Host host = Host.getHost(0);
+    
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+
+    final int numberOfEntries = 8000;
+
+    // Start server
+    configServer(server1, 40, "testQueryExecutionLocally"); // All the queries taking more than 40ms should be canceled by Query monitor.
+    createRegion(server1);
+
+    configServer(server2, 40, "testQueryExecutionLocally"); // All the queries taking more than 40ms should be canceled by Query monitor.
+    createRegion(server2);
+
+    // Initialize server regions.
+    server1.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
+        Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
+        for (int i= (1 + 100); i <= (numberOfEntries + 100); i++) {
+          exampleRegion.put(""+i, new Portfolio(i));
+        }
+        for (int i= (1 + 100); i <= 200; i++) {
+          exampleRegion2.put(""+i, new Portfolio(i));
+        }
+      }
+    });
+
+    // Initialize server regions.
+    server2.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
+        Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
+        for (int i= (1 + 100); i <= (numberOfEntries + 100); i++) {
+          exampleRegion.put(""+i, new Portfolio(i));
+        }
+        for (int i= (1 + 100); i <= 200; i++) {
+          exampleRegion2.put(""+i, new Portfolio(i));
+        }
+      }
+    });
+
+    // Execute server queries
+    SerializableRunnable executeQuery = new CacheSerializableRunnable("Execute queries") {
+      public void run2() throws CacheException {
+        try {
+          QueryService queryService = GemFireCacheImpl.getInstance().getQueryService();
+          String qStr = "SELECT DISTINCT * FROM /root/exampleRegion p, (SELECT DISTINCT pos FROM /root/exampleRegion x, x.positions.values pos"
+            + " WHERE  x.ID = p.ID) as itrX";
+          try {
+            GemFireCacheImpl.getInstance().getLogger().fine("Executing query :" + qStr);
+            Query query = queryService.newQuery(qStr);
+            query.execute();
+            fail("The query should have been canceled by the QueryMonitor. Query: " + qStr);
+          }catch (Exception e){
+            verifyException(e);
+          }
+
+          // Create index and Perform cache op. Bug#44307
+          queryService.createIndex("idIndex", IndexType.FUNCTIONAL, "ID", "/root/exampleRegion");
+          queryService.createIndex("statusIndex", IndexType.FUNCTIONAL, "status", "/root/exampleRegion");
+          Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
+          for (int i= (1 + 100); i <= (numberOfEntries + 200); i++) {
+            exampleRegion.put(""+i, new Portfolio(i));
+          }
+          
+        } catch (Exception ex){
+          fail("Exception creating the query service", ex);
+        }
+      }      
+    };
+
+    server1.invoke(executeQuery);
+    server2.invoke(executeQuery);
+
+    stopServer(server1);
+    stopServer(server2);
+  }
+  
+  /**
+   * Tests query execution from client to server (multiple server) on Partition Region .
+   */
+  public void testQueryMonitorOnPR() throws Exception {
+
+    setup(2);
+    
+    final Host host = Host.getHost(0);
+    
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client1 = host.getVM(2);
+    VM client2 = host.getVM(3);
+
+    final int numberOfEntries = 800;
+
+    // Start server
+    configServer(server1, 200, "testQueryMonitorMultiClientMultiServerOnPR"); // All the queries taking more than 200ms should be canceled by Query monitor.
+    createPRRegion(server1);
+
+    configServer(server2, 50, "testQueryMonitorMultiClientMultiServerOnPR"); // All the queries taking more than 200ms should be canceled by Query monitor.
+    createPRRegion(server2);
+
+    pause(1000);
+    
+    // Initialize server regions.
+    server1.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
+        Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
+        for (int i= (1 + 100); i <= (numberOfEntries + 100); i++) {
+          exampleRegion.put(""+i, new Portfolio(i));
+        }
+      }
+    });
+
+    // Initialize server regions.
+    server2.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
+        Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
+        for (int i= (numberOfEntries + 100); i <= (numberOfEntries + numberOfEntries + 100); i++) {
+          exampleRegion.put(""+i, new Portfolio(i));
+        }
+      }
+    });
+
+    // Initialize Client1 and create client regions.
+    configClient(client1, new VM[] {server1});
+    createRegion(client1);
+    
+    // Initialize Client2 and create client regions.
+    configClient(client2, new VM[] {server2});
+    createRegion(client2);
+    
+    // Execute client queries
+    SerializableRunnable executeQuery = new CacheSerializableRunnable("Execute queries") {
+      public void run2() throws CacheException {
+        try {
+          Pool pool = PoolManager.find(poolName);
+          QueryService queryService = pool.getQueryService();
+          for (int k=0; k < prQueryStr.length; k++) {
+            String qStr = prQueryStr[k];
+            try {
+              GemFireCacheImpl.getInstance().getLogger().fine("Executing query :" + qStr);
+              Query query = queryService.newQuery(qStr);
+              query.execute();
+              fail("The query should have been canceled by the QueryMonitor. Query: " + qStr);
+            }catch (Exception e){
+              verifyException(e);            
+            }
+          }
+        } catch (Exception ex){
+          GemFireCacheImpl.getInstance().getLogger().fine("Exception creating the query service", ex);
+        }
+      }
+    };
+
+    client1.invoke(executeQuery);
+    client2.invoke(executeQuery);
+
+    stopServer(server1);
+    stopServer(server2);
+  }
+
+  /**
+   * Tests query execution on Partition Region, executes query locally.
+   */
+  public void testQueryMonitorWithLocalQueryOnPR() throws Exception {
+
+    setup(2);
+    
+    final Host host = Host.getHost(0);
+    
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+
+    final int numberOfEntries = 800;
+
+    // Start server
+    configServer(server1, 200, "testQueryMonitorMultiClientMultiServerOnPR"); // All the queries taking more than 200ms should be canceled by Query monitor.
+    createPRRegion(server1);
+
+    configServer(server2, 50, "testQueryMonitorMultiClientMultiServerOnPR"); // All the queries taking more than 200ms should be canceled by Query monitor.
+    createPRRegion(server2);
+
+    pause(1000);
+    
+    // Initialize server regions.
+    server1.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
+        Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
+        for (int i= (1 + 100); i <= (numberOfEntries + 100); i++) {
+          exampleRegion.put(""+i, new Portfolio(i));
+        }
+      }
+    });
+
+    // Initialize server regions.
+    server2.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
+        Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
+        for (int i= (numberOfEntries + 100); i <= (numberOfEntries + numberOfEntries + 100); i++) {
+          exampleRegion.put(""+i, new Portfolio(i));
+        }
+      }
+    });
+    
+    // Execute client queries
+    SerializableRunnable executeQuery = new CacheSerializableRunnable("Execute queries") {
+      public void run2() throws CacheException {
+        try {
+          QueryService queryService = GemFireCacheImpl.getInstance().getQueryService();
+          for (int k=0; k < prQueryStr.length; k++) {
+            String qStr = prQueryStr[k];
+            try {
+              GemFireCacheImpl.getInstance().getLogger().fine("Executing query :" + qStr);
+              Query query = queryService.newQuery(qStr);
+              query.execute();
+              fail("The query should have been canceled by the QueryMonitor. Query: " + qStr);
+            }catch (Exception e){
+              verifyException(e);            
+            }
+          }
+        } catch (Exception ex){
+          GemFireCacheImpl.getInstance().getLogger().fine("Exception creating the query service", ex);
+        }
+      }
+    };
+
+    server1.invoke(executeQuery);
+    server2.invoke(executeQuery);
+
+    stopServer(server1);
+    stopServer(server2);
+  }
+
+  /**
+   * Tests query execution from client to server (multiple server) with eviction to disk.
+   */
+  public void BUG46770WORKAROUNDtestQueryMonitorRegionWithEviction() throws CacheException {
+
+    final Host host = Host.getHost(0);
+    
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client1 = host.getVM(2);
+    VM client2 = host.getVM(3);
+
+    final int numberOfEntries = 800;
+
+    // Start server
+    configServer(server1, 5000, "testQueryMonitorRegionWithEviction"); // All the queries taking more than 120ms should be canceled by Query monitor.
+    createRegion(server1, true, "server1_testQueryMonitorRegionWithEviction");
+
+    configServer(server2, 5000, "testQueryMonitorRegionWithEviction"); // All the queries taking more than 120ms should be canceled by Query monitor.
+    createRegion(server2, true, "server2_testQueryMonitorRegionWithEviction");
+
+    pause(1000);
+    
+    // Initialize server regions.
+    server1.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
+        Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
+        for (int i= (1 + 100); i <= (numberOfEntries + 100); i++) {
+          exampleRegion.put(""+i, new Portfolio(i));
+        }
+      }
+    });
+
+    // Initialize server regions.
+    server2.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
+        Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
+        for (int i= (numberOfEntries + 100); i <= (numberOfEntries + numberOfEntries + 100); i++) {
+          exampleRegion.put(""+i, new Portfolio(i));
+        }
+      }
+    });
+
+    // Initialize Client1 and create client regions.
+    configClient(client1, new VM[] {server1});
+    createRegion(client1);
+    
+    // Initialize Client2 and create client regions.
+    configClient(client2, new VM[] {server2});
+    createRegion(client2);
+    
+    // Execute client queries
+    SerializableRunnable executeQuery = new CacheSerializableRunnable("Execute queries") {
+      public void run2() throws CacheException {
+        try {
+          Pool pool = PoolManager.find(poolName);
+          QueryService queryService = pool.getQueryService();
+          for (int k=0; k < prQueryStr.length; k++) {
+            String qStr = prQueryStr[k];
+            try {
+              GemFireCacheImpl.getInstance().getLogger().fine("Executing query :" + qStr);
+              Query query = queryService.newQuery(qStr);
+              query.execute();
+              fail("The query should have been canceled by the QueryMonitor. Query: " + qStr);
+            }catch (Exception e){
+              verifyException(e);
+            }
+          }
+        } catch (Exception ex){
+          GemFireCacheImpl.getInstance().getLogger().fine("Exception creating the query service", ex);
+        }
+      }
+    };
+
+    client1.invoke(executeQuery);
+    client2.invoke(executeQuery);
+
+    stopServer(server1);
+    stopServer(server2);
+  }
+
+  /**
+   * Tests query execution on region with indexes.
+   */
+  public void testQueryMonitorRegionWithIndex() throws Exception {
+
+    setup(2);
+    
+    final Host host = Host.getHost(0);
+    
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client1 = host.getVM(2);
+    VM client2 = host.getVM(3);
+
+    final int numberOfEntries = 800;
+
+    // Start server
+    configServer(server1, 40, "testQueryMonitorRegionWithIndex"); // All the queries taking more than 80ms should be canceled by Query monitor.
+    createRegion(server1);
+
+    configServer(server2, 40, "testQueryMonitorRegionWithIndex"); // All the queries taking more than 80ms should be canceled by Query monitor.
+    createRegion(server2);
+
+    pause(1000);
+    
+
+    // Initialize server regions.
+    server1.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
+        Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
+       
+        try {
+        // create index.
+        QueryService cacheQS = GemFireCacheImpl.getInstance().getQueryService();
+        cacheQS.createIndex("idIndex", IndexType.FUNCTIONAL,"p.ID","/root/exampleRegion p");
+        cacheQS.createIndex("statusIndex", IndexType.FUNCTIONAL,"p.status","/root/exampleRegion p");
+        cacheQS.createIndex("secIdIndex", IndexType.FUNCTIONAL,"pos.secId","/root/exampleRegion p, p.positions.values pos");
+        cacheQS.createIndex("posIdIndex", IndexType.FUNCTIONAL,"pos.Id","/root/exampleRegion p, p.positions.values pos");
+        cacheQS.createIndex("pkIndex", IndexType.PRIMARY_KEY, "pk", "/root/exampleRegion");
+        cacheQS.createIndex("pkidIndex", IndexType.PRIMARY_KEY, "pkid", "/root/exampleRegion");
+        cacheQS.createIndex("idIndex2", IndexType.FUNCTIONAL,"p2.ID","/root/exampleRegion2 p2");
+        cacheQS.createIndex("statusIndex2", IndexType.FUNCTIONAL,"p2.status","/root/exampleRegion2 p2");
+        cacheQS.createIndex("secIdIndex2", IndexType.FUNCTIONAL,"pos.secId","/root/exampleRegion2 p2, p2.positions.values pos");
+        cacheQS.createIndex("posIdIndex2", IndexType.FUNCTIONAL,"pos.Id","/root/exampleRegion2 p2, p2.positions.values pos");
+        cacheQS.createIndex("pkIndex2", IndexType.PRIMARY_KEY, "pk", "/root/exampleRegion2");
+        cacheQS.createIndex("pkidIndex2", IndexType.PRIMARY_KEY, "pkid", "/root/exampleRegion2");
+        } catch (Exception ex) {
+        }
+        for (int i= (1 + 100); i <= (numberOfEntries + 100); i++) {
+          exampleRegion.put(""+i, new Portfolio(i));
+        }
+        for (int i= (1 + 100); i <= (200 + 100); i++) {
+          exampleRegion2.put(""+i, new Portfolio(i));
+        }
+      }
+    });
+
+    // Initialize server regions.
+    server2.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
+        Region exampleRegion2 = getRootRegion().getSubregion(exampleRegionName2);
+        // create index.
+        try {
+        QueryService cacheQS = GemFireCacheImpl.getInstance().getQueryService();
+        cacheQS.createIndex("idIndex", IndexType.FUNCTIONAL,"p.ID","/root/exampleRegion p");
+        cacheQS.createIndex("statusIndex", IndexType.FUNCTIONAL,"p.status","/root/exampleRegion p");
+        cacheQS.createIndex("secIdIndex", IndexType.FUNCTIONAL,"pos.secId","/root/exampleRegion p, p.positions.values pos");
+        cacheQS.createIndex("posIdIndex", IndexType.FUNCTIONAL,"pos.Id","/root/exampleRegion p, p.positions.values pos");
+        cacheQS.createIndex("pkIndex", IndexType.PRIMARY_KEY, "pk", "/root/exampleRegion");
+        cacheQS.createIndex("pkidIndex", IndexType.PRIMARY_KEY, "pkid", "/root/exampleRegion");
+        cacheQS.createIndex("idIndex2", IndexType.FUNCTIONAL,"p2.ID","/root/exampleRegion2 p2");
+        cacheQS.createIndex("statusIndex2", IndexType.FUNCTIONAL,"p2.status","/root/exampleRegion2 p2");
+        cacheQS.createIndex("secIdIndex2", IndexType.FUNCTIONAL,"pos.secId","/root/exampleRegion2 p2, p2.positions.values pos");
+        cacheQS.createIndex("posIdIndex2", IndexType.FUNCTIONAL,"pos.Id","/root/exampleRegion2 p2, p2.positions.values pos");
+        cacheQS.createIndex("pkIndex2", IndexType.PRIMARY_KEY, "pk", "/root/exampleRegion2");
+        cacheQS.createIndex("pkidIndex2", IndexType.PRIMARY_KEY, "pkid", "/root/exampleRegion2");
+        } catch (Exception ex) {
+        }
+
+        for (int i= (1 + 100); i <= (numberOfEntries + 100); i++) {
+          exampleRegion.put(""+i, new Portfolio(i));
+        }
+        for (int i= (1 + 100); i <= (200 + 100); i++) {
+          exampleRegion2.put(""+i, new Portfolio(i));
+        }
+      }
+    });
+
+    // Initialize Client1 and create client regions.
+    configClient(client1, new VM[] {server1});
+    createRegion(client1);
+    
+    // Initialize Client2 and create client regions.
+    configClient(client2, new VM[] {server2});
+    createRegion(client2);
+    
+    // Execute client queries
+    SerializableRunnable executeQuery = new CacheSerializableRunnable("Execute queries") {
+      public void run2() throws CacheException {
+        try {
+          Pool pool = PoolManager.find(poolName);
+          QueryService queryService = pool.getQueryService();
+          for (int k=0; k < queryStr.length; k++) {
+            String qStr = queryStr[k];
+            try {
+              GemFireCacheImpl.getInstance().getLogger().fine("Executing query :" + qStr);
+              Query query = queryService.newQuery(qStr);
+              query.execute();
+              fail("The query should have been canceled by the QueryMonitor. Query: " + qStr);
+            }catch (Exception e){
+              verifyException(e);
+            }
+          }
+        } catch (Exception ex){
+          GemFireCacheImpl.getInstance().getLogger().fine("Exception creating the query service", ex);
+        }
+      }
+    };
+
+    client1.invoke(executeQuery);
+    client2.invoke(executeQuery);
+
+    stopServer(server1);
+    stopServer(server2);
+  }
+  
+  
+  protected CqQueryDUnitTest cqDUnitTest = new CqQueryDUnitTest("CqDataDUnitTest");
+
+  /**
+   * The following CQ test is added to make sure TEST_MAX_QUERY_EXECUTION_TIME is reset
+   * and is not affecting other query related tests.
+   * @throws Exception
+   */
+  public void testCQWithDestroysAndInvalidates() throws Exception
+  {
+    setup(1);
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    VM producerClient = host.getVM(2);
+    
+    cqDUnitTest.createServer(server, 0, true);
+    final int port = server.invokeInt(CqQueryDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+
+    // Create client.
+    cqDUnitTest.createClient(client, port, host0);
+    // producer is not doing any thing.
+    cqDUnitTest.createClient(producerClient, port, host0);
+
+    final int size = 10;
+    final String name = "testQuery_4";
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], size);
+
+    cqDUnitTest.createCQ(client, name, cqDUnitTest.cqs[4]);
+    cqDUnitTest.executeCQ(client, name, true, null);
+    
+    // do destroys and invalidates.
+    server.invoke(new CacheSerializableRunnable("Create values") {
+      public void run2() throws CacheException
+      {
+        Cache cache = getCache();
+        System.out.println("TEST CQ MAX_QUERY_EXECUTION_TIME is set to: " + ((GemFireCacheImpl)cache).TEST_MAX_QUERY_EXECUTION_TIME);
+
+        Region region1 = getRootRegion().getSubregion(cqDUnitTest.regions[0]);
+        for (int i = 1; i <= 5; i++) {
+          region1.destroy( CqQueryDUnitTest.KEY + i);
+        }
+      }
+    });
+    for (int i = 1; i <= 5; i++) {
+      cqDUnitTest.waitForDestroyed(client, name , CqQueryDUnitTest.KEY+i);
+    }
+    // recreate the key values from 1 - 5
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], 5);
+    // wait for all creates to arrive.
+    for (int i = 1; i <= 5; i++) {
+      cqDUnitTest.waitForCreated(client, name , CqQueryDUnitTest.KEY+i);
+    }
+    
+    // do more puts to push first five key-value to disk.
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], 10);
+    // do invalidates on fisrt five keys.
+    server.invoke(new CacheSerializableRunnable("Create values") {
+      public void run2() throws CacheException
+      {
+        Cache cache = getCache();
+        System.out.println("TEST CQ MAX_QUERY_EXECUTION_TIME is set to: " + ((GemFireCacheImpl)cache).TEST_MAX_QUERY_EXECUTION_TIME);
+
+        Region region1 = getRootRegion().getSubregion(cqDUnitTest.regions[0]);
+        for (int i = 1; i <= 5; i++) {
+          region1.invalidate( CqQueryDUnitTest.KEY + i);
+        }
+      }
+    });
+    // wait for invalidates now.
+    for (int i = 1; i <= 5; i++) {
+      cqDUnitTest.waitForInvalidated(client, name , CqQueryDUnitTest.KEY+i);
+    }
+        
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server);
+  
+  }
+
+  /**
+   * Tests cache operation right after query cancellation.
+   */
+  public void testCacheOpAfterQueryCancel() throws Exception {
+
+    setup(4);
+    
+    final Host host = Host.getHost(0);
+    
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM server3 = host.getVM(2);
+    VM server4 = host.getVM(3);
+    
+    final int numberOfEntries = 8000;
+
+    // Start server
+    configServer(server1, 5, "testQueryExecutionLocally"); 
+    createPRRegion(server1);
+
+    configServer(server2, 5, "testQueryExecutionLocally"); 
+    createPRRegion(server2);
+
+    configServer(server3, 5, "testQueryExecutionLocally"); 
+    createPRRegion(server3);
+    
+    configServer(server4, 5, "testQueryExecutionLocally"); 
+    createPRRegion(server4);
+    
+    server1.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        try {
+          QueryService queryService = GemFireCacheImpl.getInstance().getQueryService();
+          queryService.createIndex("statusIndex", IndexType.FUNCTIONAL, "status", "/root/exampleRegion");
+          queryService.createIndex("secIdIndex", IndexType.FUNCTIONAL, "pos.secId", "/root/exampleRegion p, p.positions.values pos");
+        } catch (Exception ex) {
+          fail("Failed to create index.");
+        }
+        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
+        for (int i= 100; i <= (numberOfEntries); i++) {
+          exampleRegion.put(""+i, new Portfolio(i));
+        }
+      }
+    });
+
+    // Initialize server regions.
+    AsyncInvocation ai1 = server1.invokeAsync(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
+        for (int j=0; j < 5; j++) {
+          for (int i= 1; i <= (numberOfEntries + 1000); i++) {
+            exampleRegion.put(""+i, new Portfolio(i));
+          }
+        }
+        getLogWriter().info("### Completed updates in server1 in testCacheOpAfterQueryCancel");
+      }
+    });
+
+   
+    AsyncInvocation ai2 = server2.invokeAsync(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
+        for (int j=0; j < 5; j++) {
+          for (int i= (1 + 1000); i <= (numberOfEntries + 2000); i++) {
+            exampleRegion.put(""+i, new Portfolio(i));
+          }
+        }
+        getLogWriter().info("### Completed updates in server2 in testCacheOpAfterQueryCancel");
+      }
+    });
+
+    // Execute server queries
+    SerializableRunnable executeQuery = new CacheSerializableRunnable("Execute queries") {
+      public void run2() throws CacheException {
+        try {
+          Region exampleRegion = getRootRegion().getSubregion(exampleRegionName);
+          QueryService queryService = GemFireCacheImpl.getInstance().getQueryService();
+          String qStr = "SELECT DISTINCT * FROM /root/exampleRegion p, p.positions.values pos1, p.positions.values pos" +
+            " where p.ID < pos.sharesOutstanding OR p.ID > 0 OR p.position1.mktValue > 0 " +
+            " OR pos.secId in SET ('SUN', 'IBM', 'YHOO', 'GOOG', 'MSFT', " +
+            " 'AOL', 'APPL', 'ORCL', 'SAP', 'DELL', 'RHAT', 'NOVL', 'HP')" +
+            " order by p.status, p.ID desc";
+          for (int i=0; i < 500; i++) {
+            try {
+              GemFireCacheImpl.getInstance().getLogger().info("Executing query :" + qStr);
+              Query query = queryService.newQuery(qStr);
+              query.execute();
+            } catch (QueryExecutionTimeoutException qet) {
+              getLogWriter().info("### Got Expected QueryExecutionTimeout exception. " +
+                  qet.getMessage());
+              if (qet.getMessage().contains("cancelled after exceeding max execution")){
+                getLogWriter().info("### Doing a put operation");
+                exampleRegion.put(""+i, new Portfolio(i));
+              }
+            } catch (Exception e){
+              fail("Exception executing query." + e.getMessage());
+            }
+          }
+          getLogWriter().info("### Completed Executing queries in testCacheOpAfterQueryCancel");
+        } catch (Exception ex){
+          fail("Exception creating the query service", ex);
+        }
+      }      
+    };
+
+    AsyncInvocation ai3 = server3.invokeAsync(executeQuery);
+    AsyncInvocation ai4 = server4.invokeAsync(executeQuery);
+    
+    getLogWriter().info("### Waiting for async threads to join in testCacheOpAfterQueryCancel");
+    try {
+      DistributedTestCase.join(ai1, 5 * 60 * 1000, null);
+      DistributedTestCase.join(ai2, 5 * 60 * 1000, null);
+      DistributedTestCase.join(ai3, 5 * 60 * 1000, null);
+      DistributedTestCase.join(ai4, 5 * 60 * 1000, null);
+    } catch (Exception ex) {
+      fail("Async thread join failure");
+    }
+    getLogWriter().info("### DONE Waiting for async threads to join in testCacheOpAfterQueryCancel");
+    
+    validateQueryMonitorThreadCnt(server1, 0, 1000);
+    validateQueryMonitorThreadCnt(server2, 0, 1000);
+    validateQueryMonitorThreadCnt(server3, 0, 1000);
+    validateQueryMonitorThreadCnt(server4, 0, 1000);
+    
+    getLogWriter().info("### DONE validating query monitor threads testCacheOpAfterQueryCancel");
+    
+    stopServer(server1);
+    stopServer(server2);
+    stopServer(server3);
+    stopServer(server4);
+  }
+
+  public void validateQueryMonitorThreadCnt(VM vm, final int threadCount, final int waitTime){
+    SerializableRunnable validateThreadCnt = new CacheSerializableRunnable("validateQueryMonitorThreadCnt") {
+      public void run2() throws CacheException {
+        Cache cache = getCache();
+        QueryMonitor qm = ((GemFireCacheImpl)cache).getQueryMonitor();
+        if (qm == null) {
+          fail("Didn't found query monitor.");
+        }
+        int waited = 0;
+        while (true) {
+          if (qm.getQueryMonitorThreadCount() != threadCount) {
+            if (waited <= waitTime) {
+              pause(10);
+              waited+=10;
+              continue;
+            } else {
+              fail ("Didn't found expected monitoring thread. Expected: " + threadCount +
+                  " found :" + qm.getQueryMonitorThreadCount());
+            }
+          }
+          break;
+        }
+        //((GemFireCache)cache).TEST_MAX_QUERY_EXECUTION_TIME = queryMonitorTime;
+      }
+    };
+    vm.invoke(validateThreadCnt);
+  }
+  
+  /**
+   * Starts a bridge server on the given port, using the given
+   * deserializeValues and notifyBySubscription to serve up the
+   * given region.
+   */
+  protected void startBridgeServer(int port, boolean notifyBySubscription)
+  throws IOException {
+
+    Cache cache = getCache();
+    CacheServer bridge = cache.addCacheServer();
+    bridge.setPort(port);
+    bridge.setNotifyBySubscription(notifyBySubscription);
+    bridge.start();
+    bridgeServerPort = bridge.getPort();
+  }
+
+  /**
+   * Stops the bridge server that serves up the given cache.
+   */
+  protected void stopBridgeServer(Cache cache) {
+    CacheServer bridge =
+      (CacheServer) cache.getCacheServers().iterator().next();
+    bridge.stop();
+    assertFalse(bridge.isRunning());
+  }
+
+  private static int getCacheServerPort() {
+    return bridgeServerPort;
+  }
+  
+  private class QueryTimeoutHook implements DefaultQuery.TestHook {
+    long timeout;
+    public QueryTimeoutHook(long timeout) {
+      this.timeout = timeout;
+    }
+    
+    public void doTestHook(String description) {
+      if (description.equals("6")) {
+        try {
+          Thread.sleep(timeout);
+        }
+        catch (InterruptedException ie) {
+          Thread.currentThread().interrupt();
+        }
+      }
+    }
+    
+    public void doTestHook(int spot) {
+      doTestHook("" + spot);
+    }
+    
+  }
+
+}
+

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
new file mode 100644
index 0000000..9d9557c
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
@@ -0,0 +1,276 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.snapshot;
+
+import java.io.File;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import com.examples.snapshot.MyObject;
+import com.examples.snapshot.MyPdxSerializer;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.EntryEvent;
+import com.gemstone.gemfire.cache.EvictionAttributes;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionShortcut;
+import com.gemstone.gemfire.cache.client.ClientCache;
+import com.gemstone.gemfire.cache.client.ClientCacheFactory;
+import com.gemstone.gemfire.cache.client.ClientRegionShortcut;
+import com.gemstone.gemfire.cache.query.CqAttributesFactory;
+import com.gemstone.gemfire.cache.query.CqEvent;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.cache.snapshot.SnapshotOptions.SnapshotFormat;
+import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
+import com.gemstone.gemfire.cache.util.CacheWriterAdapter;
+import com.gemstone.gemfire.cache.util.CqListenerAdapter;
+import com.gemstone.gemfire.cache30.CacheTestCase;
+import com.gemstone.gemfire.internal.AvailablePortHelper;
+
+import dunit.Host;
+import dunit.SerializableCallable;
+
+public class ClientSnapshotDUnitTest extends CacheTestCase {
+
+  private transient Region<Integer, MyObject> region;
+  
+  public ClientSnapshotDUnitTest(String name) {
+    super(name);
+  }
+
+  public void testExport() throws Exception {
+    int count = 10000;
+    for (int i = 0; i < count; i++) {
+      region.put(i, new MyObject(i, "clienttest " + i));
+    }
+    
+    SerializableCallable export = new SerializableCallable() {
+      @Override
+      public Object call() throws Exception {
+        File f = new File(getDiskDirs()[0], "client-export.snapshot");
+        Region<Integer, MyObject> r = getCache().getRegion("clienttest");
+        
+        r.getSnapshotService().save(f, SnapshotFormat.GEMFIRE);
+        
+        return f;
+      }
+    };
+    
+    File snapshot = (File) Host.getHost(0).getVM(3).invoke(export);
+    
+    SnapshotIterator<Integer, MyObject> iter = SnapshotReader.read(snapshot);
+    try {
+      while (iter.hasNext()) {
+        iter.next();
+        count--;
+      }
+      assertEquals(0, count);
+    } finally {
+      iter.close();
+    }
+  }
+  
+  public void testImport() throws Exception {
+    int count = 1000;
+    for (int i = 0; i < count; i++) {
+      region.put(i, new MyObject(i, "clienttest " + i));
+    }
+    
+    SerializableCallable export = new SerializableCallable() {
+      @Override
+      public Object call() throws Exception {
+        File f = new File(getDiskDirs()[0], "client-import.snapshot");
+        Region<Integer, MyObject> r = getCache().getRegion("clienttest");
+        
+        r.getSnapshotService().save(f, SnapshotFormat.GEMFIRE);
+        
+        return f;
+      }
+    };
+    
+    Host.getHost(0).getVM(3).invoke(export);
+    for (int i = 0; i < count; i++) {
+      region.put(i, new MyObject(i, "XXX"));
+    }
+
+    SerializableCallable imp = new SerializableCallable() {
+      @Override
+      public Object call() throws Exception {
+        final AtomicBoolean cqtest = new AtomicBoolean(false);
+        CqAttributesFactory af = new CqAttributesFactory();
+        af.addCqListener(new CqListenerAdapter() {
+          @Override
+          public void onEvent(CqEvent aCqEvent) {
+            cqtest.set(true);
+          }
+        });
+        
+        Region<Integer, MyObject> r = getCache().getRegion("clienttest");
+        CqQuery cq = r.getRegionService().getQueryService().newCq("SELECT * FROM /clienttest", af.create());
+        cq.execute();
+
+        File f = new File(getDiskDirs()[0], "client-import.snapshot");
+        r.getSnapshotService().load(f, SnapshotFormat.GEMFIRE);
+        
+        return cqtest.get();
+      }
+    };
+    
+    // add callbacks
+    region.getAttributesMutator().setCacheWriter(new CacheWriterAdapter<Integer, MyObject>() {
+      @Override
+      public void beforeUpdate(EntryEvent<Integer, MyObject> event) {
+        fail("CacheWriter invoked during import");
+      }
+    });
+    
+    final AtomicBoolean cltest = new AtomicBoolean(false);
+    region.getAttributesMutator().addCacheListener(new CacheListenerAdapter<Integer, MyObject>() {
+      @Override
+      public void afterUpdate(EntryEvent<Integer, MyObject> event) {
+        cltest.set(true);
+      }
+    });
+    
+    boolean cqtest = (Boolean) Host.getHost(0).getVM(3).invoke(imp);
+    assertEquals("CacheListener invoked during import", false, cltest.get());
+    assertEquals("CqListener invoked during import", false, cqtest);
+
+    for (MyObject obj : region.values()) {
+      assertTrue(obj.getF2().startsWith("clienttest"));
+    }
+  }
+  
+  public void testClientCallbacks() throws Exception {
+    int count = 1000;
+    for (int i = 0; i < count; i++) {
+      region.put(i, new MyObject(i, "clienttest " + i));
+    }
+    
+    File f = new File(getDiskDirs()[0], "client-callback.snapshot");
+    region.getSnapshotService().save(f, SnapshotFormat.GEMFIRE);
+    
+    for (int i = 0; i < count; i++) {
+      region.put(i, new MyObject(i, "XXX"));
+    }
+
+    SerializableCallable callbacks = new SerializableCallable() {
+      @Override
+      public Object call() throws Exception {
+        Region<Integer, MyObject> r = getCache().getRegion("clienttest");
+        r.registerInterestRegex(".*");
+        
+        r.getAttributesMutator().setCacheWriter(new CacheWriterAdapter<Integer, MyObject>() {
+          @Override
+          public void beforeUpdate(EntryEvent<Integer, MyObject> event) {
+            fail("CacheWriter invoked during import");
+          }
+        });
+        
+        r.getAttributesMutator().addCacheListener(new CacheListenerAdapter<Integer, MyObject>() {
+          @Override
+          public void afterUpdate(EntryEvent<Integer, MyObject> event) {
+            fail("CacheListener was invoked during import");
+          }
+        });
+        
+        final AtomicBoolean cqtest = new AtomicBoolean(false);
+        CqAttributesFactory af = new CqAttributesFactory();
+        af.addCqListener(new CqListenerAdapter() {
+          @Override
+          public void onEvent(CqEvent aCqEvent) {
+            fail("Cq was invoked during import");
+          }
+        });
+        
+        CqQuery cq = r.getRegionService().getQueryService().newCq("SELECT * FROM /clienttest", af.create());
+        cq.execute();
+        
+        return null;
+      }
+    };
+    
+    Host.getHost(0).getVM(3).invoke(callbacks);
+    region.getSnapshotService().load(f, SnapshotFormat.GEMFIRE);
+  }
+  
+  public void testInvalidate() throws Exception {
+    SerializableCallable invalid = new SerializableCallable() {
+      @Override
+      public Object call() throws Exception {
+        Region<Integer, MyObject> r = getCache().getRegion("clienttest");
+
+        r.put(1, new MyObject(1, "invalidate"));
+        r.invalidate(1);
+
+        File f = new File(getDiskDirs()[0], "client-invalidate.snapshot");
+        r.getSnapshotService().save(f, SnapshotFormat.GEMFIRE);
+        r.getSnapshotService().load(f, SnapshotFormat.GEMFIRE);
+        
+        return null;
+      }
+    };
+    
+    Host.getHost(0).getVM(3).invoke(invalid);
+    
+    assertTrue(region.containsKey(1));
+    assertFalse(region.containsValueForKey(1));
+    assertNull(region.get(1));
+  }
+  
+  public void setUp() throws Exception {
+    super.setUp();
+    loadCache();
+  }
+  
+  @SuppressWarnings("serial")
+  public void loadCache() throws Exception {
+    CacheFactory cf = new CacheFactory().setPdxSerializer(new MyPdxSerializer());
+    Cache cache = getCache(cf);
+  
+    CacheServer server = cache.addCacheServer();
+    final int port = AvailablePortHelper.getRandomAvailableTCPPort();
+    server.setPort(port);
+    server.start();
+
+    region = cache.<Integer, MyObject>createRegionFactory(RegionShortcut.REPLICATE).create("clienttest");
+
+    final Host host = Host.getHost(0);
+    SerializableCallable client = new SerializableCallable() {
+      @Override
+      public Object call() throws Exception {
+        ClientCacheFactory cf = new ClientCacheFactory()
+          .set("log-level", getDUnitLogLevel())
+          .setPdxSerializer(new MyPdxSerializer())
+          .addPoolServer(getServerHostName(host), port)
+          .setPoolSubscriptionEnabled(true)
+          .setPoolPRSingleHopEnabled(false);
+    
+        ClientCache cache = getClientCache(cf);
+        Region r = cache.createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY_HEAP_LRU)
+            .setEvictionAttributes(EvictionAttributes.createLRUEntryAttributes(5))
+            .create("clienttest");
+        return null;
+      }
+    };
+
+    SerializableCallable remote = new SerializableCallable() {
+      @Override
+      public Object call() throws Exception {
+        CacheFactory cf = new CacheFactory().setPdxSerializer(new MyPdxSerializer());
+        Cache cache = getCache(cf);
+      
+        cache.<Integer, MyObject>createRegionFactory(RegionShortcut.REPLICATE).create("clienttest");
+        return null;
+      }
+    };
+
+    host.getVM(3).invoke(client);
+    host.getVM(2).invoke(remote);
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java
new file mode 100755
index 0000000..f0fffa7
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/codeAnalysis/AnalyzeCQSerializablesJUnitTest.java
@@ -0,0 +1,70 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.codeAnalysis;
+
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.experimental.categories.Category;
+
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+import com.gemstone.gemfire.util.test.TestUtil;
+
+/**
+ * @author bruces
+ * 
+ */
+@Category(IntegrationTest.class)
+public class AnalyzeCQSerializablesJUnitTest extends AnalyzeSerializablesJUnitTest {
+  
+  @Before
+  public void loadClasses() throws Exception {
+    if (classes.size() > 0) {
+      return;
+    }
+    System.out.println("loadClasses starting");
+    List<String> excludedClasses = loadExcludedClasses(new File(TestUtil.getResourcePath(AnalyzeCQSerializablesJUnitTest.class, "excludedClasses.txt")));
+    List<String> openBugs = loadOpenBugs(new File(TestUtil.getResourcePath(AnalyzeCQSerializablesJUnitTest.class, "openBugs.txt")));
+    excludedClasses.addAll(openBugs);
+    
+    String cp = System.getProperty("java.class.path");
+    System.out.println("java classpath is " + cp);
+    System.out.flush();
+    String[] entries = cp.split(File.pathSeparator);
+    String buildDirName =
+         "gemfire-cq"+File.separatorChar
+        +"build"+File.separatorChar
+        +"classes"+File.separatorChar
+        +"main";
+    String buildDir = null;
+    
+    for (int i=0; i<entries.length  &&  buildDir==null; i++) {
+      System.out.println("examining '" + entries[i] + "'");
+      System.out.flush();
+      if (entries[i].endsWith(buildDirName)) {
+        buildDir = entries[i];
+      }
+    }
+    if (buildDir != null) {
+      System.out.println("loading class files from " + buildDir);
+      System.out.flush();
+      long start = System.currentTimeMillis();
+      loadClassesFromBuild(new File(buildDir), excludedClasses);
+      long finish = System.currentTimeMillis();
+      System.out.println("done loading " + classes.size() + " classes.  elapsed time = "
+          + (finish-start)/1000 + " seconds");
+    }
+    else {
+      fail("unable to find CQ classes");
+    }
+  }
+  
+}


[09/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
new file mode 100644
index 0000000..fd87d1e
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
@@ -0,0 +1,1815 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.wan.parallel;
+
+import java.io.IOException;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.PartitionAttributesFactory;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.wan.GatewaySender;
+import com.gemstone.gemfire.cache.wan.GatewaySenderFactory;
+import com.gemstone.gemfire.internal.cache.ColocationHelper;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+
+import dunit.AsyncInvocation;
+import dunit.DistributedTestCase.ExpectedException;
+
+public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
+    WANTestBase {
+
+  private static final long serialVersionUID = 1L;
+  
+  public ParallelWANPersistenceEnabledGatewaySenderDUnitTest(String name) {
+    super(name);
+  }
+  
+  public void setUp() throws Exception {
+    super.setUp();
+    //The restart tests log this string
+    addExpectedException("failed accepting client connection");
+  }
+  
+  public void testPartitionedRegionWithGatewaySenderPersistenceEnabled() throws IOException {
+    try {
+      Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+          "createFirstLocatorWithDSId", new Object[] { 1 });
+      Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+          "createFirstRemoteLocator", new Object[] { 2, lnPort });
+      createCache(lnPort);
+      GatewaySenderFactory fact = cache.createGatewaySenderFactory();
+      fact.setPersistenceEnabled(true);
+      fact.setParallel(true);
+      final ExpectedException ex = addExpectedException("Could not connect");
+      try {
+        GatewaySender sender1 = fact.create("NYSender", 2);
+
+        AttributesFactory rFact = new AttributesFactory();
+        rFact.addGatewaySenderId(sender1.getId());
+
+        PartitionAttributesFactory pfact = new PartitionAttributesFactory();
+        pfact.setTotalNumBuckets(100);
+        pfact.setRedundantCopies(1);
+        rFact.setPartitionAttributes(pfact.create());
+        Region r = cache.createRegionFactory(rFact.create()).create("MyRegion");
+        sender1.start();
+      } finally {
+        ex.remove();
+      }
+      
+    }
+    catch (Exception e) {
+      fail("UnExpectd Exception :" + e);
+    }
+  }
+  
+  /**
+   * Enable persistence for region as well as GatewaySender and see if remote
+   * site receives all the events.
+   */
+  public void testPersistentPartitionedRegionWithGatewaySenderPersistenceEnabled() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, true, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, true, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, true, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, true, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName, 1000 });
+
+  }
+
+  /**
+   * Enable persistence for the GatewaySender but not the region
+   */
+  public void testPartitionedRegionWithPersistentGatewaySender() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    
+    getLogWriter().info("Created remote receivers");
+    
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    
+    getLogWriter().info("Created local site cache");
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, true, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, true, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, true, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, true, null, true });
+  
+    getLogWriter().info("Created local site senders");
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+
+    getLogWriter().info("Created local site persistent PR");
+    
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    getLogWriter().info("Started sender on vm4");
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    getLogWriter().info("Started the senders");
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName, 1000 });
+  }
+  
+  
+  
+  /**
+   * Enable persistence for GatewaySender.
+   * Pause the sender and do some puts in local region.  
+   * Close the local site and rebuild the region and sender from disk store.
+   * Dispatcher should not start dispatching events recovered from persistent sender.
+   * Check if the remote site receives all the events.
+   */
+  public void testPRWithGatewaySenderPersistenceEnabled_Restart() {
+    //create locator on local site
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    //create locator on remote site
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    //create receiver on remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    //create cache in local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    //create senders with disk store
+    String diskStore1 = (String) vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore2 = (String) vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore3 = (String) vm6.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+
+    getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4);
+    
+    //create PR on remote site
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName, null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName, null, 1, 100, isOffHeap() });
+    
+    //create PR on local site
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+
+    //start the senders on local site
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    //wait for senders to become running
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    //pause the senders
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    
+    //start puts in region on local site
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 3000 });
+    getLogWriter().info("Completed puts in the region");
+    
+    //--------------------close and rebuild local site -------------------------------------------------
+    //kill the senders
+    vm4.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm5.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm6.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm7.invoke(WANTestBase.class, "killSender", new Object[] {});
+    
+    getLogWriter().info("Killed all the senders.");
+    
+    //restart the vm
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    
+    getLogWriter().info("Created back the cache");
+    
+   //create senders with disk store
+    vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore1, true });
+    vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore2, true });
+    vm6.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore3, true });
+    vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true });
+    
+    getLogWriter().info("Created the senders back from the disk store.");
+    //create PR on local site
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    AsyncInvocation inv2 = vm5.invokeAsync(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    AsyncInvocation inv3 = vm6.invokeAsync(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    AsyncInvocation inv4 = vm7.invokeAsync(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    
+    try {
+      inv1.join();
+      inv2.join();
+      inv3.join();
+      inv4.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+    
+    getLogWriter().info("Created back the partitioned regions");
+    
+    //start the senders in async mode. This will ensure that the 
+    //node of shadow PR that went down last will come up first
+    vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    getLogWriter().info("Waiting for senders running.");
+    //wait for senders running
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    getLogWriter().info("All the senders are now running...");
+    
+    //----------------------------------------------------------------------------------------------------
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName, 3000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName, 3000 });
+  }
+  
+  /**
+   * Enable persistence for PR and GatewaySender.
+   * Pause the sender and do some puts in local region.  
+   * Close the local site and rebuild the region and sender from disk store.
+   * Dispatcher should not start dispatching events recovered from persistent sender.
+   * Check if the remote site receives all the events.
+   */
+  public void testPersistentPRWithGatewaySenderPersistenceEnabled_Restart() {
+    //create locator on local site
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    //create locator on remote site
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    //create receiver on remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    //create cache in local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    //create senders with disk store
+    String diskStore1 = (String) vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore2 = (String) vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore3 = (String) vm6.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+
+    getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4);
+    
+    //create PR on remote site
+    vm2.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, null, 1, 100, isOffHeap() });
+    
+    //create PR on local site
+    vm4.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+
+    //start the senders on local site
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    //wait for senders to become running
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    //pause the senders
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    
+    //start puts in region on local site
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 3000 });
+    getLogWriter().info("Completed puts in the region");
+    
+    //--------------------close and rebuild local site -------------------------------------------------
+    //kill the senders
+    vm4.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm5.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm6.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm7.invoke(WANTestBase.class, "killSender", new Object[] {});
+    
+    getLogWriter().info("Killed all the senders.");
+    
+    //restart the vm
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    
+    getLogWriter().info("Created back the cache");
+    
+   //create senders with disk store
+    vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore1, true });
+    vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore2, true });
+    vm6.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore3, true });
+    vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true });
+    
+    getLogWriter().info("Created the senders back from the disk store.");
+    //create PR on local site
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    AsyncInvocation inv2 = vm5.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    AsyncInvocation inv3 = vm6.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    AsyncInvocation inv4 = vm7.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    
+    try {
+      inv1.join();
+      inv2.join();
+      inv3.join();
+      inv4.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+    
+    getLogWriter().info("Created back the partitioned regions");
+    
+    //start the senders in async mode. This will ensure that the 
+    //node of shadow PR that went down last will come up first
+    vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    getLogWriter().info("Waiting for senders running.");
+    //wait for senders running
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    getLogWriter().info("All the senders are now running...");
+    
+    //----------------------------------------------------------------------------------------------------
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName, 3000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName, 3000 });
+  }
+  
+  /**
+   * Enable persistence for PR and GatewaySender.
+   * Pause the sender and do some puts in local region.  
+   * Close the local site and rebuild the region and sender from disk store.
+   * Dispatcher should not start dispatching events recovered from persistent sender.
+   * Check if the remote site receives all the events.
+   */
+  public void testPersistentPRWithGatewaySenderPersistenceEnabled_Restart2() {
+    //create locator on local site
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    //create locator on remote site
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    //create cache in local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    //create senders with disk store
+    String diskStore1 = (String) vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, false });
+    String diskStore2 = (String) vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, false });
+    String diskStore3 = (String) vm6.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, false });
+    String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, false });
+
+    getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4);
+    
+    //create PR on local site
+    vm4.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+
+    //start the senders on local site
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    //wait for senders to become running
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    //pause the senders
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    
+    //start puts in region on local site
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 300 });
+    getLogWriter().info("Completed puts in the region");
+    
+    //--------------------close and rebuild local site -------------------------------------------------
+    //kill the senders
+    vm4.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm5.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm6.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm7.invoke(WANTestBase.class, "killSender", new Object[] {});
+    
+    getLogWriter().info("Killed all the senders.");
+    
+    //restart the vm
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    
+    getLogWriter().info("Created back the cache");
+    
+  //create senders with disk store
+    vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore1, true });
+    vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore2, true });
+    vm6.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore3, true });
+    vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true });
+    
+    getLogWriter().info("Created the senders back from the disk store.");
+    
+    //create PR on local site
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    AsyncInvocation inv2 = vm5.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    AsyncInvocation inv3 = vm6.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    AsyncInvocation inv4 = vm7.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    
+    try {
+      inv1.join();
+      inv2.join();
+      inv3.join();
+      inv4.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+    
+    getLogWriter().info("Created back the partitioned regions");
+    
+    vm4.invoke(WANTestBase.class, "unsetRemoveFromQueueOnException", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "unsetRemoveFromQueueOnException", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "unsetRemoveFromQueueOnException", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "unsetRemoveFromQueueOnException", new Object[] { "ln" });
+
+    //start the senders in async mode. This will ensure that the 
+    //node of shadow PR that went down last will come up first
+    vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    getLogWriter().info("Waiting for senders running.");
+    //wait for senders running
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+
+
+    getLogWriter().info("Creating the receiver.");
+    //create receiver on remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    //create PR on remote site
+    
+    getLogWriter().info("Creating the partitioned region at receiver. ");
+    vm2.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, null, 1, 100, isOffHeap() });
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    
+    getLogWriter().info("Doing some extra puts. ");
+    //start puts in region on local site
+    vm4.invoke(WANTestBase.class, "doPutsAfter300", new Object[] { testName, 1000 });
+    //----------------------------------------------------------------------------------------------------
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    
+    getLogWriter().info("Validating the region size at the receiver end. ");
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName, 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName, 1000 });
+  }
+  
+  
+  /**
+   * Enable persistence for PR and GatewaySender.
+   * Pause the sender and do some puts in local region.  
+   * Close the local site and rebuild the region and sender from disk store.
+   * Dispatcher should not start dispatching events recovered from persistent sender.
+   * --> At the same time, do some more puts on the local region.  
+   * Check if the remote site receives all the events.
+   */
+  public void testPersistentPRWithGatewaySenderPersistenceEnabled_Restart_Scenario2() {
+    //create locator on local site
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    //create locator on remote site
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    //create receiver on remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    //create cache in local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    //create senders with disk store
+    String diskStore1 = (String) vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore2 = (String) vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore3 = (String) vm6.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+
+    getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4);
+    
+    //create PR on remote site
+    vm2.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, null, 1, 100, isOffHeap() });
+    
+    //create PR on local site
+    vm4.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+
+    //start the senders on local site
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    //wait for senders to become running
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    //pause the senders
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    
+    //start puts in region on local site
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 3000 });
+    getLogWriter().info("Completed puts in the region");
+    
+    //--------------------close and rebuild local site -------------------------------------------------
+    //kill the senders
+    vm4.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm5.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm6.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm7.invoke(WANTestBase.class, "killSender", new Object[] {});
+    
+    getLogWriter().info("Killed all the senders.");
+    
+    //restart the vm
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    
+    getLogWriter().info("Created back the cache");
+    
+   //create senders with disk store
+    vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore1, true });
+    vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore2, true });
+    vm6.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore3, true });
+    vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true });
+    
+    getLogWriter().info("Created the senders back from the disk store.");
+    
+    //create PR on local site
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    AsyncInvocation inv2 = vm5.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    AsyncInvocation inv3 = vm6.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    AsyncInvocation inv4 = vm7.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    
+    try {
+      inv1.join();
+      inv2.join();
+      inv3.join();
+      inv4.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+    
+    getLogWriter().info("Created back the partitioned regions");
+    
+    //start the senders in async mode. This will ensure that the 
+    //node of shadow PR that went down last will come up first
+    vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    getLogWriter().info("Waiting for senders running.");
+    //wait for senders running
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    getLogWriter().info("All the senders are now running...");
+    
+    //----------------------------------------------------------------------------------------------------
+    
+    //Dispatcher should be dispatching now. Do some more puts through async thread
+    AsyncInvocation async1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName, 1000 });
+    try {
+      async1.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+    }
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName, 3000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName, 3000 });
+  }
+
+  /**
+   * Test case for bug# 44275.
+   * Enable persistence for PR and GatewaySender. 
+   * Do puts into region with key as a String.
+   * Close the local site and rebuild the region and sender from disk store. 
+   * Check if the remote site receives all the events.
+   */
+  public void testPersistentPRWithPersistentGatewaySender_Restart_Bug44275() {
+    //create locator on local site
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    //create locator on remote site
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    //create receiver on remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    //create cache in local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    //create senders with disk store
+    String diskStore1 = (String) vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore2 = (String) vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore3 = (String) vm6.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+
+    getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4);
+    
+    //create PR on remote site
+    vm2.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, null, 1, 100, isOffHeap() });
+    
+    //create PR on local site
+    vm4.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+
+    //start the senders on local site
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    //wait for senders to become running
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    //pause the senders
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    
+    //start puts in region on local site
+    vm4.invoke(WANTestBase.class, "doPutsWithKeyAsString", new Object[] { testName, 1000 });
+    getLogWriter().info("Completed puts in the region");
+    
+    //--------------------close and rebuild local site -------------------------------------------------
+    //kill the senders
+    vm4.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm5.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm6.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm7.invoke(WANTestBase.class, "killSender", new Object[] {});
+    
+    getLogWriter().info("Killed all the senders.");
+    
+    //restart the vm
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    
+    getLogWriter().info("Created back the cache");
+    
+  //create senders with disk store
+    vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore1, true });
+    vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore2, true });
+    vm6.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore3, true });
+    vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true });
+    
+    getLogWriter().info("Created the senders back from the disk store.");
+    
+    //create PR on local site
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    AsyncInvocation inv2 = vm5.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    AsyncInvocation inv3 = vm6.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    AsyncInvocation inv4 = vm7.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    
+    try {
+      inv1.join();
+      inv2.join();
+      inv3.join();
+      inv4.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+    
+    getLogWriter().info("Created back the partitioned regions");
+    
+    //start the senders in async mode. This will ensure that the 
+    //node of shadow PR that went down last will come up first
+    vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    getLogWriter().info("Waiting for senders running.");
+    //wait for senders running
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    getLogWriter().info("All the senders are now running...");
+    
+    //----------------------------------------------------------------------------------------------------
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName, 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+    testName, 1000 });
+  }
+  
+  /**
+   * Test case for bug# 44275.
+   * Enable persistence for PR and GatewaySender. 
+   * Do puts into region with key as a String.
+   * Close the local site and rebuild the region and sender from disk store. 
+   * Check if the remote site receives all the events.
+   */
+  public void testPersistentPRWithPersistentGatewaySender_Restart_DoOps() {
+    //create locator on local site
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    //create locator on remote site
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    //create receiver on remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    //create cache in local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    //create senders with disk store
+    String diskStore1 = (String) vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore2 = (String) vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore3 = (String) vm6.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+
+    getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4);
+    
+    //create PR on remote site
+    vm2.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, null, 1, 100, isOffHeap() });
+    
+    //create PR on local site
+    vm4.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+
+    //start the senders on local site
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    //wait for senders to become running
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    //pause the senders
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    
+    //start puts in region on local site
+    vm4.invoke(WANTestBase.class, "doPutsWithKeyAsString", new Object[] { testName, 1000 });
+    getLogWriter().info("Completed puts in the region");
+    
+    //--------------------close and rebuild local site -------------------------------------------------
+    //kill the senders
+    vm4.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm5.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm6.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm7.invoke(WANTestBase.class, "killSender", new Object[] {});
+    
+    getLogWriter().info("Killed all the senders.");
+    
+    //restart the vm
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    
+    getLogWriter().info("Created back the cache");
+    
+  //create senders with disk store
+    vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore1, true });
+    vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore2, true });
+    vm6.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore3, true });
+    vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true });
+    
+    getLogWriter().info("Created the senders back from the disk store.");
+    
+    // create PR on local site
+    vm4.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
+        new Object[] { testName, "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
+        new Object[] { testName, "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
+        new Object[] { testName, "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
+        new Object[] { testName, "ln", 1, 100, isOffHeap() });
+    
+    getLogWriter().info("Created back the partitioned regions");
+    
+    //start the senders in async mode. This will ensure that the 
+    //node of shadow PR that went down last will come up first
+    vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    getLogWriter().info("Waiting for senders running.");
+    //wait for senders running
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    getLogWriter().info("All the senders are now running...");
+    
+    //----------------------------------------------------------------------------------------------------
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName, 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+    testName, 1000 });
+    
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 1000 });
+    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 1000 });
+    vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 1000 });
+    vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 1000 });
+    
+   //do some extra puts in region on local site
+    vm4.invoke(WANTestBase.class, "doPutsWithKeyAsString", new Object[] { testName, 10000 });
+    getLogWriter().info("Completed puts in the region");
+    
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName, 10000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+    testName, 10000 });
+  }
+  
+  public void testPersistentPR_Restart() {
+    // create locator on local site
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    // create cache in local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    // create PR on local site
+    vm4.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
+        new Object[] { testName, "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
+        new Object[] { testName, "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
+        new Object[] { testName, "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
+        new Object[] { testName, "ln", 1, 100, isOffHeap() });
+
+    // start puts in region on local site
+    vm4.invoke(WANTestBase.class, "doPutsWithKeyAsString", new Object[] {
+        testName, 1000 });
+    getLogWriter().info("Completed puts in the region");
+
+    // --------------------close and rebuild local site
+    // -------------------------------------------------
+    // kill the senders
+    vm4.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm5.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm6.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm7.invoke(WANTestBase.class, "killSender", new Object[] {});
+
+    getLogWriter().info("Killed all the senders.");
+
+    // restart the vm
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    getLogWriter().info("Created back the cache");
+
+//    // create PR on local site
+//    vm4.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
+//        new Object[] { testName, "ln", 1, 100, isOffHeap() });
+//    vm5.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
+//        new Object[] { testName, "ln", 1, 100, isOffHeap() });
+//    vm6.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
+//        new Object[] { testName, "ln", 1, 100, isOffHeap() });
+//    vm7.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
+//        new Object[] { testName, "ln", 1, 100, isOffHeap() });
+
+    // create PR on local site
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class,
+        "createPersistentPartitionedRegion", new Object[] { testName, "ln", 1,
+            100, isOffHeap() });
+    AsyncInvocation inv2 = vm5.invokeAsync(WANTestBase.class,
+        "createPersistentPartitionedRegion", new Object[] { testName, "ln", 1,
+            100, isOffHeap() });
+    AsyncInvocation inv3 = vm6.invokeAsync(WANTestBase.class,
+        "createPersistentPartitionedRegion", new Object[] { testName, "ln", 1,
+            100, isOffHeap() });
+    AsyncInvocation inv4 = vm7.invokeAsync(WANTestBase.class,
+        "createPersistentPartitionedRegion", new Object[] { testName, "ln", 1,
+            100, isOffHeap() });
+
+    try {
+      inv1.join();
+      inv2.join();
+      inv3.join();
+      inv4.join();
+    }
+    catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+
+    getLogWriter().info("Created back the partitioned regions");
+
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 1000 });
+    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 1000 });
+    vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 1000 });
+    vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 1000 });
+  }
+
+  /**
+   * Enable persistence for PR and GatewaySender. 
+   * Close the local site. 
+   * Create the local cache.
+   * Don't create back the partitioned region but create just the sender.  
+   * Check if the remote site receives all the events.
+   * NOTE: This use case is not supported yet. 
+   * For ParallelGatewaySender to start, it must be associated with a partitioned region. 
+   */
+  public void NotSupported_testPersistentPartitionedRegionWithGatewaySenderPersistenceEnabled_Restart2() {
+    //create locator on local site
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    //create locator on remote site
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    //create receiver on remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    //create cache in local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    //create senders with disk store
+    String diskStore1 = (String) vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore2 = (String) vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore3 = (String) vm6.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+
+    getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4);
+    
+    //create PR on remote site
+    vm2.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, null, 1, 100, isOffHeap() });
+    
+    //create PR on local site
+    vm4.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+
+    //start the senders on local site
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    //wait for senders to become running
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    //pause the senders
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    
+    //start puts in region on local site
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 1000 });
+    getLogWriter().info("Completed puts in the region");
+    
+    //--------------------close and rebuild local site -------------------------------------------------
+    //kill the senders
+    vm4.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm5.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm6.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm7.invoke(WANTestBase.class, "killSender", new Object[] {});
+    
+    getLogWriter().info("Killed all the senders.");
+    
+    //restart the vm
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    
+    getLogWriter().info("Created back the cache");
+    
+    
+    //create senders from disk store
+    vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore1, true });
+    vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore2, true });
+    vm6.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore3, true });
+    vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true });
+    
+    getLogWriter().info("Created the senders back from the disk store.");
+    
+    
+    //start the senders. NOTE that the senders are not associated with partitioned region
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    getLogWriter().info("Started the senders.");
+    
+    getLogWriter().info("Waiting for senders running.");
+    //wait for senders running
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    getLogWriter().info("All the senders are now running...");
+    
+    //----------------------------------------------------------------------------------------------------
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName, 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName, 1000 });
+  }
+  
+  /**
+   * Create a non persistent PR and enable persistence for GatewaySender attached to the PR.
+   * Close the local site and rebuild it. Check if the remote site receives all the events.
+   * NOTE: This use case is not supported for now. For persistent parallel gateway sender,
+   * the PR to which it is attached should also be persistent.
+   */
+  public void NotSupported_testNonPersistentPartitionedRegionWithGatewaySenderPersistenceEnabled_Restart() {
+    //create locator on local site
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    //create locator on remote site
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    //create receiver on remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    //create cache in local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    //create senders with disk store
+    String diskStore1 = (String) vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore2 = (String) vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore3 = (String) vm6.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+
+    getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4);
+    
+    //create PR on remote site
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName, null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName, null, 1, 100, isOffHeap() });
+    
+    //create non persistent PR on local site
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+
+    //start the senders on local site
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    //wait for senders to become running
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    //pause the senders
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    
+    //start puts in region on local site
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 1000 });
+    getLogWriter().info("Completed puts in the region");
+    
+    //kill the senders
+    vm4.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm5.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm6.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm7.invoke(WANTestBase.class, "killSender", new Object[] {});
+    
+    getLogWriter().info("Killed all the senders. The local site has been brought down.");
+    
+    //restart the vm
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    
+    getLogWriter().info("Created back the cache");
+    
+  //create senders with disk store
+    vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore1, true });
+    vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore2, true });
+    vm6.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore3, true });
+    vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true });
+    
+    getLogWriter().info("Created the senders back from the disk store.");
+    
+    //create PR on local site
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    
+    getLogWriter().info("Created back the partitioned regions");
+    
+    //start the senders
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    getLogWriter().info("Started the senders.");
+    
+    getLogWriter().info("Waiting for senders running.");
+    //wait for senders running
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    getLogWriter().info("All the senders are now running...");
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName, 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+    testName, 1000 });
+  }
+
+
+  /**
+   * Create persistent PR and non-persistent GatewaySender.
+   * After doing puts, close the local site. 
+   * Rebuild the PR from persistent disk store and create the sender again. 
+   * Do more puts. Check if the remote site receives newly added events.
+   * 
+   * This test can be used as DUnit test for defect #50247 reported by Indian Railways.
+   * At present, customer is using this configuration and which is not recommended 
+   * since it can lead to event loss of GatewaySender events.
+   */
+  public void Bug50247_testPersistentPartitionedRegionWithGatewaySender_Restart() {
+    //create locator on local site
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    //create locator on remote site
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    //create receiver on remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    //create cache in local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true });
+
+    //create PR on remote site
+    vm2.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, null, 1, 100, isOffHeap() });
+    
+    //create PR on local site
+    vm4.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    
+    //start the senders on local site
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    //wait for senders to become running
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    //pause the senders
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    
+    //start puts in region on local site
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 3000 });
+    getLogWriter().info("Completed puts in the region");
+    
+    //----------------- Close and rebuild local site -------------------------------------
+    //kill the senders
+    vm4.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm5.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm6.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm7.invoke(WANTestBase.class, "killSender", new Object[] {});
+    
+    getLogWriter().info("Killed all the senders.");
+    
+    //restart the vm
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    
+    getLogWriter().info("Created back the cache");
+    
+   //create back the senders
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true });
+    
+    getLogWriter().info("Created the senders again");
+    
+    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
+    vm5.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
+    vm6.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
+    vm7.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
+    
+    //start the senders
+    vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    getLogWriter().info("Started the senders.");
+    
+    getLogWriter().info("Waiting for senders running.");
+
+    //wait for senders running
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    getLogWriter().info("All the senders are now running...");
+    
+    //create PR on local site
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    AsyncInvocation inv2 = vm5.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    AsyncInvocation inv3 = vm6.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    AsyncInvocation inv4 = vm7.invokeAsync(WANTestBase.class, "createPersistentPartitionedRegion", new Object[] {
+      testName, "ln", 1, 100, isOffHeap() });
+    
+    try {
+      inv1.join();
+      inv2.join();
+      inv3.join();
+      inv4.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+    
+    getLogWriter().info("Created back the partitioned regions");
+
+    //-------------------------------------------------------------------------------------------
+    
+    //start puts in region on local site
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 3000 });
+    getLogWriter().info("Completed puts in the region");
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName, 3000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] { testName, 3000 });
+  }
+  
+  /**
+   * LocalMaxMemory of user PR is 0 (accessor region).
+   * Parallel sender persistence is enabled. 
+   * In this scenario, the PR for Parallel sender should be created with persistence = false.
+   * This is because since the region is accessor region, it won't host any buckets and 
+   * hence Parallel sender PR is not required to be persistent.
+   * This test is added for defect # 45747. 
+   */
+  public void testParallelPropagationWithSenderPerisistenceEnabledForAccessor() {
+    //create locator on local site
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    //create locator on remote site
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    //create receiver on remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    //create cache in local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, true, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, true, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, true, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, true, null, true });
+    
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegionAsAccessor", new Object[] {
+      testName + "_PR", "l

<TRUNCATED>


[27/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
new file mode 100644
index 0000000..353d7fa
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
@@ -0,0 +1,404 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.management.internal.cli.commands;
+
+import java.util.Properties;
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.PartitionAttributesFactory;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionAttributes;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.client.ClientCache;
+import com.gemstone.gemfire.cache.client.ClientCacheFactory;
+import com.gemstone.gemfire.cache.query.CqAttributesFactory;
+import com.gemstone.gemfire.cache.query.CqException;
+import com.gemstone.gemfire.cache.query.CqExistsException;
+import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.cache.query.RegionNotFoundException;
+import com.gemstone.gemfire.cache.query.data.Portfolio;
+import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.internal.AvailablePortHelper;
+import com.gemstone.gemfire.internal.cache.DistributedRegion;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.cache.PartitionedRegion;
+import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
+import com.gemstone.gemfire.management.cli.Result.Status;
+import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
+import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
+import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
+
+import dunit.Host;
+import dunit.SerializableCallable;
+import dunit.VM;
+
+
+
+public class DurableClientCommandsDUnitTest extends CliCommandTestBase {
+
+  private static final long serialVersionUID = 1L;
+  final String regionName = "stocks";
+  final String cq1 = "cq1";
+  final String cq2 = "cq2";
+  final String cq3 = "cq3";
+  final String clientName = "dc1";
+  
+  public DurableClientCommandsDUnitTest(String name) {
+    super(name);
+  }
+ 
+  public void testListDurableClientCqs() throws Exception {
+    setupSystem();
+    setupCqs();
+    
+    CommandStringBuilder csb = new CommandStringBuilder(CliStrings.LIST_DURABLE_CQS);
+    csb.addOption(CliStrings.LIST_DURABLE_CQS__DURABLECLIENTID, clientName);
+    String commandString = csb.toString();
+    writeToLog("Command String :\n ", commandString);
+    CommandResult commandResult = executeCommand(commandString);
+    String resultAsString = commandResultToString(commandResult);
+    writeToLog("Command Result :\n", resultAsString);
+    assertTrue(Status.OK.equals(commandResult.getStatus()));
+    assertTrue(resultAsString.contains(cq1));
+    assertTrue(resultAsString.contains(cq2));
+    assertTrue(resultAsString.contains(cq3));
+    
+    closeCq(cq1);
+    closeCq(cq2);
+    closeCq(cq3);
+    
+    csb = new CommandStringBuilder(CliStrings.LIST_DURABLE_CQS);
+    csb.addOption(CliStrings.LIST_DURABLE_CQS__DURABLECLIENTID, clientName);
+    commandString = csb.toString();
+    writeToLog("Command String :\n ", commandString);
+    commandResult = executeCommand(commandString);
+    resultAsString = commandResultToString(commandResult);
+    writeToLog("Command Result :\n", resultAsString);
+    assertTrue(Status.ERROR.equals(commandResult.getStatus()));
+    String errorMessage = CliStrings.format(CliStrings.LIST_DURABLE_CQS__NO__CQS__FOR__CLIENT, clientName);
+    assertTrue(resultAsString.contains(errorMessage));
+  }
+  
+  public void testCloseDurableClients() throws Exception {
+    setupSystem();
+    setupCqs();
+    closeDurableClient();
+    
+    CommandStringBuilder csb = new CommandStringBuilder(CliStrings.CLOSE_DURABLE_CLIENTS);
+    csb.addOption(CliStrings.CLOSE_DURABLE_CLIENTS__CLIENT__ID, clientName);
+    String commandString = csb.toString();
+    writeToLog("Command String : ", commandString);
+    CommandResult commandResult = executeCommand(commandString);
+    String resultAsString = commandResultToString(commandResult);
+    writeToLog("Command Result :\n", resultAsString);
+    assertTrue(Status.OK.equals(commandResult.getStatus()));
+    
+    //Execute again to see the error condition
+    writeToLog("Command String : ", commandString);
+    commandResult = executeCommand(commandString);
+    resultAsString = commandResultToString(commandResult);
+    writeToLog("Command Result :\n", resultAsString);
+    assertTrue(Status.ERROR.equals(commandResult.getStatus()));
+    String errorMessage = CliStrings.format(CliStrings.NO_CLIENT_FOUND_WITH_CLIENT_ID, clientName);
+    assertTrue(resultAsString.contains(errorMessage));
+  }
+  
+  
+  public void testCloseDurableCQ() throws Exception{
+    setupSystem();
+    setupCqs();
+  
+    closeDurableClient();
+    
+    CommandStringBuilder csb = new CommandStringBuilder(CliStrings.CLOSE_DURABLE_CQS);
+    csb.addOption(CliStrings.CLOSE_DURABLE_CQS__DURABLE__CLIENT__ID, clientName);
+    csb.addOption(CliStrings.CLOSE_DURABLE_CQS__NAME, cq1);
+    String commandString = csb.toString();
+    writeToLog("Command String : ", commandString);
+    CommandResult commandResult = executeCommand(commandString);
+    String resultAsString = commandResultToString(commandResult);
+    writeToLog("Command Result :\n", resultAsString);
+    assertTrue(Status.OK.equals(commandResult.getStatus()));
+    
+    csb = new CommandStringBuilder(CliStrings.CLOSE_DURABLE_CQS);
+    csb.addOption(CliStrings.CLOSE_DURABLE_CQS__DURABLE__CLIENT__ID, clientName);
+    csb.addOption(CliStrings.CLOSE_DURABLE_CQS__NAME, cq1);
+    commandString = csb.toString();
+    writeToLog("Command String : ", commandString);
+    commandResult = executeCommand(commandString);
+    resultAsString = commandResultToString(commandResult);
+    writeToLog("Command Result : ", resultAsString);
+    assertTrue(Status.ERROR.equals(commandResult.getStatus()));
+    
+  }
+    
+  public void testCountSubscriptionQueueSize() throws Exception {
+    setupSystem();
+    setupCqs();
+    doPuts(regionName, Host.getHost(0).getVM(1));
+    
+    CommandStringBuilder csb = new CommandStringBuilder(CliStrings.COUNT_DURABLE_CQ_EVENTS);
+    csb.addOption(CliStrings.COUNT_DURABLE_CQ_EVENTS__DURABLE__CLIENT__ID, clientName);
+    String commandString = csb.toString();
+    writeToLog("Command String : ", commandString);
+    CommandResult commandResult = executeCommand(commandString);
+    String resultAsString = commandResultToString(commandResult);
+    writeToLog("Command Result :\n", resultAsString);
+    assertTrue(Status.OK.equals(commandResult.getStatus()));
+    assertTrue(resultAsString.contains("4"));
+    
+    csb = new CommandStringBuilder(CliStrings.COUNT_DURABLE_CQ_EVENTS);
+    csb.addOption(CliStrings.COUNT_DURABLE_CQ_EVENTS__DURABLE__CLIENT__ID, clientName);
+    csb.addOption(CliStrings.COUNT_DURABLE_CQ_EVENTS__DURABLE__CQ__NAME, cq3);
+    commandString = csb.toString();
+    writeToLog("Command String : ", commandString);
+    commandResult = executeCommand(commandString);
+    resultAsString = commandResultToString(commandResult);
+    writeToLog("Command Result :\n", resultAsString);
+    assertTrue(Status.OK.equals(commandResult.getStatus()));
+    
+    //CLOSE all the  cqs
+    closeCq(cq1);
+    closeCq(cq2);
+    closeCq(cq3);
+    
+    //Run the commands again
+    csb = new CommandStringBuilder(CliStrings.COUNT_DURABLE_CQ_EVENTS);
+    csb.addOption(CliStrings.COUNT_DURABLE_CQ_EVENTS__DURABLE__CLIENT__ID, clientName);
+    csb.addOption(CliStrings.COUNT_DURABLE_CQ_EVENTS__DURABLE__CQ__NAME, cq1);
+    commandString = csb.toString();
+    writeToLog("Command String : ", commandString);
+    commandResult = executeCommand(commandString);
+    resultAsString = commandResultToString(commandResult);
+    writeToLog("Command Result :\n", resultAsString);
+    assertTrue(Status.ERROR.equals(commandResult.getStatus()));
+    String errorMessage = CliStrings.format(CliStrings.COUNT_DURABLE_CQ_EVENTS__DURABLE_CQ_NOT_FOUND, clientName, cq1);
+    assertTrue(resultAsString.contains(errorMessage));
+    
+    csb = new CommandStringBuilder(CliStrings.COUNT_DURABLE_CQ_EVENTS);
+    csb.addOption(CliStrings.COUNT_DURABLE_CQ_EVENTS__DURABLE__CLIENT__ID, clientName);
+    commandString = csb.toString();
+    writeToLog("Command String : ", commandString);
+    commandResult = executeCommand(commandString);
+    resultAsString = commandResultToString(commandResult);
+    writeToLog("Command Result :\n", resultAsString);
+    assertTrue(Status.OK.equals(commandResult.getStatus()));
+    
+    //Disconnect the client
+    closeDurableClient();
+    
+    //Close the client
+    csb = new CommandStringBuilder(CliStrings.CLOSE_DURABLE_CLIENTS);
+    csb.addOption(CliStrings.CLOSE_DURABLE_CLIENTS__CLIENT__ID, clientName);
+    commandString = csb.toString();
+    writeToLog("Command String : ", commandString);
+    commandResult = executeCommand(commandString);
+    resultAsString = commandResultToString(commandResult);
+    writeToLog("Command Result :\n", resultAsString);
+    assertTrue(Status.OK.equals(commandResult.getStatus()));
+    
+    csb = new CommandStringBuilder(CliStrings.COUNT_DURABLE_CQ_EVENTS);
+    csb.addOption(CliStrings.COUNT_DURABLE_CQ_EVENTS__DURABLE__CLIENT__ID, clientName);
+    commandString = csb.toString();
+    writeToLog("Command String : ", commandString);
+    commandResult = executeCommand(commandString);
+    resultAsString = commandResultToString(commandResult);
+    writeToLog("Command Result :\n", resultAsString);
+    assertTrue(Status.ERROR.equals(commandResult.getStatus()));
+    assertTrue(resultAsString.contains(CliStrings.format(CliStrings.NO_CLIENT_FOUND_WITH_CLIENT_ID, clientName)));
+  }
+  
+  private void writeToLog(String text, String resultAsString) {
+    getLogWriter().info(testName + "\n");
+    getLogWriter().info(resultAsString);
+  }
+  
+  private void setupSystem() throws Exception {
+    disconnectAllFromDS();
+    final int[] port = AvailablePortHelper.getRandomAvailableTCPPorts(2);
+    createDefaultSetup(getServerProperties());
+    
+    final VM manager = Host.getHost(0).getVM(0);
+    final VM server1 = Host.getHost(0).getVM(1);
+    final VM client1 = Host.getHost(0).getVM(2);
+    
+    startCacheServer(server1, port[0], false, regionName);
+    startDurableClient(client1, server1, port[0], clientName, "300");
+  }
+  
+  /**
+   * Close the cq from the client-side 
+   * @param cqName , Name of the cq which is to be close.
+   */
+  private void closeCq(final String cqName) {
+    final VM vm2 = Host.getHost(0).getVM(2);
+    vm2.invoke(new SerializableCallable() {
+      public Object call() {
+        QueryService qs = getCache().getQueryService();
+        CqAttributesFactory cqAf = new CqAttributesFactory();
+        try {
+         qs.getCq(cqName).close();
+          
+        }
+        catch (CqException e) {
+          e.printStackTrace();
+          return false;
+        }
+        return true;
+      }
+    });
+  }
+  
+  private void setupCqs() {
+    final VM vm2 = Host.getHost(0).getVM(2);
+    vm2.invoke(new SerializableCallable() {
+      public Object call() {
+        QueryService qs = getCache().getQueryService();
+        CqAttributesFactory cqAf = new CqAttributesFactory();
+        try {
+          qs.newCq(cq1, "select * from /" + regionName, cqAf.create(), true).execute();
+          qs.newCq(cq2, "select * from /" + regionName + " where id = 1", cqAf.create(), true).execute();
+          qs.newCq(cq3, "select * from /" + regionName + " where id > 2", cqAf.create(), true).execute();
+        }
+        catch (CqException e) {
+          e.printStackTrace();
+          return false;
+        }
+        catch (CqExistsException e) {
+          e.printStackTrace();
+
+          return false;
+        }
+        catch(RegionNotFoundException e) {
+          e.printStackTrace();
+
+          return false; 
+        }
+        return true;
+      }
+    });
+  }
+  
+  private void startCacheServer(VM server, final int port, 
+      final boolean createPR, final String regionName) throws Exception {
+
+    server.invoke(new SerializableCallable() {
+      public Object call() throws Exception {
+        getSystem(getServerProperties());
+        
+        GemFireCacheImpl cache = (GemFireCacheImpl)getCache();
+        AttributesFactory factory = new AttributesFactory();
+        if (createPR) {
+          PartitionAttributesFactory paf = new PartitionAttributesFactory();
+          paf.setRedundantCopies(1);
+          paf.setTotalNumBuckets(11);
+          factory.setPartitionAttributes(paf.create());
+        } else {
+          factory.setScope(Scope.DISTRIBUTED_ACK);
+          factory.setDataPolicy(DataPolicy.REPLICATE);
+        }
+        Region region = createRootRegion(regionName, factory.create());
+        if (createPR) {
+          assertTrue(region instanceof PartitionedRegion);
+        } else {
+          assertTrue(region instanceof DistributedRegion);
+        }
+        CacheServer cacheServer = getCache().addCacheServer();
+        cacheServer.setPort(port);
+        cacheServer.start();
+       
+        return null;
+      }
+    });
+  }
+  
+  private void startDurableClient(VM client, final VM server, final int port,
+      final String durableClientId, final String durableClientTimeout) {
+    client.invoke(new CacheSerializableRunnable("Start client") {
+      public void run2() throws CacheException {
+        Properties props = getClientProps(durableClientId, durableClientTimeout);
+        getSystem(props);
+        
+        final ClientCacheFactory ccf = new ClientCacheFactory(props);
+        ccf.addPoolServer(getServerHostName(server.getHost()), port);
+        ccf.setPoolSubscriptionEnabled(true);
+        
+        ClientCache cache = (ClientCache)getClientCache(ccf);
+      }
+    });
+  }
+  
+  /* Does few puts on the region on the server
+   * 
+   */
+  
+  private void doPuts(final String regionName, VM server) {
+    server.invoke(new SerializableCallable() {
+      public Object call() throws Exception {
+        GemFireCacheImpl cache = (GemFireCacheImpl)getCache();
+        Region region = cache.getRegion(regionName);
+        Portfolio p1 = new Portfolio();
+        p1.ID = 1;
+        p1.names = new String [] {"AAPL", "VMW"};
+        
+        Portfolio p2 = new Portfolio();
+        p2.ID = 2;
+        p2.names = new String [] {"EMC", "IBM"};
+        
+        Portfolio p3 = new Portfolio();
+        p3.ID = 5;
+        p3.names = new String [] {"DOW","TON"};
+        
+        Portfolio p4 = new Portfolio();
+        p4.ID = 5;
+        p4.names = new String [] {"ABC", "EBAY"};
+        
+        region.put("p1", p1);
+        region.put("p2", p2);
+        region.put("p3", p3);
+        region.put("p4", p4);
+        return null;
+      }
+    });
+  }
+  
+  //Closes the durable-client from the client side.
+  private void closeDurableClient() {
+    final VM client = Host.getHost(0).getVM(2);
+      client.invoke(new CacheSerializableRunnable("Stop client") {
+        public void run2() throws CacheException {
+          ClientCacheFactory.getAnyInstance().close(true);
+        }
+      });
+  }
+  
+  protected Properties getClientProps(String durableClientId, String durableClientTimeout) {
+    Properties p = new Properties();
+    p.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    p.setProperty(DistributionConfig.LOCATORS_NAME, "");
+    p.setProperty(DistributionConfig.DURABLE_CLIENT_ID_NAME, durableClientId);
+    p.setProperty(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, String.valueOf(durableClientTimeout));
+    return p;
+  }
+
+  protected Properties getServerProperties() {
+    Properties p = new Properties();
+    p.setProperty(DistributionConfig.LOCATORS_NAME, "localhost["+getDUnitLocatorPort()+"]");
+    return p;
+  }
+  
+  public void tearDown2() throws Exception {
+    super.tearDown2();
+    Host.getHost(0).getVM(0).invoke(CacheServerTestUtil.class, "closeCache");
+    Host.getHost(0).getVM(1).invoke(CacheServerTestUtil.class, "closeCache");
+    Host.getHost(0).getVM(2).invoke(CacheServerTestUtil.class, "closeCache");
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java
new file mode 100644
index 0000000..d855b16
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java
@@ -0,0 +1,139 @@
+/*
+ *  =========================================================================
+ *  Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ *  ========================================================================
+ */
+package com.gemstone.gemfire.management.internal.pulse;
+
+import com.gemstone.gemfire.cache.query.cq.dunit.CqQueryDUnitTest;
+import com.gemstone.gemfire.internal.AvailablePortHelper;
+import com.gemstone.gemfire.management.DistributedSystemMXBean;
+import com.gemstone.gemfire.management.ManagementService;
+import com.gemstone.gemfire.management.ManagementTestBase;
+import dunit.VM;
+
+/**
+ * This is for testing continuous query.
+ * @author ajayp
+ * 
+ */
+
+public class TestCQDUnitTest extends ManagementTestBase {
+
+  private static final long serialVersionUID = 1L;
+  private static final String queryName = "testClientWithFeederAndCQ_0";
+  private static final String queryName2 = "testClientWithFeederAndCQ_3";
+
+  protected CqQueryDUnitTest cqDUnitTest = new CqQueryDUnitTest(
+      "CqDataDUnitTest");
+
+  public TestCQDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+
+  }
+
+  public void tearDown2() throws Exception {
+    super.tearDown2();
+  }
+
+  public static long getNumOfCQ() {
+    
+    final WaitCriterion waitCriteria = new WaitCriterion() {
+      @Override
+      public boolean done() {
+        final ManagementService service = getManagementService();        
+        final DistributedSystemMXBean bean = service.getDistributedSystemMXBean();
+        if (bean != null) {
+          if(bean.getActiveCQCount() > 0){
+            return true;
+          }
+        }
+        return false;
+      }
+
+      @Override
+      public String description() {
+        return "wait for getNumOfCQ to complete and get results";
+      }
+    };
+    waitForCriterion(waitCriteria, 2 * 60 * 1000, 3000, true);    
+    final DistributedSystemMXBean bean = getManagementService().getDistributedSystemMXBean();
+    assertNotNull(bean);
+    return bean.getActiveCQCount();
+  }
+
+  public void testNumOfCQ() throws Exception {
+    initManagement(false);
+    getLogWriter().info("started testNumOfCQ");
+
+    VM server = managedNodeList.get(1);
+    VM client = managedNodeList.get(2);    
+    
+    final String host0 = getServerHostName(server.getHost());
+
+    int serverPort = AvailablePortHelper.getRandomAvailableTCPPort();
+    cqDUnitTest.createServer(server, serverPort);
+
+    final int port = server.invokeInt(CqQueryDUnitTest.class,
+        "getCacheServerPort");
+
+    cqDUnitTest.createClient(client, port, host0);    
+    cqDUnitTest.createCQ(client, queryName, cqDUnitTest.cqs[0]);    
+    cqDUnitTest.executeCQ(client, queryName, false, null);    
+    
+    cqDUnitTest.createCQ(client, queryName2, cqDUnitTest.cqs[3]);    
+    cqDUnitTest.executeCQ(client, queryName2, false, null);
+
+    final int size = 1000;    
+    cqDUnitTest.createValues(client, cqDUnitTest.regions[0], size);
+    cqDUnitTest.waitForCreated(client, queryName, CqQueryDUnitTest.KEY + size);
+    cqDUnitTest.waitForCreated(client, queryName2, CqQueryDUnitTest.KEY + size );
+    
+    
+    cqDUnitTest.validateCQ(client, queryName,
+    /* resultSize: */CqQueryDUnitTest.noTest,
+    /* creates: */size,
+    /* updates: */0,
+    /* deletes; */0,
+    /* queryInserts: */size,
+    /* queryUpdates: */0,
+    /* queryDeletes: */0,
+    /* totalEvents: */size);    
+    
+    cqDUnitTest.validateCQ(client, queryName2,
+        /* resultSize: */CqQueryDUnitTest.noTest,
+        /* creates: */size,
+        /* updates: */0,
+        /* deletes; */0,
+        /* queryInserts: */size,
+        /* queryUpdates: */0,
+        /* queryDeletes: */0,
+        /* totalEvents: */size);   
+    
+    long numOfCQ = ((Number) managingNode.invoke(TestCQDUnitTest.class,
+        "getNumOfCQ")).intValue();
+
+    getLogWriter().info("testNumOfCQ numOfCQ= " + numOfCQ);
+
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server);
+
+    assertTrue(numOfCQ > 0 ? true : false);
+  }
+
+  public void verifyStatistics() {
+
+  }
+
+  public void invokeOperations() {
+
+  }
+
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java
new file mode 100644
index 0000000..cb473df
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java
@@ -0,0 +1,101 @@
+/*
+ *  =========================================================================
+ *  Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ *  ========================================================================
+ */
+package com.gemstone.gemfire.management.internal.pulse;
+
+import com.gemstone.gemfire.cache.query.cq.dunit.CqQueryDUnitTest;
+import com.gemstone.gemfire.internal.AvailablePortHelper;
+import com.gemstone.gemfire.management.DistributedSystemMXBean;
+import com.gemstone.gemfire.management.ManagementService;
+import com.gemstone.gemfire.management.ManagementTestBase;
+
+import dunit.VM;
+
+/**
+ * This is for testing Number of clients and can be extended for relevant test
+ * addition
+ * 
+ * @author ajayp
+ * 
+ */
+
+public class TestClientsDUnitTest extends ManagementTestBase {
+
+  private static final long serialVersionUID = 1L;
+
+  public TestClientsDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+
+  }
+
+  public void tearDown2() throws Exception {
+    super.tearDown2();
+  }
+
+  public static Integer getNumOfClients() {
+    final WaitCriterion waitCriteria = new WaitCriterion() {
+      @Override
+      public boolean done() {
+        final ManagementService service = getManagementService();
+        final DistributedSystemMXBean bean = service
+            .getDistributedSystemMXBean();
+        if (bean != null) {
+          if (bean.getNumClients() > 0) {
+            return true;
+          }
+        }
+        return false;
+      }
+
+      @Override
+      public String description() {
+        return "wait for getNumOfClients bean to complete and get results";
+      }
+    };
+
+    waitForCriterion(waitCriteria, 2 * 60 * 1000, 3000, true);
+    final DistributedSystemMXBean bean = getManagementService()
+        .getDistributedSystemMXBean();
+    assertNotNull(bean);
+    return Integer.valueOf(bean.getNumClients());
+  }
+
+  protected CqQueryDUnitTest cqDUnitTest = new CqQueryDUnitTest(
+      "CqDataDUnitTest");
+
+  public void testNumOfClients() throws Exception {
+    initManagement(false);
+    VM server = managedNodeList.get(1);
+    VM client = managedNodeList.get(2);
+    int serverPort = AvailablePortHelper.getRandomAvailableTCPPort();
+    cqDUnitTest.createServer(server, serverPort);
+    final int port = server.invokeInt(CqQueryDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    cqDUnitTest.createClient(client, port, host0);
+    Integer numOfClients = (Integer) managingNode.invoke(
+        TestClientsDUnitTest.class, "getNumOfClients");
+    getLogWriter().info("testNumOfClients numOfClients = " + numOfClients);
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server);
+    assertEquals(1, numOfClients.intValue());
+  }
+
+  public void verifyStatistics() {
+
+  }
+
+  public void invokeOperations() {
+
+  }
+
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java
new file mode 100644
index 0000000..6b8d21b
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java
@@ -0,0 +1,91 @@
+/*
+ *  =========================================================================
+ *  Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ *  ========================================================================
+ */
+package com.gemstone.gemfire.management.internal.pulse;
+
+import com.gemstone.gemfire.cache.query.cq.dunit.CqQueryDUnitTest;
+import com.gemstone.gemfire.internal.AvailablePortHelper;
+import com.gemstone.gemfire.management.DistributedSystemMXBean;
+import com.gemstone.gemfire.management.ManagementService;
+import com.gemstone.gemfire.management.ManagementTestBase;
+import dunit.VM;
+
+/**
+ * This is for testing server count details from MBean
+ * @author ajayp
+ * 
+ */
+
+public class TestServerDUnitTest extends ManagementTestBase {
+
+  private static final long serialVersionUID = 1L;
+
+  public TestServerDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+
+  }
+
+  public void tearDown2() throws Exception {
+    super.tearDown2();
+  }
+
+  public static int getNumOfServersFromMBean() {
+   
+   final WaitCriterion waitCriteria = new WaitCriterion() {
+      @Override
+      public boolean done() {
+        final ManagementService service = getManagementService();        
+        final DistributedSystemMXBean bean = service.getDistributedSystemMXBean();
+        if(bean !=null){
+          if (bean.listCacheServers().length > 0) {
+            return true;
+          }
+        }
+        return false;
+      }
+      @Override
+      public String description() {
+        return "wait for getDistributedSystemMXBean to complete and get results";
+      }
+    };
+
+    waitForCriterion(waitCriteria, 2 * 60 * 1000, 3000, true);    
+    final DistributedSystemMXBean bean = getManagementService().getDistributedSystemMXBean();
+    assertNotNull(bean);
+    return bean.listCacheServers().length;
+   
+  }
+
+  protected CqQueryDUnitTest cqDUnitTest = new CqQueryDUnitTest(
+      "CqDataDUnitTest");
+
+  public void testNumOfServersDUnitTest() throws Exception {
+    initManagement(false);
+    VM server = managedNodeList.get(1);    
+    int serverPort = AvailablePortHelper.getRandomAvailableTCPPort();
+    cqDUnitTest.createServer(server, serverPort);    
+    int serverCount = ((Number) managingNode.invoke(TestServerDUnitTest.class,
+        "getNumOfServersFromMBean")).intValue();
+    getLogWriter().info("TestServerDUnitTest serverCount =" + serverCount);
+    cqDUnitTest.closeServer(server);
+    assertEquals(1, serverCount);
+  }
+
+  public void verifyStatistics() {
+
+  }
+
+  public void invokeOperations() {
+
+  }
+
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java
new file mode 100644
index 0000000..4596381
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java
@@ -0,0 +1,237 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.security;
+
+import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode;
+
+import dunit.Host;
+
+/**
+ * Tests for authorization from client to server. This tests for authorization
+ * of all operations with both valid and invalid credentials/modules with
+ * pre-operation callbacks. It also checks for authorization in case of
+ * failover.
+ * 
+ * This is the second part of the test which had become long enough to
+ * occasionally go beyond the 10min limit.
+ * 
+ * @author sumedh
+ * @since 5.5
+ */
+public class ClientAuthorizationTwoDUnitTest extends
+    ClientAuthorizationTestBase {
+
+  
+  /** constructor */
+  public ClientAuthorizationTwoDUnitTest(String name) {
+    super(name);
+  }
+
+  @Override
+  public void setUp() throws Exception {
+
+    super.setUp();
+    final Host host = Host.getHost(0);
+    server1 = host.getVM(0);
+    server2 = host.getVM(1);
+    client1 = host.getVM(2);
+    client2 = host.getVM(3);
+
+    server1.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
+        new Object[] { serverExpectedExceptions });
+    server2.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
+        new Object[] { serverExpectedExceptions });
+    client1.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
+        new Object[] { clientExpectedExceptions });
+    client2.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
+        new Object[] { clientExpectedExceptions });
+    SecurityTestUtil.registerExpectedExceptions(clientExpectedExceptions);
+  }
+
+  // Region: Tests
+
+  public void testAllOpsWithFailover2() {
+    addExpectedException("Read timed out");
+    addExpectedException("Connection reset");
+    addExpectedException("SocketTimeoutException");
+    addExpectedException("ServerConnectivityException");
+    addExpectedException("Socket Closed");
+
+    OperationWithAction[] allOps = {
+        // Register interest in all keys using list
+        new OperationWithAction(OperationCode.REGISTER_INTEREST, 3,
+            OpFlags.USE_LIST | OpFlags.CHECK_NOTAUTHZ, 4),
+        new OperationWithAction(OperationCode.REGISTER_INTEREST, 1,
+            OpFlags.USE_LIST, 4),
+        // UPDATE and test with GET
+        new OperationWithAction(OperationCode.PUT, 2),
+        new OperationWithAction(OperationCode.GET, 1, OpFlags.USE_OLDCONN
+            | OpFlags.LOCAL_OP, 4),
+
+        // Unregister interest in all keys using list
+        new OperationWithAction(OperationCode.UNREGISTER_INTEREST, 1,
+            OpFlags.USE_OLDCONN | OpFlags.USE_LIST, 4),
+        // UPDATE and test with GET for no updates
+        new OperationWithAction(OperationCode.PUT, 2, OpFlags.USE_OLDCONN
+            | OpFlags.USE_NEWVAL, 4),
+        new OperationWithAction(OperationCode.GET, 1, OpFlags.USE_OLDCONN
+            | OpFlags.LOCAL_OP, 4),
+
+        OperationWithAction.OPBLOCK_END,
+
+        // Register interest in all keys using regular expression
+        new OperationWithAction(OperationCode.REGISTER_INTEREST, 3,
+            OpFlags.USE_REGEX | OpFlags.CHECK_NOTAUTHZ, 4),
+        new OperationWithAction(OperationCode.REGISTER_INTEREST, 2,
+            OpFlags.USE_REGEX, 4),
+        // UPDATE and test with GET
+        new OperationWithAction(OperationCode.PUT),
+        new OperationWithAction(OperationCode.GET, 2, OpFlags.USE_OLDCONN
+            | OpFlags.LOCAL_OP, 4),
+
+        // Unregister interest in all keys using regular expression
+        new OperationWithAction(OperationCode.UNREGISTER_INTEREST, 2,
+            OpFlags.USE_OLDCONN | OpFlags.USE_REGEX, 4),
+        // UPDATE and test with GET for no updates
+        new OperationWithAction(OperationCode.PUT, 1, OpFlags.USE_OLDCONN
+            | OpFlags.USE_NEWVAL, 4),
+        new OperationWithAction(OperationCode.GET, 2, OpFlags.USE_OLDCONN
+            | OpFlags.LOCAL_OP, 4),
+
+        OperationWithAction.OPBLOCK_END,
+
+        // Register interest in all keys using ALL_KEYS
+        new OperationWithAction(OperationCode.REGISTER_INTEREST, 3,
+            OpFlags.USE_ALL_KEYS | OpFlags.CHECK_NOTAUTHZ, 4),
+        new OperationWithAction(OperationCode.REGISTER_INTEREST, 2,
+            OpFlags.USE_ALL_KEYS, 4),
+        // UPDATE and test with GET
+        new OperationWithAction(OperationCode.PUT),
+        new OperationWithAction(OperationCode.GET, 2, OpFlags.USE_OLDCONN
+            | OpFlags.LOCAL_OP, 4),
+
+        // Unregister interest in all keys using ALL_KEYS
+        new OperationWithAction(OperationCode.UNREGISTER_INTEREST, 2,
+            OpFlags.USE_OLDCONN | OpFlags.USE_ALL_KEYS, 4),
+        // UPDATE and test with GET for no updates
+        new OperationWithAction(OperationCode.PUT, 1, OpFlags.USE_OLDCONN
+            | OpFlags.USE_NEWVAL, 4),
+        new OperationWithAction(OperationCode.GET, 2, OpFlags.USE_OLDCONN
+            | OpFlags.LOCAL_OP, 4),
+
+        OperationWithAction.OPBLOCK_END,
+
+        // Register CQ
+        new OperationWithAction(OperationCode.PUT, 2, OpFlags.USE_NEWVAL, 4),
+        new OperationWithAction(OperationCode.EXECUTE_CQ, 3,
+            OpFlags.CHECK_NOTAUTHZ, 4),
+        new OperationWithAction(OperationCode.EXECUTE_CQ, 1,
+            OpFlags.USE_NEWVAL, 4),
+        // UPDATE and test with GET
+        new OperationWithAction(OperationCode.PUT, 2, OpFlags.USE_OLDCONN, 4),
+        new OperationWithAction(OperationCode.EXECUTE_CQ, 1,
+            OpFlags.USE_OLDCONN | OpFlags.LOCAL_OP, 4),
+
+        // Stop CQ
+        new OperationWithAction(OperationCode.STOP_CQ, 3, OpFlags.USE_OLDCONN
+            | OpFlags.CHECK_EXCEPTION, 4),
+        new OperationWithAction(OperationCode.STOP_CQ, 1, OpFlags.USE_OLDCONN,
+            4),
+        // UPDATE and test with GET for no updates
+        new OperationWithAction(OperationCode.PUT, 2, OpFlags.USE_OLDCONN
+            | OpFlags.USE_NEWVAL, 4),
+        new OperationWithAction(OperationCode.EXECUTE_CQ, 1,
+            OpFlags.USE_OLDCONN | OpFlags.CHECK_FAIL | OpFlags.LOCAL_OP, 4),
+
+        // Restart the CQ
+        new OperationWithAction(OperationCode.EXECUTE_CQ, 3, OpFlags.USE_NEWVAL
+            | OpFlags.CHECK_NOTAUTHZ, 4),
+        new OperationWithAction(OperationCode.EXECUTE_CQ, 1,
+            OpFlags.USE_OLDCONN | OpFlags.USE_NEWVAL, 4),
+        // UPDATE and test with GET
+        new OperationWithAction(OperationCode.PUT, 2, OpFlags.USE_OLDCONN, 4),
+        new OperationWithAction(OperationCode.EXECUTE_CQ, 1,
+            OpFlags.USE_OLDCONN | OpFlags.LOCAL_OP, 4),
+
+        // Close CQ
+        new OperationWithAction(OperationCode.CLOSE_CQ, 3, OpFlags.USE_OLDCONN,
+            4),
+        new OperationWithAction(OperationCode.CLOSE_CQ, 1, OpFlags.USE_OLDCONN,
+            4),
+        // UPDATE and test with GET for no updates
+        new OperationWithAction(OperationCode.PUT, 2, OpFlags.USE_OLDCONN
+            | OpFlags.USE_NEWVAL, 4),
+        new OperationWithAction(OperationCode.EXECUTE_CQ, 1,
+            OpFlags.USE_OLDCONN | OpFlags.CHECK_FAIL | OpFlags.LOCAL_OP, 4),
+
+        OperationWithAction.OPBLOCK_END,
+
+        // Do REGION_CLEAR and check with GET
+        new OperationWithAction(OperationCode.REGION_CLEAR, 3,
+            OpFlags.CHECK_NOTAUTHZ, 1),
+        new OperationWithAction(OperationCode.REGION_CLEAR, 1, OpFlags.NONE, 1),
+        new OperationWithAction(OperationCode.GET, 2, OpFlags.CHECK_NOKEY
+            | OpFlags.CHECK_FAIL, 8),
+        // Repopulate the region
+        new OperationWithAction(OperationCode.PUT),
+
+        OperationWithAction.OPBLOCK_END,
+
+        // Do REGION_CREATE and check with CREATE/GET
+        new OperationWithAction(OperationCode.REGION_CREATE, 3,
+            OpFlags.ENABLE_DRF | OpFlags.CHECK_NOTAUTHZ, 1),
+        new OperationWithAction(OperationCode.REGION_CREATE, 1,
+            OpFlags.ENABLE_DRF, 1),
+        new OperationWithAction(OperationCode.PUT, 3, OpFlags.USE_OLDCONN
+            | OpFlags.USE_SUBREGION | OpFlags.CHECK_NOTAUTHZ, 4),
+        new OperationWithAction(OperationCode.PUT, 1, OpFlags.USE_OLDCONN
+            | OpFlags.USE_SUBREGION, 4),
+        new OperationWithAction(OperationCode.GET, 2, OpFlags.CHECK_NOKEY
+            | OpFlags.USE_SUBREGION, 4),
+
+        // Do REGION_DESTROY of the sub-region and check with GET
+        new OperationWithAction(OperationCode.REGION_DESTROY, 3,
+            OpFlags.USE_OLDCONN | OpFlags.USE_SUBREGION
+                | OpFlags.NO_CREATE_SUBREGION | OpFlags.CHECK_NOTAUTHZ, 1),
+        new OperationWithAction(OperationCode.REGION_DESTROY, 1,
+            OpFlags.USE_OLDCONN | OpFlags.USE_SUBREGION
+                | OpFlags.NO_CREATE_SUBREGION, 1),
+        new OperationWithAction(OperationCode.GET, 2, OpFlags.USE_OLDCONN
+            | OpFlags.USE_SUBREGION | OpFlags.CHECK_EXCEPTION, 4),
+
+        // Do REGION_DESTROY of the region and check with GET
+        new OperationWithAction(OperationCode.REGION_DESTROY, 3,
+            OpFlags.CHECK_NOTAUTHZ, 1),
+        new OperationWithAction(OperationCode.REGION_DESTROY, 1, OpFlags.NONE,
+            1),
+        new OperationWithAction(OperationCode.GET, 2, OpFlags.CHECK_NOKEY
+            | OpFlags.CHECK_EXCEPTION, 4),
+
+        // Skip failover for region destroy since it shall fail
+        // without restarting the server
+        OperationWithAction.OPBLOCK_NO_FAILOVER };
+
+    runOpsWithFailover(allOps, "testAllOpsWithFailover2");
+  }
+
+  // End Region: Tests
+
+  @Override
+  public void tearDown2() throws Exception {
+
+    super.tearDown2();
+    // close the clients first
+    client1.invoke(SecurityTestUtil.class, "closeCache");
+    client2.invoke(SecurityTestUtil.class, "closeCache");
+    SecurityTestUtil.closeCache();
+    // then close the servers
+    server1.invoke(SecurityTestUtil.class, "closeCache");
+    server2.invoke(SecurityTestUtil.class, "closeCache");
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
new file mode 100644
index 0000000..c3adb3f
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
@@ -0,0 +1,408 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.security;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import java.util.Random;
+
+import security.CredentialGenerator;
+import security.DummyAuthzCredentialGenerator;
+import security.DummyCredentialGenerator;
+import templates.security.UserPasswordAuthInit;
+
+import com.gemstone.gemfire.DataSerializable;
+import com.gemstone.gemfire.Instantiator;
+import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.internal.AvailablePort;
+import com.gemstone.gemfire.internal.security.ObjectWithAuthz;
+
+import dunit.DistributedTestCase;
+import dunit.Host;
+import dunit.SerializableRunnable;
+
+/**
+ * Tests for authorization callback that modify objects and callbacks from
+ * client to server.
+ * 
+ * The scheme of these tests is thus: A user name terminating in integer 'i' can
+ * get values terminating with 'i', '2*i', '3*i' and so on. So 'gemfire1' can
+ * get 'value1', 'value2', ...; 'gemfire2' can get 'value2', 'value4', ... and
+ * so on. On the server side this is done by adding the index 'i' to the object
+ * in the pre-processing phase, and checked by comparing against the user name
+ * index during the post-processing phase.
+ * 
+ * This enables testing of object and callback modification both in
+ * pre-processing and post-processing phases.
+ * 
+ * @author sumedh
+ * @since 5.5
+ */
+public class ClientAuthzObjectModDUnitTest extends ClientAuthorizationTestBase {
+
+
+  /** constructor */
+  public ClientAuthzObjectModDUnitTest(String name) {
+    super(name);
+  }
+
+  private static final String preAccessor = "com.gemstone.gemfire.internal."
+      + "security.FilterPreAuthorization.create";
+
+  private static final String postAccessor = "com.gemstone.gemfire.internal."
+      + "security.FilterPostAuthorization.create";
+
+  private static class TestPostCredentialGenerator implements
+      TestCredentialGenerator {
+
+    public TestPostCredentialGenerator() {
+    }
+
+    public Properties getAllowedCredentials(OperationCode[] opCodes,
+        String[] regionNames, int[] keyIndices, int num) {
+
+      int userIndex = 1;
+      byte role = DummyAuthzCredentialGenerator.getRequiredRole(opCodes);
+      if (role == DummyAuthzCredentialGenerator.READER_ROLE) {
+        userIndex = keyIndices[0] + 1;
+      }
+      Properties props = new Properties();
+      props.setProperty(UserPasswordAuthInit.USER_NAME, "user" + userIndex);
+      props.setProperty(UserPasswordAuthInit.PASSWORD, "user" + userIndex);
+      return props;
+    }
+
+    public Properties getDisallowedCredentials(OperationCode[] opCodes,
+        String[] regionNames, int[] keyIndices, int num) {
+
+      int userIndex = 0;
+      for (int index = 0; index < keyIndices.length; ++index) {
+        if (keyIndices[index] != index) {
+          userIndex = index + 1;
+          break;
+        }
+      }
+      Properties props = new Properties();
+      props.setProperty(UserPasswordAuthInit.USER_NAME, "gemfire" + userIndex);
+      props.setProperty(UserPasswordAuthInit.PASSWORD, "gemfire" + userIndex);
+      return props;
+    }
+
+    public CredentialGenerator getCredentialGenerator() {
+
+      return null;
+    }
+  }
+
+  public void setUp() throws Exception {
+
+    super.setUp();
+    final Host host = Host.getHost(0);
+    server1 = host.getVM(0);
+    server2 = host.getVM(1);
+    client1 = host.getVM(2);
+    client2 = host.getVM(3);
+
+    server1.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
+        new Object[] { serverExpectedExceptions });
+    server2.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
+        new Object[] { serverExpectedExceptions });
+    client2.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
+        new Object[] { clientExpectedExceptions });
+    SecurityTestUtil.registerExpectedExceptions(clientExpectedExceptions);
+
+    //required by FilterPreAuthorization and FilterPostAuthorization. Normally,
+    //this would be automatically registered in the static initializer, but with dunit
+    //a previous test may have already loaded these classes. We clear the instantiators
+    //between each test.
+    SerializableRunnable registerInstantiator = new SerializableRunnable() {
+      public void run() {
+        Instantiator.register(new MyInstantiator(), false);
+      }
+    };
+    server1.invoke(registerInstantiator);
+    server2.invoke(registerInstantiator);
+  }
+  
+  public void tearDown2() throws Exception  {
+    super.tearDown2();
+    DistributedTestCase.cleanupAllVms();
+  }
+
+  // Region: Utility and static functions invoked by the tests
+
+  private static Properties buildProperties(String authenticator,
+      Properties extraProps, String preAccessor, String postAccessor) {
+
+    Properties authProps = new Properties();
+    if (authenticator != null) {
+      authProps.setProperty(
+          DistributionConfig.SECURITY_CLIENT_AUTHENTICATOR_NAME, authenticator);
+    }
+    if (preAccessor != null) {
+      authProps.setProperty(DistributionConfig.SECURITY_CLIENT_ACCESSOR_NAME,
+          preAccessor);
+    }
+    if (postAccessor != null) {
+      authProps.setProperty(
+          DistributionConfig.SECURITY_CLIENT_ACCESSOR_PP_NAME, postAccessor);
+    }
+    if (extraProps != null) {
+      authProps.putAll(extraProps);
+    }
+    return authProps;
+  }
+
+  public static Integer createCacheServer(Integer mcastPort,
+      Properties authProps) {
+
+    if (mcastPort == null) {
+      mcastPort = new Integer(AvailablePort
+          .getRandomAvailablePort(AvailablePort.SOCKET));
+    }
+    return SecurityTestUtil.createCacheServer(authProps, null, mcastPort, null,
+        null, Boolean.FALSE, new Integer(SecurityTestUtil.NO_EXCEPTION));
+  }
+
+  public static void createCacheServer(Integer loctorPort, Integer serverPort,
+      Properties authProps) {
+
+    if (loctorPort == null) {
+      loctorPort = new Integer(AvailablePort
+          .getRandomAvailablePort(AvailablePort.SOCKET));
+    }
+    SecurityTestUtil.createCacheServer(authProps, null, loctorPort, null,
+        serverPort, Boolean.FALSE, new Integer(SecurityTestUtil.NO_EXCEPTION));
+  }
+
+  // End Region: Utility and static functions invoked by the tests
+
+  // Region: Tests
+
+  public void testAllOpsObjectModWithFailover() {
+
+    OperationWithAction[] allOps = {
+        // Perform CREATE and verify with GET
+        new OperationWithAction(OperationCode.PUT, 1, OpFlags.NONE, 8),
+        // For second client connect with valid credentials for key2, key4,
+        // key6, key8 and check that other keys are not accessible
+        new OperationWithAction(OperationCode.GET, 2, OpFlags.CHECK_NOKEY,
+            new int[] { 1, 3, 5, 7 }),
+        new OperationWithAction(OperationCode.GET, 2, OpFlags.CHECK_NOKEY
+            | OpFlags.USE_OLDCONN | OpFlags.CHECK_NOTAUTHZ, new int[] { 0, 2,
+            4, 6 }),
+        // For third client check that key3, key6 are accessible but others are
+        // not
+        new OperationWithAction(OperationCode.GET, 3, OpFlags.CHECK_NOKEY,
+            new int[] { 2, 5 }),
+        new OperationWithAction(OperationCode.GET, 3, OpFlags.CHECK_NOKEY
+            | OpFlags.USE_OLDCONN | OpFlags.CHECK_NOTAUTHZ, new int[] { 0, 1,
+            3, 4, 6, 7 }),
+
+        // OPBLOCK_END indicates end of an operation block that needs to
+        // be executed on each server when doing failover
+        OperationWithAction.OPBLOCK_END,
+
+        // Perform UPDATE and verify with GET
+        new OperationWithAction(OperationCode.PUT, 1, OpFlags.USE_OLDCONN
+            | OpFlags.USE_NEWVAL, 8),
+        // For second client check that key2, key4, key6, key8 are accessible
+        // but others are not
+        new OperationWithAction(OperationCode.GET, 2, OpFlags.USE_OLDCONN
+            | OpFlags.USE_NEWVAL, new int[] { 1, 3, 5, 7 }),
+        new OperationWithAction(OperationCode.GET, 2,
+            OpFlags.USE_OLDCONN | OpFlags.USE_NEWVAL | OpFlags.CHECK_NOKEY
+                | OpFlags.CHECK_NOTAUTHZ, new int[] { 0, 2, 4, 6 }),
+        // For third client check that key3, key6 are accessible but others are
+        // not
+        new OperationWithAction(OperationCode.GET, 3, OpFlags.USE_OLDCONN
+            | OpFlags.USE_NEWVAL, new int[] { 2, 5 }),
+        new OperationWithAction(OperationCode.GET, 3,
+            OpFlags.USE_OLDCONN | OpFlags.USE_NEWVAL | OpFlags.CHECK_NOKEY
+                | OpFlags.CHECK_NOTAUTHZ, new int[] { 0, 1, 3, 4, 6, 7 }),
+
+        OperationWithAction.OPBLOCK_END,
+
+        // Perform UPDATE and verify with GET_ALL
+        new OperationWithAction(OperationCode.PUT, 1, OpFlags.USE_OLDCONN
+            | OpFlags.USE_NEWVAL, 8),
+        // For second client check that key2, key4, key6, key8 are accessible
+        // but others are not; getAll test in doOp uses a combination of local
+        // entries and remote fetches
+        new OperationWithAction(OperationCode.GET, 2, OpFlags.USE_OLDCONN
+            | OpFlags.USE_NEWVAL | OpFlags.USE_ALL_KEYS,
+            new int[] { 1, 3, 5, 7 }),
+        new OperationWithAction(OperationCode.GET, 2, OpFlags.USE_OLDCONN
+            | OpFlags.USE_NEWVAL | OpFlags.USE_ALL_KEYS | OpFlags.CHECK_NOKEY
+            | OpFlags.CHECK_FAIL, new int[] { 0, 2, 4, 6 }),
+        // For third client check that key3, key6 are accessible but others are
+        // not
+        new OperationWithAction(OperationCode.GET, 3, OpFlags.USE_OLDCONN
+            | OpFlags.USE_NEWVAL | OpFlags.USE_ALL_KEYS, new int[] { 2, 5 }),
+        new OperationWithAction(OperationCode.GET, 3, OpFlags.USE_OLDCONN
+            | OpFlags.USE_NEWVAL | OpFlags.USE_ALL_KEYS | OpFlags.CHECK_NOKEY
+            | OpFlags.CHECK_FAIL, new int[] { 0, 1, 3, 4, 6, 7 }),
+
+        // locally destroy the keys to also test create after failover
+        new OperationWithAction(OperationCode.DESTROY, 1, OpFlags.USE_OLDCONN
+            | OpFlags.LOCAL_OP, 8),
+
+        OperationWithAction.OPBLOCK_END,
+
+        // Perform PUTALL and verify with GET
+        new OperationWithAction(OperationCode.PUTALL, 1, OpFlags.USE_OLDCONN
+            | OpFlags.USE_NEWVAL, 8),
+        // For second client check that key2, key4, key6, key8 are accessible
+        // but others are not
+        new OperationWithAction(OperationCode.GET, 2, OpFlags.USE_OLDCONN
+            | OpFlags.USE_NEWVAL, new int[] { 1, 3, 5, 7 }),
+        new OperationWithAction(OperationCode.GET, 2,
+            OpFlags.USE_OLDCONN | OpFlags.USE_NEWVAL | OpFlags.CHECK_NOKEY
+                | OpFlags.CHECK_NOTAUTHZ, new int[] { 0, 2, 4, 6 }),
+        // For third client check that key3, key6 are accessible but others are
+        // not
+        new OperationWithAction(OperationCode.GET, 3, OpFlags.USE_OLDCONN
+            | OpFlags.USE_NEWVAL, new int[] { 2, 5 }),
+        new OperationWithAction(OperationCode.GET, 3,
+            OpFlags.USE_OLDCONN | OpFlags.USE_NEWVAL | OpFlags.CHECK_NOKEY
+                | OpFlags.CHECK_NOTAUTHZ, new int[] { 0, 1, 3, 4, 6, 7 }),
+
+        OperationWithAction.OPBLOCK_END,
+        
+        // Test UPDATE and verify with a QUERY
+        new OperationWithAction(OperationCode.PUT, 1, OpFlags.USE_OLDCONN, 8),
+        // For second client check that key2, key4, key6, key8 are accessible
+        // but others are not
+        new OperationWithAction(OperationCode.QUERY, 2, OpFlags.USE_OLDCONN,
+            new int[] { 1, 3, 5, 7 }),
+        new OperationWithAction(OperationCode.QUERY, 2, OpFlags.USE_OLDCONN
+            | OpFlags.CHECK_FAIL, new int[] { 0, 2, 4, 6 }),
+        // For third client check that key3, key6 are accessible but others are
+        // not
+        new OperationWithAction(OperationCode.QUERY, 3, OpFlags.USE_OLDCONN,
+            new int[] { 2, 5 }),
+        new OperationWithAction(OperationCode.QUERY, 3, OpFlags.USE_OLDCONN
+            | OpFlags.CHECK_FAIL, new int[] { 0, 1, 3, 4, 6, 7 }),
+
+        OperationWithAction.OPBLOCK_END,
+
+        // Test UPDATE and verify with a EXECUTE_CQ initial results
+        new OperationWithAction(OperationCode.PUT, 1, OpFlags.USE_OLDCONN
+            | OpFlags.USE_NEWVAL, 8),
+        // For second client check that key2, key4, key6, key8 are accessible
+        // but others are not
+        new OperationWithAction(OperationCode.EXECUTE_CQ, 2,
+            OpFlags.USE_OLDCONN | OpFlags.USE_NEWVAL, new int[] { 1, 3, 5, 7 }),
+        new OperationWithAction(OperationCode.CLOSE_CQ, 2, OpFlags.USE_OLDCONN,
+            1),
+        new OperationWithAction(OperationCode.EXECUTE_CQ, 2,
+            OpFlags.USE_OLDCONN | OpFlags.USE_NEWVAL | OpFlags.CHECK_FAIL,
+            new int[] { 0, 2, 4, 6 }),
+        new OperationWithAction(OperationCode.CLOSE_CQ, 2, OpFlags.USE_OLDCONN,
+            1),
+        // For third client check that key3, key6 are accessible but others are
+        // not
+        new OperationWithAction(OperationCode.EXECUTE_CQ, 3,
+            OpFlags.USE_OLDCONN | OpFlags.USE_NEWVAL, new int[] { 2, 5 }),
+        new OperationWithAction(OperationCode.CLOSE_CQ, 3, OpFlags.USE_OLDCONN,
+            1),
+        new OperationWithAction(OperationCode.EXECUTE_CQ, 3,
+            OpFlags.USE_OLDCONN | OpFlags.USE_NEWVAL | OpFlags.CHECK_FAIL,
+            new int[] { 0, 1, 3, 4, 6, 7 }),
+        new OperationWithAction(OperationCode.CLOSE_CQ, 3, OpFlags.USE_OLDCONN,
+            1),
+
+        OperationWithAction.OPBLOCK_END };
+
+    TestPostCredentialGenerator tgen = new TestPostCredentialGenerator();
+
+    CredentialGenerator gen = new DummyCredentialGenerator();
+    gen.init();
+    Properties extraProps = gen.getSystemProperties();
+    Properties javaProps = gen.getJavaProperties();
+    String authInit = gen.getAuthInit();
+    String authenticator = gen.getAuthenticator();
+
+    getLogWriter().info(
+        "testPutsGetsObjectModWithFailover: Using authinit: " + authInit);
+    getLogWriter().info(
+        "testPutsGetsObjectModWithFailover: Using authenticator: "
+            + authenticator);
+    getLogWriter().info(
+        "testPutsGetsObjectModWithFailover: Using pre-operation accessor: "
+            + preAccessor);
+    getLogWriter().info(
+        "testPutsGetsObjectModWithFailover: Using post-operation accessor: "
+            + postAccessor);
+
+    // Start servers with all required properties
+    Properties serverProps = buildProperties(authenticator, extraProps,
+        preAccessor, postAccessor);
+    // Get ports for the servers
+    Integer port1 = new Integer(AvailablePort
+        .getRandomAvailablePort(AvailablePort.SOCKET));
+    Integer port2 = new Integer(AvailablePort
+        .getRandomAvailablePort(AvailablePort.SOCKET));
+
+    // Perform all the ops on the clients
+    List opBlock = new ArrayList();
+    Random rnd = new Random();
+    for (int opNum = 0; opNum < allOps.length; ++opNum) {
+      // Start client with valid credentials as specified in
+      // OperationWithAction
+      OperationWithAction currentOp = allOps[opNum];
+      if (currentOp.equals(OperationWithAction.OPBLOCK_END)
+          || currentOp.equals(OperationWithAction.OPBLOCK_NO_FAILOVER)) {
+        // End of current operation block; execute all the operations
+        // on the servers with failover
+        if (opBlock.size() > 0) {
+          // Start the first server and execute the operation block
+          server1.invoke(ClientAuthorizationTestBase.class,
+              "createCacheServer", new Object[] {
+                  SecurityTestUtil.getLocatorPort(), port1, serverProps,
+                  javaProps });
+          server2.invoke(SecurityTestUtil.class, "closeCache");
+          executeOpBlock(opBlock, port1, port2, authInit, extraProps, null,
+              tgen, rnd);
+          if (!currentOp.equals(OperationWithAction.OPBLOCK_NO_FAILOVER)) {
+            // Failover to the second server and run the block again
+            server2.invoke(ClientAuthorizationTestBase.class,
+                "createCacheServer", new Object[] {
+                    SecurityTestUtil.getLocatorPort(), port2, serverProps,
+                    javaProps });
+            server1.invoke(SecurityTestUtil.class, "closeCache");
+            executeOpBlock(opBlock, port1, port2, authInit, extraProps, null,
+                tgen, rnd);
+          }
+          opBlock.clear();
+        }
+      }
+      else {
+        currentOp.setOpNum(opNum);
+        opBlock.add(currentOp);
+      }
+    }
+  }
+
+  private static class MyInstantiator extends Instantiator {
+
+    public MyInstantiator(Class clazz, int classId) {
+      super(clazz, classId);
+    }
+    public MyInstantiator() {
+      this(ObjectWithAuthz.class, ObjectWithAuthz.CLASSID);
+    }
+
+    public DataSerializable newInstance() {
+      return new ObjectWithAuthz();
+    }
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java
new file mode 100644
index 0000000..0155613
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java
@@ -0,0 +1,514 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.security;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Random;
+
+import security.AuthzCredentialGenerator;
+import security.CredentialGenerator;
+
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode;
+import com.gemstone.gemfire.cache.query.CqAttributes;
+import com.gemstone.gemfire.cache.query.CqAttributesFactory;
+import com.gemstone.gemfire.cache.query.CqException;
+import com.gemstone.gemfire.cache.query.CqListener;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.cache.query.SelectResults;
+import com.gemstone.gemfire.cache.query.cq.dunit.CqQueryTestListener;
+import com.gemstone.gemfire.cache.query.internal.cq.ClientCQImpl;
+import com.gemstone.gemfire.cache.query.internal.cq.CqService;
+import com.gemstone.gemfire.cache.query.internal.cq.InternalCqQuery;
+import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.internal.AvailablePort;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.logging.InternalLogWriter;
+
+import dunit.DistributedTestCase;
+import dunit.Host;
+import dunit.SerializableRunnable;
+/**
+ * This is for multiuser-authentication
+ * 
+ * @author ashetkar
+ *
+ */
+public class ClientCQPostAuthorizationDUnitTest extends
+    ClientAuthorizationTestBase {
+
+//  public static final String regionName = "ClientCQPostAuthorizationDUnitTest_region";
+
+  public static final Map<String, String> cqNameToQueryStrings = new HashMap<String, String>();
+
+  static {
+    cqNameToQueryStrings.put("CQ_0", "SELECT * FROM ");
+    cqNameToQueryStrings.put("CQ_1", "SELECT * FROM ");
+  }
+
+  public ClientCQPostAuthorizationDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+
+    super.setUp();
+    getSystem();
+    invokeInEveryVM(new SerializableRunnable("getSystem") {
+      public void run() {
+        getSystem();
+      }
+    });
+
+    final Host host = Host.getHost(0);
+    server1 = host.getVM(0);
+    server2 = host.getVM(1);
+    client1 = host.getVM(2);
+    client2 = host.getVM(3);
+
+    server1.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
+        new Object[] { serverExpectedExceptions });
+    server2.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
+        new Object[] { serverExpectedExceptions });
+    client2.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
+        new Object[] { clientExpectedExceptions });
+    SecurityTestUtil.registerExpectedExceptions(clientExpectedExceptions);
+  }
+
+  public void tearDown2() throws Exception {
+    super.tearDown2();
+    client1.invoke(SecurityTestUtil.class, "closeCache");
+    client2.invoke(SecurityTestUtil.class, "closeCache");
+    server1.invoke(SecurityTestUtil.class, "closeCache");
+    server2.invoke(SecurityTestUtil.class, "closeCache");
+  }
+
+  public void testAllowCQForAllMultiusers() throws Exception {
+    /*
+     * Start a server
+     * Start a client1 with two users with valid credentials and post-authz'ed for CQ
+     * Each user registers a unique CQ
+     * Client2 does some operations on the region which satisfies both the CQs
+     * Validate that listeners for both the CQs are invoked.
+     */
+    doStartUp(Integer.valueOf(2), Integer.valueOf(5), new Boolean[] {true,
+      true});
+  }
+
+  public void testDisallowCQForAllMultiusers() throws Exception {
+    /*
+     * Start a server
+     * Start a client1 with two users with valid credentials but not post-authz'ed for CQ
+     * Each user registers a unique CQ
+     * Client2 does some operations on the region which satisfies both the CQs
+     * Validate that listeners for none of the CQs are invoked.
+     */
+    doStartUp(Integer.valueOf(2), Integer.valueOf(5), new Boolean[] {false,
+      false});
+  }
+
+  public void testDisallowCQForSomeMultiusers() throws Exception {
+    /*
+     * Start a server
+     * Start a client1 with two users with valid credentials
+     * User1 is post-authz'ed for CQ but user2 is not.
+     * Each user registers a unique CQ
+     * Client2 does some operations on the region which satisfies both the CQs
+     * Validate that listener for User1's CQ is invoked but that for User2's CQ is not invoked.
+     */
+    doStartUp(Integer.valueOf(2), Integer.valueOf(5), new Boolean[] {true,
+        false});
+  }
+
+  public void testAllowCQForAllMultiusersWithFailover() throws Exception {
+    /*
+     * Start a server1
+     * Start a client1 with two users with valid credentials and post-authz'ed for CQ
+     * Each user registers a unique CQ
+     * Client2 does some operations on the region which satisfies both the CQs
+     * Validate that listeners for both the CQs are invoked.
+     * Start server2 and shutdown server1
+     * Client2 does some operations on the region which satisfies both the CQs
+     * Validate that listeners for both the CQs are get updates.
+     */
+    doStartUp(Integer.valueOf(2), Integer.valueOf(5), new Boolean[] {true,
+      true}, Boolean.TRUE);
+  }
+
+  public void doStartUp(Integer numOfUsers, Integer numOfPuts,
+      Boolean[] postAuthzAllowed) throws Exception {
+    doStartUp(numOfUsers, numOfPuts, postAuthzAllowed, Boolean.FALSE /* failover */);
+  }
+
+  public void doStartUp(Integer numOfUsers, Integer numOfPuts,
+      Boolean[] postAuthzAllowed, Boolean failover) throws Exception {
+      AuthzCredentialGenerator gen = this.getXmlAuthzGenerator();
+      CredentialGenerator cGen = gen.getCredentialGenerator();
+      Properties extraAuthProps = cGen.getSystemProperties();
+      Properties javaProps = cGen.getJavaProperties();
+      Properties extraAuthzProps = gen.getSystemProperties();
+      String authenticator = cGen.getAuthenticator();
+      String accessor = gen.getAuthorizationCallback();
+      String authInit = cGen.getAuthInit();
+      TestAuthzCredentialGenerator tgen = new TestAuthzCredentialGenerator(gen);
+
+      Properties serverProps = buildProperties(authenticator, accessor, true,
+          extraAuthProps, extraAuthzProps);
+
+      Properties opCredentials;
+      cGen = tgen.getCredentialGenerator();
+      Properties javaProps2 = null;
+      if (cGen != null) {
+        javaProps2 = cGen.getJavaProperties();
+      }
+
+      int[] indices = new int[numOfPuts];
+      for (int index = 0; index < numOfPuts; ++index) {
+        indices[index] = index;
+      }
+
+      Random rnd = new Random();
+      Properties[] authProps = new Properties[numOfUsers];
+      for (int i = 0; i < numOfUsers; i++) {
+        int rand = rnd.nextInt(100) + 1;
+        if (postAuthzAllowed[i]) {
+          opCredentials = tgen.getAllowedCredentials(new OperationCode[] {
+              OperationCode.EXECUTE_CQ, OperationCode.GET}, // For callback, GET should be allowed
+              new String[] {regionName}, indices, rand);
+//          authProps[i] = gen.getAllowedCredentials(
+//              new OperationCode[] {OperationCode.EXECUTE_CQ},
+//              new String[] {regionName}, rnd.nextInt(100) + 1);
+        } else {
+          opCredentials = tgen.getDisallowedCredentials(new OperationCode[] {
+              OperationCode.GET}, // For callback, GET should be disallowed
+              new String[] {regionName}, indices, rand);
+//          authProps[i] = gen.getDisallowedCredentials(
+//              new OperationCode[] {OperationCode.EXECUTE_CQ},
+//              new String[] {regionName}, rnd.nextInt(100) + 1);
+        }
+        authProps[i] = SecurityTestUtil.concatProperties(new Properties[] {
+            opCredentials, extraAuthProps, extraAuthzProps});
+      }
+
+      // Get ports for the servers
+      Integer port1 = Integer.valueOf(AvailablePort
+          .getRandomAvailablePort(AvailablePort.SOCKET));
+      Integer port2 = Integer.valueOf(AvailablePort
+          .getRandomAvailablePort(AvailablePort.SOCKET));
+      Integer locatorPort = Integer.valueOf(AvailablePort
+          .getRandomAvailablePort(AvailablePort.SOCKET));
+      // Close down any running servers
+      server1.invoke(SecurityTestUtil.class, "closeCache");
+      server2.invoke(SecurityTestUtil.class, "closeCache");
+
+      server1.invoke(ClientCQPostAuthorizationDUnitTest.class,
+          "createServerCache", new Object[] {serverProps, javaProps, locatorPort, port1});
+      client1.invoke(ClientCQPostAuthorizationDUnitTest.class,
+          "createClientCache", new Object[] {javaProps2, authInit, authProps,
+              new Integer[] {port1, port2}, numOfUsers, postAuthzAllowed});
+      client2.invoke(ClientCQPostAuthorizationDUnitTest.class,
+          "createClientCache", new Object[] {javaProps2, authInit, authProps,
+              new Integer[] {port1, port2}, numOfUsers, postAuthzAllowed});
+
+      client1.invoke(ClientCQPostAuthorizationDUnitTest.class, "createCQ",
+          new Object[] {numOfUsers});
+      client1.invoke(ClientCQPostAuthorizationDUnitTest.class, "executeCQ",
+          new Object[] {numOfUsers, new Boolean[] {false, false}, numOfPuts,
+              new String[numOfUsers], postAuthzAllowed});
+
+      client2.invoke(ClientCQPostAuthorizationDUnitTest.class, "doPuts",
+          new Object[] {numOfPuts, Boolean.TRUE/* put last key */});
+      if (!postAuthzAllowed[0]) {
+        // There is no point waiting as no user is authorized to receive cq events.
+        try {Thread.sleep(1000);} catch (InterruptedException ie) {}
+      } else {
+        client1.invoke(ClientCQPostAuthorizationDUnitTest.class,
+            "waitForLastKey", new Object[] {Integer.valueOf(0)});
+        if (postAuthzAllowed[1]) {
+          client1.invoke(ClientCQPostAuthorizationDUnitTest.class,
+              "waitForLastKey", new Object[] {Integer.valueOf(1)});
+        }
+      }
+      client1.invoke(ClientCQPostAuthorizationDUnitTest.class,
+          "checkCQListeners", new Object[] {numOfUsers, postAuthzAllowed,
+              numOfPuts + 1/* last key */, 0, !failover});
+      if (failover) {
+        server2.invoke(ClientCQPostAuthorizationDUnitTest.class,
+            "createServerCache", new Object[] {serverProps, javaProps, locatorPort, port2});
+        server1.invoke(SecurityTestUtil.class, "closeCache");
+
+        // Allow time for client1 to register its CQs on server2
+        server2.invoke(ClientCQPostAuthorizationDUnitTest.class,
+            "allowCQsToRegister", new Object[] {Integer.valueOf(2)});
+
+        client2.invoke(ClientCQPostAuthorizationDUnitTest.class, "doPuts",
+            new Object[] {numOfPuts, Boolean.TRUE/* put last key */});
+        client1.invoke(ClientCQPostAuthorizationDUnitTest.class,
+            "waitForLastKeyUpdate", new Object[] {Integer.valueOf(0)});
+        client1.invoke(ClientCQPostAuthorizationDUnitTest.class,
+            "checkCQListeners", new Object[] {numOfUsers, postAuthzAllowed,
+                numOfPuts + 1/* last key */, numOfPuts + 1/* last key */,
+                Boolean.TRUE});
+      }
+  }
+
+  public static void createServerCache(Properties serverProps,
+      Properties javaProps, Integer serverPort) {
+    Integer locatorPort = Integer.valueOf(AvailablePort
+        .getRandomAvailablePort(AvailablePort.SOCKET));
+    SecurityTestUtil.createCacheServer((Properties)serverProps, javaProps,
+        locatorPort, null, serverPort, Boolean.TRUE, Integer.valueOf(
+            SecurityTestUtil.NO_EXCEPTION));
+  }
+
+  public static void createServerCache(Properties serverProps,
+        Properties javaProps, Integer locatorPort, Integer serverPort) {
+    SecurityTestUtil.createCacheServer((Properties)serverProps, javaProps,
+        locatorPort, null, serverPort, Boolean.TRUE, Integer.valueOf(
+            SecurityTestUtil.NO_EXCEPTION));
+  }
+
+  public static void createClientCache(Properties javaProps, String authInit,
+      Properties[] authProps, Integer ports[], Integer numOfUsers,
+      Boolean[] postAuthzAllowed) {
+    SecurityTestUtil.createCacheClientForMultiUserMode(numOfUsers, authInit,
+        authProps, javaProps, ports, null, Boolean.FALSE,
+        SecurityTestUtil.NO_EXCEPTION);
+  }
+
+  public static void createCQ(Integer num) {
+    for (int i = 0; i < num; i++) {
+      QueryService cqService = SecurityTestUtil.proxyCaches[i].getQueryService();
+      String cqName = "CQ_" + i;
+      String queryStr = cqNameToQueryStrings.get(cqName)
+          + SecurityTestUtil.proxyCaches[i].getRegion(regionName).getFullPath();
+      // Create CQ Attributes.
+      CqAttributesFactory cqf = new CqAttributesFactory();
+      CqListener[] cqListeners = {new CqQueryTestListener(getLogWriter())};
+      ((CqQueryTestListener)cqListeners[0]).cqName = cqName;
+
+      cqf.initCqListeners(cqListeners);
+      CqAttributes cqa = cqf.create();
+
+      // Create CQ.
+      try {
+        CqQuery cq1 = cqService.newCq(cqName, queryStr, cqa);
+        assertTrue("newCq() state mismatch", cq1.getState().isStopped());
+      } catch (Exception ex) {
+        AssertionError err = new AssertionError("Failed to create CQ " + cqName
+            + " . ");
+        err.initCause(ex);
+        getLogWriter().info("CqService is :" + cqService, err);
+        throw err;
+      }
+    }
+  }
+
+  public static void executeCQ(Integer num, Boolean[] initialResults,
+      Integer expectedResultsSize, String[] expectedErr, Boolean[] postAuthzAllowed) {
+    InternalLogWriter logWriter = InternalDistributedSystem.getStaticInternalLogWriter();
+    for (int i = 0; i < num; i++) {
+      try {
+        if (expectedErr[i] != null) {
+          logWriter.info(
+              "<ExpectedException action=add>" + expectedErr[i]
+                  + "</ExpectedException>");
+        }
+        CqQuery cq1 = null;
+        String cqName = "CQ_" + i;
+        String queryStr = cqNameToQueryStrings.get(cqName)
+            + SecurityTestUtil.proxyCaches[i].getRegion(regionName)
+                .getFullPath();
+        QueryService cqService = SecurityTestUtil.proxyCaches[i]
+            .getQueryService();
+
+        // Get CqQuery object.
+        try {
+          cq1 = cqService.getCq(cqName);
+          if (cq1 == null) {
+            getLogWriter().info(
+                "Failed to get CqQuery object for CQ name: " + cqName);
+            fail("Failed to get CQ " + cqName);
+          } else {
+            getLogWriter().info("Obtained CQ, CQ name: " + cq1.getName());
+            assertTrue("newCq() state mismatch", cq1.getState().isStopped());
+          }
+        } catch (Exception ex) {
+          getLogWriter().info("CqService is :" + cqService);
+          getLogWriter().error(ex);
+          AssertionError err = new AssertionError("Failed to execute CQ "
+              + cqName);
+          err.initCause(ex);
+          throw err;
+        }
+
+        if (initialResults[i]) {
+          SelectResults cqResults = null;
+
+          try {
+            cqResults = cq1.executeWithInitialResults();
+          } catch (CqException ce) {
+            if (ce.getCause() instanceof NotAuthorizedException && !postAuthzAllowed[i]) {
+              getLogWriter().info("Got expected exception for CQ " + cqName);
+            } else {
+              getLogWriter().info("CqService is: " + cqService);
+              ce.printStackTrace();
+              AssertionError err = new AssertionError("Failed to execute CQ "
+                  + cqName);
+              err.initCause(ce);
+              throw err;
+            }
+          } catch (Exception ex) {
+            getLogWriter().info("CqService is: " + cqService);
+            ex.printStackTrace();
+            AssertionError err = new AssertionError("Failed to execute CQ "
+                + cqName);
+            err.initCause(ex);
+            throw err;
+          }
+          getLogWriter().info("initial result size = " + cqResults.size());
+          assertTrue("executeWithInitialResults() state mismatch", cq1
+              .getState().isRunning());
+          if (expectedResultsSize >= 0) {
+            assertEquals("unexpected results size", expectedResultsSize
+                .intValue(), cqResults.size());
+          }
+        } else {
+          try {
+            cq1.execute();
+          } catch (CqException ce) {
+            if (ce.getCause() instanceof NotAuthorizedException && !postAuthzAllowed[i]) {
+              getLogWriter().info("Got expected exception for CQ " + cqName);
+            } else {
+              getLogWriter().info("CqService is: " + cqService);
+              ce.printStackTrace();
+              AssertionError err = new AssertionError("Failed to execute CQ "
+                  + cqName);
+              err.initCause(ce);
+              throw err;
+            }
+          } catch (Exception ex) {
+            AssertionError err = new AssertionError("Failed to execute CQ "
+                + cqName);
+            err.initCause(ex);
+            if (expectedErr == null) {
+              getLogWriter().info("CqService is: " + cqService, err);
+            }
+            throw err;
+          }
+          assertTrue("execute() state mismatch", cq1.getState().isRunning() == postAuthzAllowed[i]);
+        }
+      } finally {
+        if (expectedErr[i] != null) {
+          logWriter.info(
+              "<ExpectedException action=remove>" + expectedErr[i]
+                  + "</ExpectedException>");
+        }
+      }
+    }
+  }
+
+  public static void doPuts(Integer num, Boolean putLastKey) {
+//    Region region = GemFireCache.getInstance().getRegion(regionName);
+    Region region = SecurityTestUtil.proxyCaches[0].getRegion(regionName);
+    for (int i = 0; i < num; i++) {
+      region.put("CQ_key"+i, "CQ_value"+i);
+    }
+    if (putLastKey) {
+      region.put("LAST_KEY", "LAST_KEY");
+    }
+  }
+
+  public static void putLastKey() {
+    Region region = GemFireCacheImpl.getInstance().getRegion(regionName);
+    region.put("LAST_KEY", "LAST_KEY");
+  }
+
+  public static void waitForLastKey(Integer cqIndex) {
+    String cqName = "CQ_" + cqIndex;
+    QueryService qService = SecurityTestUtil.proxyCaches[cqIndex].getQueryService();
+    ClientCQImpl cqQuery = (ClientCQImpl)qService.getCq(cqName);
+    ((CqQueryTestListener)cqQuery.getCqListeners()[0])
+        .waitForCreated("LAST_KEY");
+//    WaitCriterion wc = new WaitCriterion() {
+//      public boolean done() {
+//        Region region = GemFireCache.getInstance().getRegion(regionName);
+//        Region.Entry entry = region.getEntry("LAST_KEY");
+//        if (entry != null && entry.getValue() != null) {
+//          return false;
+//        } else if (entry.getValue() != null) {
+//          return true;
+//        }
+//        return false;
+//      }
+//      public String description() {
+//        return "Last key not received.";
+//      }
+//    };
+//    DistributedTestCase.waitForCriterion(wc, 60 * 1000, 100, false);
+  }
+
+  public static void waitForLastKeyUpdate(Integer cqIndex) {
+    String cqName = "CQ_" + cqIndex;
+    QueryService qService = SecurityTestUtil.proxyCaches[cqIndex].getQueryService();
+    ClientCQImpl cqQuery = (ClientCQImpl)qService.getCq(cqName);
+    ((CqQueryTestListener)cqQuery.getCqListeners()[0])
+        .waitForUpdated("LAST_KEY");
+  }
+
+  public static void allowCQsToRegister(Integer number) {
+    final int num = number;
+    WaitCriterion wc = new WaitCriterion() {
+      public boolean done() {
+        CqService cqService = GemFireCacheImpl.getInstance().getCqService();
+        cqService.start();
+        Collection<? extends InternalCqQuery> cqs = cqService.getAllCqs();
+        if (cqs != null) {
+          return cqs.size() >= num;
+        } else {
+          return false;
+        }
+      }
+
+      public String description() {
+        return num + "Waited for " + num
+            + " CQs to be registered on this server.";
+      }
+    };
+    DistributedTestCase.waitForCriterion(wc, 60 * 1000, 100, false);
+  }
+
+  public static void checkCQListeners(Integer numOfUsers,
+      Boolean[] expectedListenerInvocation, Integer createEventsSize,
+      Integer updateEventsSize, Boolean closeCache) {
+    for (int i = 0; i < numOfUsers; i++) {
+      String cqName = "CQ_" + i;
+      QueryService qService = SecurityTestUtil.proxyCaches[i].getQueryService();
+      ClientCQImpl cqQuery = (ClientCQImpl)qService.getCq(cqName);
+      if (expectedListenerInvocation[i]) {
+        for (CqListener listener : cqQuery.getCqListeners()) {
+          assertEquals(createEventsSize.intValue(),
+              ((CqQueryTestListener)listener).getCreateEventCount());
+          assertEquals(updateEventsSize.intValue(),
+              ((CqQueryTestListener)listener).getUpdateEventCount());
+        }
+      } else {
+        for (CqListener listener : cqQuery.getCqListeners()) {
+          assertEquals(0, ((CqQueryTestListener)listener).getTotalEventCount());
+        }
+      }
+      if (closeCache) {
+        SecurityTestUtil.proxyCaches[i].close();
+      }
+    }
+  }
+}


[32/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
new file mode 100755
index 0000000..649297e
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
@@ -0,0 +1,687 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.ha;
+
+import hydra.Log;
+
+import java.util.Iterator;
+import java.util.Properties;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.CacheListener;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.Declarable;
+import com.gemstone.gemfire.cache.EntryEvent;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionAttributes;
+import com.gemstone.gemfire.cache.RegionEvent;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.client.internal.PoolImpl;
+import com.gemstone.gemfire.cache.query.CqAttributes;
+import com.gemstone.gemfire.cache.query.CqAttributesFactory;
+import com.gemstone.gemfire.cache.query.CqListener;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.cache.query.cq.dunit.CqQueryTestListener;
+import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.distributed.DistributedSystem;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.internal.AvailablePort;
+import com.gemstone.gemfire.internal.cache.CacheServerImpl;
+import com.gemstone.gemfire.internal.cache.Conflatable;
+import com.gemstone.gemfire.internal.cache.HARegion;
+import com.gemstone.gemfire.internal.cache.LocalRegion;
+import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy;
+import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
+import com.gemstone.gemfire.internal.cache.tier.sockets.ConflationDUnitTest;
+import com.gemstone.gemfire.internal.cache.tier.sockets.HAEventWrapper;
+
+import dunit.DistributedTestCase;
+import dunit.Host;
+import dunit.VM;
+
+/**
+ * This Dunit test is to verify that when the dispatcher of CS dispatches the
+ * Event , the peer's HARegionQueue should get the events removed from the HA
+ * RegionQueues assuming the QRM thread has acted upon by that time
+ * This is done in the following steps
+ * 1. start server1 and server2
+ * 2. start client1 and client2
+ * 3. perform put operation from client1
+ * 4. check the entry in the regionque of client2 on server2.It should be present.
+ * 5. Wait till client2 receives event
+ * 6. Make sure that QRM is envoked
+ * 7. Again the entry in the regionque of client2 on server2.It should not be present.
+ * 8. close client1 and client2
+ * 9. close server1 and server2
+ *
+ *  @author Girish Thombare
+ */
+
+public class HADispatcherDUnitTest extends DistributedTestCase
+{
+
+  VM server1 = null;
+
+  VM server2 = null;
+
+  VM client1 = null;
+
+  VM client2 = null;
+
+  public static int PORT1;
+
+  public static int PORT2;
+
+  private static final String REGION_NAME = "HADispatcherDUnitTest_region";
+
+  protected static Cache cache = null;
+
+  public static final Object dummyObj = "dummyObject";
+
+  static volatile boolean isObjectPresent = false;
+
+  final static String KEY1 = "KEY1";
+
+  final static String VALUE1 = "VALUE1";
+
+  final static String KEY2 = "KEY2";
+
+  final static String VALUE2 = "VALUE2";
+
+  static volatile boolean waitFlag = true;
+
+  public HADispatcherDUnitTest(String name) {
+    super(name);
+  }
+
+  @Override
+  public void setUp() throws Exception
+  {
+    super.setUp();
+    final Host host = Host.getHost(0);
+    
+    // Server1 VM
+    server1 = host.getVM(0);
+
+    // Server2 VM
+    server2 = host.getVM(1);
+
+    // Client 1 VM
+    client1 = host.getVM(2);
+
+    // client 2 VM
+    client2 = host.getVM(3);
+
+    PORT1 = ((Integer)server1.invoke(HADispatcherDUnitTest.class,
+        "createServerCache", new Object[] { new Boolean(false) })).intValue();
+    server1.invoke(ConflationDUnitTest.class, "setIsSlowStart");
+    server1.invoke(HADispatcherDUnitTest.class, "makeDispatcherSlow");
+    server1.invoke(HADispatcherDUnitTest.class, "setQRMslow");
+    PORT2 = ((Integer)server2.invoke(HADispatcherDUnitTest.class,
+        "createServerCache", new Object[] { new Boolean(true) })).intValue();
+
+    client1.invoke( CacheServerTestUtil.class, "disableShufflingOfEndpoints");
+    client2.invoke( CacheServerTestUtil.class, "disableShufflingOfEndpoints");
+    client1.invoke(HADispatcherDUnitTest.class, "createClientCache",
+        new Object[] {
+            getServerHostName(Host.getHost(0)),
+            new Integer(PORT1), new Integer(PORT2),
+            new Boolean(false) });
+    client2.invoke(HADispatcherDUnitTest.class, "createClientCache",
+        new Object[] {
+            getServerHostName(Host.getHost(0)),
+            new Integer(PORT1), new Integer(PORT2),
+            new Boolean(true) });
+    //createClientCache(new Integer(PORT1), new Integer(PORT2), new Boolean(true) );
+
+  }
+
+  @Override
+  public void tearDown2() throws Exception
+  {
+    super.tearDown2();
+    client1.invoke(HADispatcherDUnitTest.class, "closeCache");
+    client2.invoke(HADispatcherDUnitTest.class, "closeCache");
+    // close server
+    server1.invoke(HADispatcherDUnitTest.class, "resetQRMslow");
+    server1.invoke(HADispatcherDUnitTest.class, "closeCache");
+    server2.invoke(HADispatcherDUnitTest.class, "closeCache");
+
+  }
+
+  public static void closeCache()
+  {
+    if (cache != null && !cache.isClosed()) {
+      cache.close();
+      cache.getDistributedSystem().disconnect();
+    }
+  }
+
+  public static void setQRMslow()
+  {
+    int oldMessageSyncInterval = cache.getMessageSyncInterval();
+    cache.setMessageSyncInterval(6);
+    try {
+      Thread.sleep((oldMessageSyncInterval + 1)*1000);
+    }
+    catch (InterruptedException e) {
+      fail("Unexcepted InterruptedException Occurred");
+    }
+  }
+
+  public static void resetQRMslow()
+  {
+    cache.setMessageSyncInterval(HARegionQueue.DEFAULT_MESSAGE_SYNC_INTERVAL);
+  }
+
+
+  public static void makeDispatcherSlow()
+  {
+    System.setProperty("slowStartTimeForTesting", "5000");
+  }
+
+  private void clientPut(VM vm, final Object key, final Object value) {
+    // performing put from the client1
+    vm.invoke(new CacheSerializableRunnable("putFromClient") {
+      @Override
+      public void run2() throws CacheException
+      {
+        Region region = cache.getRegion(Region.SEPARATOR + REGION_NAME);
+        assertNotNull(region);
+        region.put(key, value);
+      }
+    });
+  }
+
+  private void checkFromClient(VM vm) {
+    // Waiting in the client till it receives the event for the key.
+    vm.invoke(new CacheSerializableRunnable("checkFromClient") {
+      @Override
+      public void run2() throws CacheException
+      {
+        Region region = cache.getRegion(Region.SEPARATOR + REGION_NAME);
+        assertNotNull(region);
+        cache.getLogger().fine("starting the wait");        
+        synchronized (dummyObj) {
+          while (waitFlag) {
+            try {
+              dummyObj.wait(30000);
+            }
+            catch (InterruptedException e) {
+              fail("interrupted");
+            }
+          }
+        }
+        cache.getLogger().fine("wait over...waitFlag=" + waitFlag);
+        if (waitFlag)
+          fail("test failed");
+      }
+    });
+  }
+
+  private void checkFromServer(VM vm, final Object key) {
+    // Thread.sleep(10000); // why sleep if the invoke will retry?
+    //  performing check in the regionqueue of the server2
+    vm.invoke(new CacheSerializableRunnable("checkFromServer") {
+      @Override
+      public void run2() throws CacheException
+      {
+        Iterator iter = cache.getCacheServers().iterator();
+        CacheServerImpl server = (CacheServerImpl)iter.next();
+        Iterator iter_prox = server.getAcceptor().getCacheClientNotifier()
+          .getClientProxies().iterator();
+        isObjectPresent = false;
+        while (iter_prox.hasNext()) {
+          final CacheClientProxy proxy = (CacheClientProxy)iter_prox.next();
+//          ClientProxyMembershipID proxyID = proxy.getProxyID();
+/* Conflict from CQ branch ------------------------------------------------------
+          Region regionqueue = cache.getRegion(Region.SEPARATOR
+              + HARegionQueue.createRegionName(proxyID.toString()));
+          assertNotNull(regionqueue);
+          Iterator itr = regionqueue.values().iterator();
+          while (itr.hasNext()) {
+            Object obj = itr.next();
+            if (obj
+                .getClass()
+                .getName()
+                .equals(
+                "com.gemstone.gemfire.internal.cache.tier.sockets.ClientUpdateMessage")) {
+              Conflatable confObj = (Conflatable)obj;
+              Log.getLogWriter().info("value of the object ");
+              if (key.equals(confObj.getKeyToConflate()))
+                isObjectPresent = true;
+-------------------------------------------------------------------------------*/
+            //HARegion region = (HARegion)cache.getRegion(Region.SEPARATOR
+            //    + HAHelper.getRegionQueueName(proxyID.toString()));
+            //assertNotNull(region);
+            HARegion region = (HARegion) proxy.getHARegion();
+            assertNotNull(region);
+            final HARegionQueue regionQueue = region.getOwner();
+
+            WaitCriterion wc = new WaitCriterion() {
+
+              public boolean done() {
+                int sz = regionQueue.size();
+                cache.getLogger().fine("regionQueue.size()::"+ sz);
+                return sz == 0 || !proxy.isConnected();
+              }
+
+              public String description() {
+                return "regionQueue not empty with size " + regionQueue.size()
+                    + " for proxy " + proxy;
+              }
+            };
+            DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+            cache.getLogger().fine("processed a proxy");
+        }
+      }
+    });
+  }    
+  
+  public void testDispatcher() throws Exception
+  {
+    clientPut(client1, KEY1, VALUE1);
+    // Waiting in the client2 till it receives the event for the key.
+    checkFromClient(client2);
+
+    // performing check in the regionqueue of the server2
+    checkFromServer(server2, KEY1);
+    
+    // For CQ Only.
+    // performing put from the client1
+    clientPut(client1, KEY2, VALUE2);
+    checkFromClient(client2);
+    checkFromServer(server2, KEY2);
+    
+    Log.getLogWriter().info("testDispatcher() completed successfully");
+  }
+
+  /*
+   * This is to test the serialization mechanism of ClientUpdateMessage.
+   * Added after CQ support. 
+   * This could be done in different way, by overflowing the HARegion queue.
+   * 
+   */
+  public void /*test*/ClientUpdateMessageSerialization() throws Exception
+  {
+    // Update Value.
+    clientPut(client1, KEY1, VALUE1);
+    Log.getLogWriter().fine(">>>>>>>> after clientPut(c1, k1, v1)");
+    // Waiting in the client2 till it receives the event for the key.
+    checkFromClient(client2);
+    Log.getLogWriter().fine("after checkFromClient(c2)");
+
+    // performing check in the regionqueue of the server2
+    checkFromServer(server2, KEY1);
+    Log.getLogWriter().fine("after checkFromServer(s2, k1)");
+
+    // UPDATE.
+    clientPut(client1, KEY1, VALUE1);
+    Log.getLogWriter().fine("after clientPut 2 (c1, k1, v1)");
+    // Waiting in the client2 till it receives the event for the key.
+    checkFromClient(client2);
+    Log.getLogWriter().fine("after checkFromClient 2 (c2)");
+
+    // performing check in the regionqueue of the server2
+    checkFromServer(server2, KEY1);
+    Log.getLogWriter().fine("after checkFromServer 2 (s2, k1)");
+
+    Log.getLogWriter().info("testClientUpdateMessageSerialization() completed successfully");
+  }
+
+  private void createCache(Properties props) throws Exception
+  {
+    DistributedSystem ds = getSystem(props);
+    assertNotNull(ds);
+    ds.disconnect();
+    ds = getSystem(props);
+    cache = CacheFactory.create(ds);
+    assertNotNull(cache);
+  }
+
+  public static Integer createServerCache(Boolean isListenerPresent)
+      throws Exception
+  {
+    new HADispatcherDUnitTest("temp").createCache(new Properties());
+    AttributesFactory factory = new AttributesFactory();
+    factory.setScope(Scope.DISTRIBUTED_ACK);
+    factory.setDataPolicy(DataPolicy.REPLICATE);
+    if (isListenerPresent.booleanValue() == true) {
+      CacheListener serverListener = new HAServerListener();
+      factory.setCacheListener(serverListener);
+    }
+    RegionAttributes attrs = factory.create();
+    cache.createRegion(REGION_NAME, attrs);
+    CacheServerImpl server = (CacheServerImpl)cache.addCacheServer();
+    assertNotNull(server);
+    int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    server.setPort(port);
+    server.setNotifyBySubscription(true);
+    server.start();
+    return new Integer(server.getPort());
+  }
+
+  public static void createClientCache(String hostName, Integer port1, Integer port2,
+      Boolean isListenerPresent) throws Exception
+  {
+    PORT1 = port1.intValue();
+    PORT2 = port2.intValue();
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "");
+    new HADispatcherDUnitTest("temp").createCache(props);
+    AttributesFactory factory = new AttributesFactory();
+    factory.setScope(Scope.DISTRIBUTED_ACK);
+    ClientServerTestCase.configureConnectionPool(factory, hostName, new int[] {PORT1,PORT2}, true, -1, 2, null);
+    if (isListenerPresent.booleanValue() == true) {
+      CacheListener clientListener = new HAClientListener();
+      factory.setCacheListener(clientListener);
+    }
+    RegionAttributes attrs = factory.create();
+    cache.createRegion(REGION_NAME, attrs);
+    Region region = cache.getRegion(Region.SEPARATOR + REGION_NAME);
+    assertNotNull(region);
+
+    {
+      LocalRegion lr = (LocalRegion)region;
+      final PoolImpl pool = (PoolImpl)(lr.getServerProxy().getPool());
+      WaitCriterion ev = new WaitCriterion() {
+        public boolean done() {
+          return pool.getPrimary() != null;
+        }
+        public String description() {
+          return null;
+        }
+      };
+      DistributedTestCase.waitForCriterion(ev, 30 * 1000, 200, true);
+      ev = new WaitCriterion() {
+        public boolean done() {
+          return pool.getRedundants().size() >= 1;
+        }
+        public String description() {
+          return null;
+        }
+      };
+      DistributedTestCase.waitForCriterion(ev, 30 * 1000, 200, true);
+      
+      assertNotNull(pool.getPrimary());
+      assertTrue("backups="+pool.getRedundants() + " expected=" + 1,
+                 pool.getRedundants().size() >= 1);
+      assertEquals(PORT1, pool.getPrimaryPort());
+    }
+
+    region.registerInterest(KEY1);
+
+    // Register CQ.
+    createCQ(); 
+  }
+
+  private static void createCQ(){
+    QueryService cqService = null;
+    try {
+      cqService = cache.getQueryService();
+    } catch (Exception cqe) {
+      cqe.printStackTrace();
+      fail("Failed to getCQService.");
+    }
+    
+    // Create CQ Attributes.
+    CqAttributesFactory cqf = new CqAttributesFactory();
+    CqListener[] cqListeners = {new CqQueryTestListener(getLogWriter())};    
+    cqf.initCqListeners(cqListeners);
+    CqAttributes cqa = cqf.create();
+    
+    String cqName = "CQForHARegionQueueTest";
+    String queryStr = "Select * from " + Region.SEPARATOR + REGION_NAME;
+    
+    // Create CQ.
+    try {
+      CqQuery cq1 = cqService.newCq(cqName, queryStr, cqa);
+      cq1.execute();
+    } catch (Exception ex){
+      getLogWriter().info("CQService is :" + cqService);
+      ex.printStackTrace();
+      AssertionError err = new AssertionError("Failed to create/execute CQ " + cqName + " . ");
+      err.initCause(ex);
+      throw err;
+    }
+  }
+
+
+  /**
+   * This is the client listener which notifies the waiting thread when it
+   * receives the event.
+   */
+  protected static class HAClientListener extends CacheListenerAdapter implements Declarable  {
+    public void afterCreate(EntryEvent event)
+    {
+      synchronized (HADispatcherDUnitTest.dummyObj) {
+        try {
+          Object value = event.getNewValue();
+          if (value.equals(HADispatcherDUnitTest.VALUE1)) {
+            HADispatcherDUnitTest.waitFlag = false;
+            HADispatcherDUnitTest.dummyObj.notifyAll();
+          }
+        }
+        catch (Exception e) {
+          e.printStackTrace();
+        }
+      }
+    }
+
+    public void afterUpdate(EntryEvent event)
+    {
+
+    }
+
+    public void afterInvalidate(EntryEvent event)
+    {
+
+    }
+
+    public void afterDestroy(EntryEvent event)
+    {
+
+    }
+
+    public void afterRegionInvalidate(RegionEvent event)
+    {
+
+    }
+
+    public void afterRegionDestroy(RegionEvent event)
+    {
+
+    }
+
+    public void close()
+    {
+
+    }
+
+    public void init(Properties props)
+    {
+
+    }
+    public void afterRegionCreate(RegionEvent event)
+    {
+      // TODO Auto-generated method stub
+
+    }
+    public void afterRegionClear(RegionEvent event)
+    {
+      // TODO Auto-generated method stub
+
+    }
+    public void afterRegionLive(RegionEvent event)
+    {
+      // TODO NOT Auto-generated method stub, added by vrao
+
+    }
+  }
+
+  /**
+   * This is the server listener which ensures that regionqueue is properly populated
+   */
+  protected static class HAServerListener extends CacheListenerAdapter {
+    @Override
+    public void afterCreate(EntryEvent event)
+    {
+      Cache cache = event.getRegion().getCache();
+      Iterator iter = cache.getCacheServers().iterator();
+      CacheServerImpl server = (CacheServerImpl)iter.next();
+      HADispatcherDUnitTest.isObjectPresent = false;
+
+      // The event not be there in the region first time; try couple of time.
+      // This should have been replaced by listener on the HARegion and doing wait for event arrival in that.
+      while (true) { 
+        Iterator iter_prox = server.getAcceptor().getCacheClientNotifier()
+        .getClientProxies().iterator();
+        while (iter_prox.hasNext()) {
+          CacheClientProxy proxy = (CacheClientProxy)iter_prox.next();
+//          ClientProxyMembershipID proxyID = proxy.getProxyID();
+          HARegion regionForQueue = (HARegion)proxy.getHARegion();
+
+          Iterator itr = regionForQueue.values().iterator();
+          while (itr.hasNext()) {
+            Object obj = itr.next();
+            if (obj instanceof HAEventWrapper) {
+              Conflatable confObj = (Conflatable)obj;
+              if ((HADispatcherDUnitTest.KEY1).equals(confObj.getKeyToConflate()) ||
+                  (HADispatcherDUnitTest.KEY2).equals(confObj.getKeyToConflate())) {
+                HADispatcherDUnitTest.isObjectPresent = true;
+              }
+            }
+          }
+        }
+        if (HADispatcherDUnitTest.isObjectPresent == true) {
+          break; // From while.
+        }
+        try {
+          Thread.sleep(10);
+        } catch (InterruptedException ex) {fail("interrupted");}
+      }
+    }
+
+    // this test is no longer needed since these
+    // messages are not longer Externalizable
+//  /*
+//  * This is for testing ClientUpdateMessage's serialization code.
+//  */
+//  public void afterUpdate(EntryEvent event)
+//  {
+//  Log.getLogWriter().info("In HAServerListener::AfterUpdate::Event=" + event);
+//  Cache cache = event.getRegion().getCache();
+//  Iterator iter = cache.getCacheServers().iterator();
+//  BridgeServerImpl server = (BridgeServerImpl)iter.next();
+//  HADispatcherDUnitTest.isObjectPresent = false;
+
+//  // The event not be there in the region first time; try couple of time.
+//  // This should have been replaced by listener on the HARegion and doing wait for event arrival in that.
+//  while (true) { 
+
+//  Iterator iter_prox = server.getAcceptor().getCacheClientNotifier()
+//  .getClientProxies().iterator();
+//  while (iter_prox.hasNext()) {
+//  CacheClientProxy proxy = (CacheClientProxy)iter_prox.next();
+//  ClientProxyMembershipID proxyID = proxy.getProxyID();
+//  HARegion regionForQueue = (HARegion)cache.getRegion(Region.SEPARATOR
+//  + HARegionQueue.createRegionName(proxyID.toString()));
+//  if (regionForQueue == null) {
+//  // I observed dunit throwing an NPE here.
+//  // I changed it to just keep retrying which caused dunit to hang.
+//  // The queue is gone we are shutting down so just return
+//  return;
+//  }
+//  Iterator itr = regionForQueue.values().iterator();
+//  while (itr.hasNext()) {
+//  Object obj = itr.next();
+//  if (obj.getClass().getName().equals(
+//  "com.gemstone.gemfire.internal.cache.tier.sockets.ClientUpdateMessage")) {
+//  com.gemstone.gemfire.internal.cache.tier.sockets.ClientUpdateMessage clientUpdateMessage = 
+//  (com.gemstone.gemfire.internal.cache.tier.sockets.ClientUpdateMessage)obj;
+//  try{
+//  // Test for readExternal(), writeExternal().
+//  ByteArrayOutputStream outStream = new ByteArrayOutputStream();
+//  ObjectOutputStream out = new ObjectOutputStream(outStream);
+//  clientUpdateMessage.writeExternal(out);
+//  out.flush();
+//  ObjectInputStream in = new ObjectInputStream(new ByteArrayInputStream(outStream.toByteArray()));
+
+//  com.gemstone.gemfire.internal.cache.tier.sockets.ClientUpdateMessage newClientUpdateMessage = 
+//  new com.gemstone.gemfire.internal.cache.tier.sockets.ClientUpdateMessageImpl();
+
+//  newClientUpdateMessage.readExternal(in);
+
+//  Log.getLogWriter().info("Newly constructed ClientUpdateMessage is :" + newClientUpdateMessage.toString());
+//  if (!newClientUpdateMessage.hasCqs() || 
+//  ((ClientUpdateMessageImpl)newClientUpdateMessage).getClientCqs() == null ||
+//  ((ClientUpdateMessageImpl)newClientUpdateMessage).getClientCqs().size() != 2){
+//  throw new Exception("CQ Info not present");
+//  }
+//  HashMap clientCQs = ((ClientUpdateMessageImpl)newClientUpdateMessage).getClientCqs();
+
+//  // Try to print CQ details - debug.
+//  for (Iterator cciter = clientCQs.keySet().iterator(); cciter.hasNext();) {
+//  ClientProxyMembershipID proxyId = (ClientProxyMembershipID)cciter.next();
+
+//  HashMap cqs = (HashMap)clientCQs.get(proxyId);
+//  Log.getLogWriter().info("Client ID is :" + proxyId); 
+
+//  for (Iterator cqIter = cqs.keySet().iterator();cqIter.hasNext();){
+//  // Add CQ Name.
+//  String cq = (String)cqIter.next();
+//  // Add CQ Op.
+//  Log.getLogWriter().info("CQ Name :" + cq + " CQ OP :" + ((Integer)cqs.get(cq)).intValue());
+//  }
+
+//  }
+
+//  // Test for toData(), fromData().
+//  ByteArrayOutputStream dataOutStream = new ByteArrayOutputStream();
+//  DataOutputStream dataout = new DataOutputStream(dataOutStream);
+//  clientUpdateMessage.toData(dataout);
+//  dataOutStream.flush();
+//  DataInputStream datain = new DataInputStream(new ByteArrayInputStream(dataOutStream.toByteArray()));
+
+//  com.gemstone.gemfire.internal.cache.tier.sockets.ClientUpdateMessage newClientUpdateMessage2 = 
+//  new com.gemstone.gemfire.internal.cache.tier.sockets.ClientUpdateMessageImpl();
+
+//  newClientUpdateMessage2.fromData(datain);
+
+//  Log.getLogWriter().info("Newly constructed ClientUpdateMessage is :" + newClientUpdateMessage2.toString());
+//  if (!newClientUpdateMessage2.hasCqs() || 
+//  ((ClientUpdateMessageImpl)newClientUpdateMessage2).getClientCqs() == null ||
+//  ((ClientUpdateMessageImpl)newClientUpdateMessage2).getClientCqs().size() != 2){
+//  throw new Exception("CQ Info not present");
+//  }
+
+//  } catch (Exception ex) {
+//  Log.getLogWriter().info("Exception while serializing ClientUpdateMessage.", ex);
+//  return;
+//  }
+//  HADispatcherDUnitTest.isObjectPresent = true;
+//  }
+//  }
+//  }
+//  if (HADispatcherDUnitTest.isObjectPresent == true) {
+//  break; // From while.
+//  }
+//  try {
+//  Thread.sleep(10);
+//  } catch (Exception ex) {}
+//  }
+//  }
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
new file mode 100755
index 0000000..cf434b3
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
@@ -0,0 +1,1029 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.tier.sockets;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.Properties;
+
+import com.gemstone.gemfire.DeltaTestImpl;
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.AttributesMutator;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.EntryEvent;
+import com.gemstone.gemfire.cache.InterestPolicy;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionAttributes;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.SubscriptionAttributes;
+import com.gemstone.gemfire.cache.client.PoolManager;
+import com.gemstone.gemfire.cache.client.internal.ConnectionStats;
+import com.gemstone.gemfire.cache.client.internal.PoolImpl;
+import com.gemstone.gemfire.cache.query.CqAttributes;
+import com.gemstone.gemfire.cache.query.CqAttributesFactory;
+import com.gemstone.gemfire.cache.query.CqEvent;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
+import com.gemstone.gemfire.cache.util.CqListenerAdapter;
+import com.gemstone.gemfire.distributed.DistributedSystem;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.i18n.LogWriterI18n;
+import com.gemstone.gemfire.internal.AvailablePort;
+import com.gemstone.gemfire.internal.cache.CacheServerImpl;
+import com.gemstone.gemfire.internal.cache.LocalRegion;
+import com.gemstone.gemfire.internal.cache.PartitionedRegionLocalMaxMemoryDUnitTest.TestObject1;
+
+import dunit.DistributedTestCase;
+import dunit.Host;
+import dunit.VM;
+
+/**
+ * Test client to server flow for delta propogation
+ * 
+ * @author aingle
+ * @since 6.1
+ */
+public class ClientToServerDeltaDUnitTest extends DistributedTestCase {
+  /*
+   * Test configuration one server one client also 2 server 2 client
+   */
+  private static Cache cache = null;
+  
+  private static LogWriterI18n logger = null;
+
+  VM server = null;
+
+  VM server2 = null;
+
+  VM client = null;
+
+  VM client2 = null;
+
+  private static final String KEY1 = "DELTA_KEY_1";
+
+  private static final String REGION_NAME = "ClientToServerDeltaDunitTest_region";
+  
+  private static final int NO_PUT_OPERATION = 3;        
+
+  private static PoolImpl pool;
+
+  private static Object[] putDelta = { "Anil",
+      DeltaTestImpl.ERRONEOUS_STRING_FOR_FROM_DELTA, 100,
+      DeltaTestImpl.ERRONEOUS_INT_FOR_TO_DELTA };
+
+  private static int updates = 0;
+
+  private static int cqUpdates = 0;
+  
+  private static int create = 0;
+
+  private static Object firstUpdate = null;
+
+  private static Object secondUpdate = null;
+
+  private static Boolean error;
+  
+  private static boolean lastKeyReceived = false;
+  
+  private static Region region = null;
+  
+  private static CSDeltaTestImpl csDelta = null;
+  
+  public static String DELTA_KEY = "DELTA_KEY";
+  
+  private static final String[] CQs = new String[] {
+      "select * from /" + REGION_NAME,
+      "select * from /" + REGION_NAME + " where intVar = 0",
+      "select * from /" + REGION_NAME + " where intVar > 0",
+      "select * from /" + REGION_NAME + " where intVar < 0"};
+
+  public static String LAST_KEY = "LAST_KEY";
+  
+  /** constructor */
+  public ClientToServerDeltaDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    disconnectAllFromDS();
+    final Host host = Host.getHost(0);
+    server = host.getVM(0);
+    server2 = host.getVM(1);
+    client = host.getVM(2);
+    client2 = host.getVM(3);
+  }
+
+  public void tearDown2() throws Exception {
+    super.tearDown2();
+    // reset all flags
+    DeltaTestImpl.resetDeltaInvokationCounters();
+    server.invoke(DeltaTestImpl.class, "resetDeltaInvokationCounters");
+    server2.invoke(DeltaTestImpl.class, "resetDeltaInvokationCounters");
+    client.invoke(DeltaTestImpl.class, "resetDeltaInvokationCounters");
+    client2.invoke(DeltaTestImpl.class, "resetDeltaInvokationCounters");
+    // close the clients first
+    client.invoke(ClientToServerDeltaDUnitTest.class, "closeCache");
+    client2.invoke(ClientToServerDeltaDUnitTest.class, "closeCache");
+    // then close the servers
+    server.invoke(ClientToServerDeltaDUnitTest.class, "closeCache");
+    server2.invoke(ClientToServerDeltaDUnitTest.class, "closeCache");
+  }
+  
+  public void initialise(Boolean cq) {
+    initialise(Boolean.TRUE/* clone */, null, cq, Boolean.TRUE/* RI */,
+        Boolean.TRUE/* enable delta */);
+  }
+
+  public void initialise(Boolean clone, String[] queries, Boolean cq, Boolean RI, Boolean enableDelta) {
+    Integer PORT1 = ((Integer)server.invoke(ClientToServerDeltaDUnitTest.class,
+        "createServerCache",
+        new Object[] { Boolean.TRUE, Boolean.FALSE, clone, enableDelta })).intValue();
+
+    Integer PORT2 = ((Integer)server2.invoke(
+        ClientToServerDeltaDUnitTest.class, "createServerCache", new Object[] {
+            Boolean.TRUE, Boolean.FALSE, clone, enableDelta })).intValue();
+
+    client.invoke(ClientToServerDeltaDUnitTest.class, "createClientCache",
+        new Object[] { getServerHostName(server.getHost()), new Integer(PORT1),
+            Boolean.FALSE, Boolean.FALSE, Boolean.FALSE });
+
+    client2.invoke(ClientToServerDeltaDUnitTest.class, "createClientCache",
+        new Object[] { getServerHostName(server2.getHost()),
+            new Integer(PORT2), Boolean.TRUE, Boolean.FALSE, cq, queries, RI });
+  }
+
+  // Same as initialise() except listener flag is false.
+  public void initialise2(Boolean clone, String[] queries, Boolean cq, Boolean RI, Boolean enableDelta) {
+    Integer PORT1 = ((Integer)server.invoke(ClientToServerDeltaDUnitTest.class,
+        "createServerCache",
+        new Object[] { Boolean.FALSE, Boolean.FALSE, clone, enableDelta })).intValue();
+
+    Integer PORT2 = ((Integer)server2.invoke(
+        ClientToServerDeltaDUnitTest.class, "createServerCache", new Object[] {
+            Boolean.FALSE, Boolean.FALSE, clone, enableDelta })).intValue();
+
+    client.invoke(ClientToServerDeltaDUnitTest.class, "createClientCache",
+        new Object[] { getServerHostName(server.getHost()), new Integer(PORT1),
+            Boolean.FALSE, Boolean.FALSE, Boolean.FALSE });
+
+    client2.invoke(ClientToServerDeltaDUnitTest.class, "createClientCache",
+        new Object[] { getServerHostName(server2.getHost()),
+            new Integer(PORT2), Boolean.TRUE, Boolean.FALSE, cq, queries, RI });
+  }
+
+  /**
+   * This test does the following for single key (<b>failure of fromDelta-
+   * resending of full object</b>):<br>
+   * 1)Verifies that we donot loose attributes updates when delta fails<br>
+   */
+  public void testSendingofFullDeltaObjectsWhenFromDeltaFails() {
+    initialise(false);
+    // set expected value on server
+    server.invoke(ClientToServerDeltaDUnitTest.class, "setFirstSecondUpdate",
+        new Object[] { putDelta[1], (Integer)putDelta[2] });
+    client.invoke(ClientToServerDeltaDUnitTest.class, "putWithFromDeltaERR",
+        new Object[] { KEY1 });
+
+    assertTrue("to Delta Propagation feature NOT used.", ((Boolean)client
+        .invoke(DeltaTestImpl.class, "toDeltaFeatureUsed")).booleanValue());
+    assertTrue("from Delta Propagation feature NOT used.", ((Boolean)server
+        .invoke(DeltaTestImpl.class, "fromDeltaFeatureUsed")).booleanValue());
+
+    assertFalse("Delta Propagation toDeltaFailed", ((Boolean)client.invoke(
+        DeltaTestImpl.class, "isToDeltaFailure")).booleanValue());
+    assertTrue("Delta Propagation fromDelta not Failed", ((Boolean)server
+        .invoke(DeltaTestImpl.class, "isFromDeltaFailure")).booleanValue());
+
+    boolean err = ((Boolean)server.invoke(ClientToServerDeltaDUnitTest.class,
+        "getError")).booleanValue();
+    assertFalse("validation fails", err);
+  }
+
+  /**
+   * This test does the following for single key</br> 1)Verifies that we donot
+   * loose attributes updates when delta fails<br>
+   */
+  public void testPutForDeltaObjects() {
+    initialise(false);
+    // set expected value on server
+    server.invoke(ClientToServerDeltaDUnitTest.class, "setFirstSecondUpdate",
+        new Object[] { putDelta[0], (Integer)putDelta[2] });
+
+    client.invoke(ClientToServerDeltaDUnitTest.class, "put",
+        new Object[] { KEY1 });
+
+    assertTrue("to Delta Propagation feature NOT used.", ((Boolean)client
+        .invoke(DeltaTestImpl.class, "toDeltaFeatureUsed")).booleanValue());
+    assertTrue("from Delta Propagation feature NOT used.", ((Boolean)server
+        .invoke(DeltaTestImpl.class, "fromDeltaFeatureUsed")).booleanValue());
+    assertFalse("Delta Propagation toDeltaFailed", ((Boolean)client.invoke(
+        DeltaTestImpl.class, "isToDeltaFailure")).booleanValue());
+    assertFalse("Delta Propagation fromDeltaFailed", ((Boolean)server.invoke(
+        DeltaTestImpl.class, "isFromDeltaFailure")).booleanValue());
+    boolean err = ((Boolean)server.invoke(ClientToServerDeltaDUnitTest.class,
+        "getError")).booleanValue();
+    assertFalse("validation fails", err);
+  }
+
+  /**
+   * This test does the following for single key (<b> full cycle</b>):<br>
+   * 1)Verifies that client-server, peer-peer and server-client processing delta<br>
+   */
+  public void testClientToClientDeltaPropagation() throws Exception {
+    initialise(false);
+    // set expected value on s1,s1 and c2
+    server.invoke(ClientToServerDeltaDUnitTest.class, "setFirstSecondUpdate",
+        new Object[] { putDelta[0], (Integer)putDelta[2] });
+    server2.invoke(ClientToServerDeltaDUnitTest.class, "setFirstSecondUpdate",
+        new Object[] { putDelta[0], (Integer)putDelta[2] });
+    client2.invoke(ClientToServerDeltaDUnitTest.class, "setFirstSecondUpdate",
+        new Object[] { putDelta[0], (Integer)putDelta[2] });
+
+    client.invoke(ClientToServerDeltaDUnitTest.class, "putDelta",
+        new Object[] { KEY1 });
+
+    Thread.sleep(5000);
+
+    assertTrue("To Delta Propagation feature NOT used.", ((Boolean)client
+        .invoke(DeltaTestImpl.class, "toDeltaFeatureUsed")).booleanValue());
+    assertTrue("From Delta Propagation feature NOT used.", ((Boolean)server
+        .invoke(DeltaTestImpl.class, "fromDeltaFeatureUsed")).booleanValue());
+    // toDelta() should not be invoked
+    assertFalse("To Delta Propagation feature used.", ((Boolean)server
+        .invoke(DeltaTestImpl.class, "toDeltaFeatureUsed")).booleanValue());
+    assertTrue("From Delta Propagation feature NOT used.", ((Boolean)server2
+        .invoke(DeltaTestImpl.class, "fromDeltaFeatureUsed")).booleanValue());
+    // toDelta() should not be invoked
+    assertFalse("To Delta Propagation feature used.", ((Boolean)server2
+        .invoke(DeltaTestImpl.class, "toDeltaFeatureUsed")).booleanValue());
+    assertTrue("from Delta Propagation feature NOT used.", ((Boolean)client2
+        .invoke(DeltaTestImpl.class, "fromDeltaFeatureUsed")).booleanValue());
+
+    boolean err = ((Boolean)server.invoke(ClientToServerDeltaDUnitTest.class,
+        "getError")).booleanValue();
+    err = ((Boolean)server2.invoke(ClientToServerDeltaDUnitTest.class,
+        "getError")).booleanValue();
+    err = ((Boolean)client2.invoke(ClientToServerDeltaDUnitTest.class,
+        "getError")).booleanValue();
+    assertFalse("validation fails", err);
+  }
+
+  private static void putDeltaForCQ(String key, Integer numOfPuts, Integer[] cqIndices, Boolean[] satisfyQuery) {
+    Region region = cache.getRegion(REGION_NAME);
+    DeltaTestImpl val = null;
+    for (int j = 0; j < numOfPuts; j++) {
+      val = new DeltaTestImpl(0, "0", new Double(0), new byte[0],
+          new TestObject1("0", 0));
+    for(int i=0; i<cqIndices.length; i++) {
+      switch(i) {
+        case 0:
+          val.setStr("CASE_0");
+          // select *
+          break;
+        case 1:
+          val.setStr("CASE_1");
+          // select where intVar = 0
+          if (satisfyQuery[i]) {
+            val.setIntVar(0);
+          }
+          else {
+            val.setIntVar(100);
+          }
+          break;
+        case 2:
+          val.setStr("CASE_2");
+          // select where intVar > 0
+          if (satisfyQuery[i]) {
+            val.setIntVar(100);
+          }
+          else {
+            val.setIntVar(-100);
+          }
+          break;
+        case 3:
+          val.setStr("CASE_3");
+          // select where intVar < 0
+          if (satisfyQuery[i]) {
+            val.setIntVar(-100);
+          }
+          else {
+            val.setIntVar(100);
+          }
+          break;
+        default:
+          break;
+      }
+    }
+    region.put(key, val);
+    }
+  }
+
+  /*
+   * put delta ; not previous deltas
+   * 
+   */
+  private static void putDelta(String key) {
+    Region r = cache.getRegion(REGION_NAME);
+    DeltaTestImpl val = null;
+    for (int i = 0; i < NO_PUT_OPERATION; i++) {
+      val = new DeltaTestImpl(0, "0", new Double(0), new byte[0],
+          new TestObject1("0", 0));
+      switch (i) {
+        case 1:
+          val.setStr((String)putDelta[0]);
+          break;
+        case 2:
+          val.setIntVar(((Integer)putDelta[2]).intValue());
+          break;
+      }
+      r.put(key, val);
+    }
+  }
+  
+  private static void putLastKey() {
+    Region r = cache.getRegion(REGION_NAME);
+    r.put(LAST_KEY, LAST_KEY);
+  }
+
+  private static void putLastKeyWithDelta() {
+    Region r = cache.getRegion(REGION_NAME);
+    r.put(LAST_KEY, new DeltaTestImpl());
+  }
+
+  private static void setFirstSecondUpdate(Object first, Object second) {
+    firstUpdate = first;
+    secondUpdate = second;
+  }
+
+  private static Boolean getError() {
+    return error;
+  }
+
+  /*
+   * put delta full cycle
+   * 
+   */
+  private static void put(String key) {
+    Region r = cache.getRegion(REGION_NAME);
+    DeltaTestImpl val = null;
+    for (int i = 0; i < NO_PUT_OPERATION; i++) {
+      switch (i) {
+        case 0:
+          val = new DeltaTestImpl(0, "0", new Double(0), new byte[0],
+              new TestObject1("0", 0));
+          break;
+        case 1:
+          val = new DeltaTestImpl(0, "0", new Double(0), new byte[0],
+              new TestObject1("0", 0));
+          val.setStr((String)putDelta[0]);
+          break;
+        case 2:
+          val = new DeltaTestImpl(0, (String)putDelta[1], new Double(0),
+              new byte[0], new TestObject1("0", 0));
+          val.setIntVar(((Integer)putDelta[2]).intValue());
+          break;
+      }
+      r.put(key, val);
+    }
+  }
+
+  /*
+   * put delta with some times fromDelta fails to apply client sends back full
+   * object
+   */
+  private static void putWithFromDeltaERR(String key) {
+    Region r = cache.getRegion(REGION_NAME);
+    DeltaTestImpl val = null;
+    for (int i = 0; i < NO_PUT_OPERATION; i++) {
+      switch (i) {
+        case 0:
+          val = new DeltaTestImpl(0, "0", new Double(0), new byte[0],
+              new TestObject1("0", 0));
+          break;
+        case 1:
+          val = new DeltaTestImpl(0, "0", new Double(0), new byte[0],
+              new TestObject1("0", 0));
+          val.setStr((String)putDelta[1]);
+          break;
+        case 2:
+          val = new DeltaTestImpl(0, (String)putDelta[1], new Double(0),
+              new byte[0], new TestObject1("0", 0));
+          val.setIntVar(((Integer)putDelta[2]).intValue());
+          break;
+      }
+      r.put(key, val);
+    }
+  }
+
+  /*
+   * put delta with some times toDelta fails to apply; client sends back full
+   * object
+   */
+  private static void putWithTODeltaERR(String key) {
+    Region r = cache.getRegion(REGION_NAME);
+    DeltaTestImpl val = null;
+    for (int i = 0; i < NO_PUT_OPERATION; i++) {
+      switch (i) {
+        case 0:
+          val = new DeltaTestImpl(0, "0", new Double(0), new byte[0],
+              new TestObject1("0", 0));
+          break;
+        case 1:
+          val = new DeltaTestImpl(0, "0", new Double(0), new byte[0],
+              new TestObject1("0", 0));
+          val.setIntVar(((Integer)putDelta[3]).intValue());
+          break;
+        case 2:
+          val = new DeltaTestImpl(((Integer)putDelta[3]).intValue(), "0",
+              new Double(0), new byte[0], new TestObject1("0", 0));
+          val.setStr((String)putDelta[0]);
+          break;
+      }
+      r.put(key, val);
+    }
+  }
+
+  public static Integer createServerCache(Boolean attachListener,
+      Boolean isEmpty) throws Exception {
+    return createServerCache(attachListener, isEmpty, Boolean.TRUE/* clone */,
+        Boolean.TRUE/* enable delta */);
+  }
+
+  /*
+   * create server cache
+   */
+  public static Integer createServerCache(Boolean attachListener,
+      Boolean isEmpty, Boolean clone, Boolean enableDelta) throws Exception {
+    // for validation
+    updates = 0;
+    create = 0;
+    firstUpdate = null;
+    secondUpdate = null;
+    error = false;
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.DELTA_PROPAGATION_PROP_NAME,
+        enableDelta.toString());
+    new ClientToServerDeltaDUnitTest("temp").createCache(props);
+    AttributesFactory factory = new AttributesFactory();
+    factory.setScope(Scope.DISTRIBUTED_ACK);
+    factory.setConcurrencyChecksEnabled(true);
+    if (isEmpty) {
+      factory.setSubscriptionAttributes(new SubscriptionAttributes(
+          InterestPolicy.ALL));
+      factory.setDataPolicy(DataPolicy.EMPTY);
+      
+    }
+    else {
+      factory.setDataPolicy(DataPolicy.REPLICATE);
+    }
+    factory.setCloningEnabled(clone);
+    RegionAttributes attrs = factory.create();
+    region = cache.createRegion(REGION_NAME, attrs);
+    
+    AttributesMutator am = region.getAttributesMutator();
+    if (attachListener) {
+      am.addCacheListener(new CacheListenerAdapter() {
+        public void afterCreate(EntryEvent event) {
+          create++;
+        }
+
+        public void afterUpdate(EntryEvent event) {
+          switch (updates) {
+            case 0:
+              // first delta
+              validateUpdates(event, firstUpdate, "FIRST");
+              updates++;
+              break;
+            case 1:
+              // combine delta
+              validateUpdates(event, firstUpdate, "FIRST");
+              validateUpdates(event, secondUpdate, "SECOND");
+              updates++;
+              break;
+            default:
+              break;
+          }
+        }
+      });
+    } else if (!isEmpty){
+      am.addCacheListener(new CacheListenerAdapter() {
+        public void afterCreate(EntryEvent event) {
+          switch (create) {
+            case 1:
+              validateUpdates(event, firstUpdate, "FIRST");
+              create++;
+              break;
+            case 2:
+              validateUpdates(event, secondUpdate, "SECOND");
+              create++;
+              break;
+            default:
+              create++;
+              break;
+          }
+        }
+       /* public void afterUpdate(EntryEvent event) {
+          updates++;
+        }*/
+      });
+
+    }
+    
+    CacheServer server = cache.addCacheServer();
+    int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    server.setPort(port);
+    // ensures updates to be sent instead of invalidations
+    server.setNotifyBySubscription(true);
+    server.start();
+    return new Integer(server.getPort());
+  }
+
+  public static void createClientCache(String host, Integer port,
+      Boolean attachListener, Boolean isEmpty, Boolean isCq) throws Exception {
+    createClientCache(host, port, attachListener, isEmpty, isCq, new String[0], true);
+  }
+
+  public static void createClientCache(String host, Integer port,
+      Boolean attachListener, Boolean isEmpty, Boolean isCq, String[] cqQueryString) throws Exception {
+    createClientCache(host, port, attachListener, isEmpty, isCq, cqQueryString, true);
+  }
+
+  public static void createClientCache(String host, Integer port,
+      Boolean attachListener, Boolean isEmpty, Boolean isCq,
+      String[] cqQueryString, Boolean registerInterestAll) throws Exception {
+    createClientCache(host, port, attachListener, isEmpty, isCq, cqQueryString,
+        registerInterestAll, true);
+  }
+
+  /*
+   * create client cache
+   */
+  public static void createClientCache(String host, Integer port,
+      Boolean attachListener, Boolean isEmpty, Boolean isCq,
+      String[] cqQueryString, Boolean registerInterestAll,
+      Boolean enableSubscription) throws Exception {
+    updates = 0;
+    create = 0;
+    firstUpdate = null;
+    secondUpdate = null;
+    error = false;
+    lastKeyReceived = false;
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "");
+    new ClientToServerDeltaDUnitTest("temp").createCache(props);
+    pool = (PoolImpl)PoolManager.createFactory().addServer(host, port.intValue())
+        .setThreadLocalConnections(true).setMinConnections(2)
+        .setSubscriptionEnabled(enableSubscription).setSubscriptionRedundancy(0)
+        .setReadTimeout(10000).setPingInterval(1000).setSocketBufferSize(32768).create(
+            "ClientToServerDeltaDunitTestPool");
+    AttributesFactory factory = new AttributesFactory();
+    factory.setScope(Scope.DISTRIBUTED_ACK);
+    factory.setConcurrencyChecksEnabled(true);
+    if (isEmpty) {
+      factory.setSubscriptionAttributes(new SubscriptionAttributes(
+          InterestPolicy.ALL));
+      factory.setDataPolicy(DataPolicy.EMPTY);      
+    }
+    else {
+      factory.setDataPolicy(DataPolicy.NORMAL);
+    }
+    factory.setPoolName(pool.getName());
+    factory.setCloningEnabled(false);
+
+    // region with empty data policy
+    RegionAttributes attrs = factory.create();
+    region = cache.createRegion(REGION_NAME, attrs);
+    if (attachListener) {
+      region.getAttributesMutator().addCacheListener(new CacheListenerAdapter() {
+        public void afterCreate(EntryEvent event) {
+          create++;
+          if (LAST_KEY.equals(event.getKey())) {          
+            lastKeyReceived = true;
+          };
+        }
+
+        public void afterUpdate(EntryEvent event) {
+          switch (updates) {
+            case 0:
+              // first delta
+              validateUpdates(event, firstUpdate, "FIRST");
+              updates++;
+              break;
+            case 1:
+              // combine delta
+              validateUpdates(event, firstUpdate, "FIRST");
+              validateUpdates(event, secondUpdate, "SECOND");
+              updates++;
+              break;
+            default:
+              break;
+          }
+        }
+      });
+    }
+    if (registerInterestAll) {
+      region.registerInterest("ALL_KEYS");
+    }
+    if (isCq) {
+      CqAttributesFactory cqf = new CqAttributesFactory();
+      CqListenerAdapter cqlist = new CqListenerAdapter() {
+        public void onEvent(CqEvent cqEvent) {
+          Object key = cqEvent.getKey();
+          if (LAST_KEY.equals(key)) {
+            lastKeyReceived = true;
+          }
+          logger.fine("CQ event received for (key, value): (" + key + ", "
+              + cqEvent.getNewValue() + ")");
+        }
+        
+        public void onError(CqEvent cqEvent) {
+          logger.fine("CQ error received for key: " + cqEvent.getKey());
+        }
+      };  
+      cqf.addCqListener(cqlist);
+      CqAttributes cqa = cqf.create();
+      for (int i = 0; i < cqQueryString.length; i++) {
+        CqQuery cq = cache.getQueryService().newCq("Delta_Query_" + i,
+            cqQueryString[i], cqa);
+        cq.execute();
+      }
+    }
+  }
+  
+  /*
+   * create cache with properties
+   */
+  private void createCache(Properties props) throws Exception {
+    DistributedSystem ds = getSystem(props);
+    cache = CacheFactory.create(ds);
+    assertNotNull(cache);
+    logger = cache.getLoggerI18n();
+  }
+
+  // to validate updates in listener
+  private static void validateUpdates(EntryEvent event, Object obj, String str) {
+    if (obj instanceof String)
+      assertTrue(str + " update missed ", ((DeltaTestImpl)event.getNewValue())
+          .getStr().equals((String)obj));
+    else if (obj instanceof Integer)
+      assertTrue(str + " update missed ", ((DeltaTestImpl)event.getNewValue())
+          .getIntVar() == (Integer)obj);
+    else
+      error = true;
+  }
+
+  /*
+   * close cache
+   */
+  public static void closeCache() {
+    if (cache != null && !cache.isClosed()) {
+      cache.close();
+      cache.getDistributedSystem().disconnect();
+      lastKeyReceived = false;
+    }
+  }
+  /**
+   * This test does the following for single key:<br>
+   * 1)Verifies that cacheless client calls toDelta <br>
+   */
+  public void testEmptyClientAsFeederToServer() {
+    Integer PORT1 = ((Integer)server.invoke(ClientToServerDeltaDUnitTest.class,
+        "createServerCache", new Object[] { Boolean.FALSE,
+            Boolean.FALSE })).intValue();
+
+    server2.invoke(ClientToServerDeltaDUnitTest.class, "createServerCache",
+        new Object[] { Boolean.FALSE, Boolean.FALSE });
+
+    client.invoke(ClientToServerDeltaDUnitTest.class, "createClientCache",
+        new Object[] { getServerHostName(server.getHost()), new Integer(PORT1),
+            Boolean.FALSE, Boolean.TRUE, Boolean.FALSE });
+
+/*    server2.invoke(ClientToServerDeltaDUnitTest.class, "setFirstSecondUpdate",
+        new Object[] { putDelta[0], (Integer)putDelta[2] });*/
+
+    client.invoke(ClientToServerDeltaDUnitTest.class, "putDelta",
+        new Object[] { KEY1 });
+
+    client.invoke(ClientToServerDeltaDUnitTest.class, "checkTodeltaCounter",
+        new Object[] { new Integer(2)});
+    server.invoke(ClientToServerDeltaDUnitTest.class, "checkFromdeltaCounter");
+    server.invoke(ClientToServerDeltaDUnitTest.class, "checkTodeltaCounter",
+        new Object[] { new Integer(0)});
+    server2.invoke(ClientToServerDeltaDUnitTest.class, "checkFromdeltaCounter");
+    server2.invoke(ClientToServerDeltaDUnitTest.class, "checkTodeltaCounter",
+        new Object[] { new Integer(0)});
+  }
+
+  /**
+   * This test does the following for single key:<br>
+   * 1)Verifies that from delta should not called on server with empty data
+   * policy just by passed delta to data store<br>
+   */
+  public void testEmptyServerAsFeederToPeer() {
+    Integer PORT1 = ((Integer)server.invoke(ClientToServerDeltaDUnitTest.class,
+        "createServerCache", new Object[] { Boolean.FALSE,
+            Boolean.TRUE })).intValue();
+
+    server2.invoke(ClientToServerDeltaDUnitTest.class, "createServerCache",
+        new Object[] { Boolean.FALSE, Boolean.FALSE });
+
+    client.invoke(ClientToServerDeltaDUnitTest.class, "createClientCache",
+        new Object[] { getServerHostName(server.getHost()), new Integer(PORT1),
+            Boolean.FALSE, Boolean.TRUE, Boolean.FALSE });
+
+    client.invoke(ClientToServerDeltaDUnitTest.class, "putDelta",
+        new Object[] { KEY1 });
+
+    client.invoke(ClientToServerDeltaDUnitTest.class, "checkTodeltaCounter",
+        new Object[] { new Integer(2)});
+    
+    server.invoke(ClientToServerDeltaDUnitTest.class, "checkDeltaFeatureNotUsed");
+    
+    server2.invoke(ClientToServerDeltaDUnitTest.class, "checkTodeltaCounter",
+        new Object[] { new Integer(0)});
+    server2.invoke(ClientToServerDeltaDUnitTest.class, "checkFromdeltaCounter");
+    
+  }
+  
+  /**
+   * This test does verifies that server with empty data policy sends deltas to 
+   * the client which can handle deltas. Server sends full values which can not
+   * handle deltas.
+   * 
+   */
+  public void testClientsConnectedToEmptyServer() {
+    Integer PORT1 = ((Integer)server.invoke(ClientToServerDeltaDUnitTest.class,
+        "createServerCache", new Object[] { Boolean.FALSE,
+            Boolean.TRUE })).intValue();
+
+    server2.invoke(ClientToServerDeltaDUnitTest.class, "createServerCache",
+        new Object[] { Boolean.FALSE, Boolean.FALSE });
+
+    client.invoke(ClientToServerDeltaDUnitTest.class, "createClientCache",
+        new Object[] { getServerHostName(server.getHost()), new Integer(PORT1),
+            Boolean.TRUE, Boolean.TRUE, Boolean.FALSE });
+
+    client2.invoke(ClientToServerDeltaDUnitTest.class, "createClientCache",
+        new Object[] { getServerHostName(server.getHost()), new Integer(PORT1),
+            Boolean.TRUE, Boolean.FALSE, Boolean.FALSE });
+    
+    int deltaSent =  (Integer)server2.invoke(
+        ClientToServerDeltaDUnitTest.class,"putsWhichReturnsDeltaSent");
+    
+    client.invoke(ClientToServerDeltaDUnitTest.class, "waitForLastKey");    
+    client.invoke(ClientToServerDeltaDUnitTest.class, "checkForDelta");
+    
+    client2.invoke(ClientToServerDeltaDUnitTest.class, "waitForLastKey");    
+    client2.invoke(ClientToServerDeltaDUnitTest.class, "checkDeltaInvoked", new Object[]{new Integer(deltaSent)});
+    
+  }
+  
+  /**
+   * This test does the following for single key:<br>
+   * 1)Verifies that To delta called on client should be equal to fromDeltaCounter on datastore <br>
+   */
+  public void testClientNonEmptyEmptyServerAsFeederToPeer() {
+    Integer PORT1 = ((Integer)server.invoke(ClientToServerDeltaDUnitTest.class,
+        "createServerCache", new Object[] { Boolean.FALSE,
+            Boolean.TRUE })).intValue();
+
+    server2.invoke(ClientToServerDeltaDUnitTest.class, "createServerCache",
+        new Object[] { Boolean.FALSE, Boolean.FALSE });
+
+    client.invoke(ClientToServerDeltaDUnitTest.class, "createClientCache",
+        new Object[] { getServerHostName(server.getHost()), new Integer(PORT1),
+            Boolean.FALSE, Boolean.FALSE, Boolean.FALSE});
+
+    client.invoke(ClientToServerDeltaDUnitTest.class, "putDelta",
+        new Object[] { KEY1 });
+
+    client.invoke(ClientToServerDeltaDUnitTest.class, "checkTodeltaCounter",
+        new Object[] { new Integer(2)});
+    
+    server.invoke(ClientToServerDeltaDUnitTest.class, "checkDeltaFeatureNotUsed");
+    
+    server2.invoke(ClientToServerDeltaDUnitTest.class, "checkTodeltaCounter",
+        new Object[] { new Integer(0)});
+    server2.invoke(ClientToServerDeltaDUnitTest.class, "checkFromdeltaCounter");
+    
+  }
+
+  /**
+   * This test has client1 connected to server1 and client2 connected to
+   * server2. client2 has a CQ registered on the server2. client1 creates a key
+   * on server1 which satisfies the CQ and it then updates the same key with a
+   * value so that it sould not satisfy the CQ. The cloning is set to false. The
+   * test ensures that the client2 gets the update event. This implies that
+   * server2 clones the old value prior to applying delta received from server1
+   * and then processes the CQ.
+   * 
+   * @throws Exception
+   */
+  public void testC2CDeltaPropagationWithCQ() throws Exception {
+    initialise(false/* clone */, new String[] { CQs[1] }, true/* CQ */,
+        true/* RI */, true/* enable delta */);
+    client.invoke(ClientToServerDeltaDUnitTest.class, "createKeys",
+        new Object[] { new String[] { KEY1 } });
+    client.invoke(ClientToServerDeltaDUnitTest.class, "putDeltaForCQ",
+        new Object[] { KEY1, new Integer(1), new Integer[] { 1 },
+            new Boolean[] { false, true, false, false } });
+    
+    client.invoke(ClientToServerDeltaDUnitTest.class, "putLastKeyWithDelta");
+    
+    client2.invoke(ClientToServerDeltaDUnitTest.class, "waitForLastKey");
+    client2.invoke(ClientToServerDeltaDUnitTest.class, "verifyDeltaReceived");    
+  }
+
+  /**
+   * This test ensures that a server sends delta bytes to a client even if that
+   * client is not interested in that event but is getting the event only
+   * because the event satisfies a CQ which the client has registered with the
+   * server.
+   * 
+   * @throws Exception
+   */
+  public void testC2CDeltaPropagationWithCQWithoutRI() throws Exception {
+    initialise(false/* clone */, new String[] { CQs[1] }, true/* CQ */,
+        false/* RI */, true/* enable delta */);
+
+    client.invoke(ClientToServerDeltaDUnitTest.class, "createKeys",
+        new Object[] { new String[] { KEY1 } });
+    client.invoke(ClientToServerDeltaDUnitTest.class, "putDeltaForCQ",
+        new Object[] { KEY1, new Integer(1), new Integer[] { 1 },
+            new Boolean[] { false, true, false, false } });
+    
+    client.invoke(ClientToServerDeltaDUnitTest.class, "putLastKeyWithDelta");
+    
+    client2.invoke(ClientToServerDeltaDUnitTest.class, "waitForLastKey");
+    server2.invoke(ClientToServerDeltaDUnitTest.class, "verifyDeltaSent",
+        new Object[] { Integer.valueOf(1) });
+  }
+
+  public void testClientSendsFullValueToServerWhenDeltaOffAtServer() {
+    initialise2(false/* clone */, new String[] { CQs[1] }, false/* CQ */,
+        true/* RI */, false/* enable delta */);
+    // set expected value on server
+    server.invoke(ClientToServerDeltaDUnitTest.class, "setFirstSecondUpdate",
+        new Object[] { putDelta[0], (Integer)putDelta[2] });
+
+    client.invoke(ClientToServerDeltaDUnitTest.class, "putDelta",
+        new Object[] { DELTA_KEY });
+
+    assertFalse("Delta Propagation feature used at client.", (Boolean)client
+        .invoke(DeltaTestImpl.class, "toDeltaFeatureUsed"));
+    assertFalse("Delta Propagation feature used at server.", (Boolean)server
+        .invoke(DeltaTestImpl.class, "fromDeltaFeatureUsed"));
+    assertFalse(
+        "Failures at client while calculating delta. But delta-propagation is false at server.",
+        ((Boolean)client.invoke(DeltaTestImpl.class, "isToDeltaFailure"))
+            .booleanValue());
+    assertFalse(
+        "Failures at server while applying delta. But delta-propagation is false at server.",
+        (Boolean)server.invoke(DeltaTestImpl.class, "isFromDeltaFailure"));
+  }
+
+  public void testC2SDeltaPropagationWithOldValueInvalidatedAtServer()
+      throws Exception {
+    String key = "DELTA_KEY";
+    Integer port1 = (Integer)server.invoke(ClientToServerDeltaDUnitTest.class,
+        "createServerCache", new Object[] {false, false, false, true});
+    createClientCache("localhost", port1, false, false, false, null, false,
+        false);
+
+    LocalRegion region = (LocalRegion)cache.getRegion(REGION_NAME);
+    region.put(key, new DeltaTestImpl());
+
+    server.invoke(ClientToServerDeltaDUnitTest.class, "doInvalidate",
+        new Object[] {key});
+    DeltaTestImpl value = new DeltaTestImpl();
+    value.setStr("UPDATED_VALUE");
+    region.put(key, value);
+
+    assertTrue(region.getCachePerfStats().getDeltasSent() == 1);
+    assertTrue(region.getCachePerfStats().getDeltaFullValuesSent() == 1);
+  }
+
+  public static void doInvalidate(String key) {
+    Region region = cache.getRegion(REGION_NAME);
+    region.invalidate(key);
+  }
+  
+  public static void verifyDeltaReceived() {
+    assertTrue("Expected 1 fromDelta() invokation but was "
+        + DeltaTestImpl.getFromDeltaInvokations(), DeltaTestImpl
+        .getFromDeltaInvokations() == 1);
+  }
+
+  public static void verifyDeltaSent(Integer deltas) {
+    CacheClientNotifier ccn = ((CacheServerImpl)cache
+        .getCacheServers().toArray()[0]).getAcceptor()
+        .getCacheClientNotifier();
+
+    int numOfDeltasSent = ((CacheClientProxy)ccn.getClientProxies().toArray()[0])
+        .getStatistics().getDeltaMessagesSent();
+    assertTrue("Expected " + deltas + " deltas to be sent but "
+        + numOfDeltasSent + " were sent.", numOfDeltasSent == deltas);
+  }
+
+  public static void checkFromdeltaCounter() {
+    assertTrue("FromDelta counters do not match, expected: "
+        + (NO_PUT_OPERATION - 1) + ", actual: "
+        + DeltaTestImpl.getFromDeltaInvokations(), DeltaTestImpl
+        .getFromDeltaInvokations() >= (NO_PUT_OPERATION - 1));
+  }
+
+  public static void checkTodeltaCounter(Integer count) {
+    assertTrue("ToDelta counters do not match, expected: " + count.intValue()
+        + ", actual: " + DeltaTestImpl.getToDeltaInvokations(), DeltaTestImpl
+        .getToDeltaInvokations() >= count.intValue());
+  }
+
+  public static void checkDeltaFeatureNotUsed() {
+    assertTrue("Delta Propagation feature used.", !(DeltaTestImpl
+        .deltaFeatureUsed()));
+  }
+
+  public static void createKeys(String[] keys) {
+    Region region = cache.getRegion(REGION_NAME);
+    for (int i = 0; i < keys.length; i++) {
+      region.create(keys[i], new DeltaTestImpl());
+    }
+  }
+  
+  public static int putsWhichReturnsDeltaSent() throws Exception {
+    csDelta = new CSDeltaTestImpl();
+    region.put(DELTA_KEY, csDelta);
+    for (int i = 0; i < NO_PUT_OPERATION; i++) {
+      csDelta.setIntVar(i);
+      region.put(DELTA_KEY, csDelta);
+    }
+    region.put(LAST_KEY, "");
+    
+    return csDelta.deltaSent;
+  }
+  
+  public static void checkDeltaInvoked(Integer deltaSent) {
+    assertTrue("Delta applied :"
+        + ((CSDeltaTestImpl)region.get(DELTA_KEY)).getDeltaApplied()
+        + "\n Delta sent :" + deltaSent, ((CSDeltaTestImpl)region
+        .get(DELTA_KEY)).getDeltaApplied() == deltaSent);
+  }
+  
+  public static void checkForDelta() {
+    assertTrue("Delta sent to EMPTY data policy region", DeltaTestImpl.getFromDeltaInvokations()==0);
+  }
+
+  public static void waitForLastKey() {
+    WaitCriterion wc = new WaitCriterion() {
+      public boolean done() {
+        return ClientToServerDeltaDUnitTest.lastKeyReceived;
+      }
+      public String description() {
+        return "Last key NOT received.";
+      }
+    };
+    DistributedTestCase.waitForCriterion(wc, 10*1000, 100, true);
+  }
+  
+  static class CSDeltaTestImpl extends DeltaTestImpl {
+    int deltaSent = 0;
+    int deltaApplied = 0;
+
+    public CSDeltaTestImpl() {
+    }
+
+    public void toDelta(DataOutput out) throws IOException {
+      super.toDelta(out);
+      deltaSent++;
+    }
+
+    public void fromDelta(DataInput in) throws IOException {
+      super.fromDelta(in);      
+      deltaApplied++;
+    }
+
+    public int getDeltaSent() {
+      return deltaSent;
+    }
+
+    public int getDeltaApplied() {
+      return deltaApplied;
+    }
+
+    public String toString() {
+      return "CSDeltaTestImpl[deltaApplied=" + deltaApplied + "]"
+          + super.toString();
+    }
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
new file mode 100644
index 0000000..dc2f1f4
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
@@ -0,0 +1,336 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+/**
+ * 
+ */
+package com.gemstone.gemfire.internal.cache.tier.sockets;
+
+import java.util.Properties;
+
+import com.gemstone.gemfire.DeltaTestImpl;
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.EntryEvent;
+import com.gemstone.gemfire.cache.GemFireCache;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionAttributes;
+import com.gemstone.gemfire.cache.RegionFactory;
+import com.gemstone.gemfire.cache.RegionShortcut;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.client.ClientCache;
+import com.gemstone.gemfire.cache.client.ClientCacheFactory;
+import com.gemstone.gemfire.cache.client.ClientRegionFactory;
+import com.gemstone.gemfire.cache.client.ClientRegionShortcut;
+import com.gemstone.gemfire.cache.client.Pool;
+import com.gemstone.gemfire.cache.client.PoolFactory;
+import com.gemstone.gemfire.cache.client.PoolManager;
+import com.gemstone.gemfire.cache.query.CqAttributes;
+import com.gemstone.gemfire.cache.query.CqAttributesFactory;
+import com.gemstone.gemfire.cache.query.CqEvent;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
+import com.gemstone.gemfire.cache.util.CqListenerAdapter;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
+import com.gemstone.gemfire.distributed.DistributedSystem;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.internal.AvailablePort;
+import com.gemstone.gemfire.internal.AvailablePortHelper;
+import com.gemstone.gemfire.internal.cache.CacheServerImpl;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+
+import dunit.DistributedTestCase;
+import dunit.Host;
+import dunit.VM;
+
+/**
+ * @author ashetkar
+ *
+ */
+public class DeltaPropagationWithCQDUnitTest extends DistributedTestCase {
+  
+  private static GemFireCache cache = null;
+
+  private static Pool pool = null;
+
+  private static String regionName = "CQWithInterestDUnitTest_region";
+
+  protected VM server1 = null;
+
+  protected VM server2 = null;
+
+  protected VM client1 = null;
+
+  protected VM client2 = null;
+
+  private static final String CQ1 = "SELECT * FROM " + Region.SEPARATOR
+      + regionName;
+
+  private static long totalEvents = 0;
+
+  private static long cqEvents = 0;
+
+  private static long cqErrors = 0;
+
+  /**
+   * @param name
+   */
+  public DeltaPropagationWithCQDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+    Host host = Host.getHost(0);
+    server1 = host.getVM(0);
+    server2 = host.getVM(1);
+    client1 = host.getVM(2);
+    client2 = host.getVM(3);
+  }
+
+  public void tearDown2() throws Exception {
+    super.tearDown2();
+    server1.invoke(DeltaPropagationWithCQDUnitTest.class, "close");
+    server2.invoke(DeltaPropagationWithCQDUnitTest.class, "close");
+    client1.invoke(DeltaPropagationWithCQDUnitTest.class, "close");
+    client2.invoke(DeltaPropagationWithCQDUnitTest.class, "close");
+    close();
+  }
+  
+  public static void close() throws Exception {
+    if (cache != null && !cache.isClosed()) {
+      cache.close();
+    }
+    totalEvents = 0;
+    cqEvents = 0;
+    cqErrors = 0;
+  }
+
+  public void testCqWithRI() throws Exception {
+    // 1. setup a cache server
+    int port = (Integer)server1.invoke(DeltaPropagationWithCQDUnitTest.class,
+        "createCacheServer");
+    // 2. setup a client
+    client1
+        .invoke(DeltaPropagationWithCQDUnitTest.class, "createClientCache",
+            new Object[] {getServerHostName(server1.getHost()), port,
+                Boolean.TRUE});
+    // 3. setup another client with cqs and interest in all keys.
+    createClientCache(getServerHostName(server1.getHost()), port, true);
+    registerCQs(1, "CQWithInterestDUnitTest_cq");
+    // 4. put a key on client1
+    client1.invoke(DeltaPropagationWithCQDUnitTest.class, "doPut", new Object[] {
+        "SAMPLE_KEY", "SAMPLE_VALUE"});
+    // 5. update the key with new value, on client1
+    client1.invoke(DeltaPropagationWithCQDUnitTest.class, "doPut", new Object[] {
+        "SAMPLE_KEY", "NEW_VALUE"});
+    // 6. Wait for some time
+    WaitCriterion wc = new WaitCriterion() {
+      public boolean done() {
+        return cqEvents == 2 && cqErrors == 0;
+      }
+      public String description() {
+        return "Expected 2 cqEvents and 0 cqErrors, but found " + cqEvents
+            + " cqEvents and " + cqErrors + " cqErrors";
+      }
+    };
+    DistributedTestCase.waitForCriterion(wc, 30 * 1000, 100, true);
+
+    // 7. validate that client2 has the new value
+    assertEquals("Latest value: ", "NEW_VALUE", cache.getRegion(regionName)
+        .get("SAMPLE_KEY"));
+  }
+
+  public void testFullValueRequestsWithCqWithoutRI() throws Exception {
+    int numOfListeners = 5;
+    int numOfKeys = 10;
+    int numOfCQs = 3;
+    // 1. setup a cache server
+    int port = (Integer)server1.invoke(DeltaPropagationWithCQDUnitTest.class,
+        "createCacheServer");
+    // 2. setup a client with register interest
+    client1
+        .invoke(DeltaPropagationWithCQDUnitTest.class, "createClientCache",
+            new Object[] {getServerHostName(server1.getHost()), port,
+                Boolean.TRUE});
+    // 3. setup another client with cqs but without interest.
+    createClientCache(getServerHostName(server1.getHost()), port, false/*RI*/);
+    for (int i = 0; i < numOfCQs; i++) {
+      registerCQs(numOfListeners, "Query_"+i);
+    }
+    // 4. do delta creates
+    doPuts(numOfKeys, true);
+    // verify client2's CQ listeners see above puts
+    verifyCqListeners(numOfListeners * numOfKeys * numOfCQs);
+    // verify full value requests at server are zero
+    server1.invoke(DeltaPropagationWithCQDUnitTest.class,
+        "verifyFullValueRequestsFromClients", new Object[] {0L});
+
+    // 4. do delta updates on client1
+    client1.invoke(DeltaPropagationWithCQDUnitTest.class, "doPuts",
+        new Object[] {numOfKeys, true});
+    // verify client2's CQ listeners see above puts
+    verifyCqListeners(numOfListeners * numOfKeys * numOfCQs * 2);
+    // verify full value requests at server 
+    server1.invoke(DeltaPropagationWithCQDUnitTest.class,
+        "verifyFullValueRequestsFromClients", new Object[] {10L});
+  }
+
+  public static void verifyCqListeners(final Integer events) throws Exception {
+    WaitCriterion wc = new WaitCriterion() {
+      public String description() {
+        return "Expected " + events + " listener invocations but found "
+            + (cqEvents + cqErrors);
+      }
+
+      public boolean done() {
+        return (cqEvents + cqErrors) == events;
+      }
+    };
+    DistributedTestCase.waitForCriterion(wc, 10000, 100, true);
+  }
+
+  public static void verifyFullValueRequestsFromClients(Long expected)
+      throws Exception {
+    Object[] proxies = ((CacheServerImpl)((GemFireCacheImpl)cache)
+        .getCacheServers().get(0)).getAcceptor().getCacheClientNotifier()
+        .getClientProxies().toArray();
+    long fullValueRequests = ((CacheClientProxy)proxies[0]).getStatistics()
+        .getDeltaFullMessagesSent();
+    if (fullValueRequests == 0) {
+      assertEquals("Full value requests, ", expected.longValue(),
+          ((CacheClientProxy)proxies[1]).getStatistics()
+          .getDeltaFullMessagesSent());
+    } else {
+      assertEquals("Full value requests, ", expected.longValue(),
+          fullValueRequests);
+    }
+  }
+
+  public static void doPut(Object key, Object value) throws Exception {
+    Region<Object, Object> region = cache.getRegion(regionName);
+    region.put(key, value);
+  }
+
+  public static void doPuts(Integer num, Boolean useDelta) throws Exception {
+    Region<Object, Object> region = cache.getRegion(regionName);
+    for (int i = 0; i < num; i++) {
+      if (useDelta) {
+        DeltaTestImpl delta = new DeltaTestImpl(i, "VALUE_"+i);
+        delta.setIntVar(i);
+        region.put("KEY_" + i, delta);
+      } else {
+        region.put("KEY_" + i, i);
+      }
+    }
+  }
+
+  public static Integer createCacheServer() throws Exception {
+    DeltaPropagationWithCQDUnitTest instance = new DeltaPropagationWithCQDUnitTest("temp");
+    Properties props = new Properties();
+    DistributedSystem ds = instance.getSystem(props);
+    ds.disconnect();
+    ds = instance.getSystem(props);
+    assertNotNull(ds);
+    cache = CacheFactory.create(ds);
+    assertNotNull(cache);
+//    Properties props = new Properties();
+//    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "10333");
+//    cache = new CacheFactory(props).create();
+    RegionFactory<Object, Object> rf = ((Cache)cache)
+        .createRegionFactory(RegionShortcut.REPLICATE);
+    rf.create(regionName);
+    CacheServer server = ((Cache)cache).addCacheServer();
+    server.setPort(AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET));
+    server.start();
+    return server.getPort();
+  }
+
+  public static void createClientCache(String host, Integer port, Boolean doRI)
+      throws Exception {
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "");
+    DeltaPropagationWithCQDUnitTest instance = new DeltaPropagationWithCQDUnitTest("temp");
+    DistributedSystem ds = instance.getSystem(props);
+    ds.disconnect();
+    ds = instance.getSystem(props);
+    assertNotNull(ds);
+    cache = CacheFactory.create(ds);
+    assertNotNull(cache);
+    AttributesFactory factory = new AttributesFactory();
+    pool = ClientServerTestCase.configureConnectionPool(factory, "localhost", new int[]{port},
+        true, 1, 2, null, 1000, 250, false, -2);
+
+    factory.setScope(Scope.LOCAL);
+//    String poolName = "CQWithInterestDUnitTest_pool";
+//    cache = new ClientCacheFactory(new Properties()).create();
+//    ClientRegionFactory<Object, Object> rf = ((ClientCache)cache)
+//        .createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY);
+//    PoolFactory pf = PoolManager.createFactory().addServer(host, port)
+//        .setSubscriptionEnabled(true);
+//    pool = pf.create(poolName);
+//    rf.setPoolName(poolName);
+//    rf.addCacheListener(new CacheListenerAdapter<Object, Object>() {
+    factory.addCacheListener(new CacheListenerAdapter<Object, Object>() {
+      public void afterCreate(EntryEvent<Object, Object> event) {
+        totalEvents++;
+      }
+
+      public void afterUpdate(EntryEvent<Object, Object> event) {
+        totalEvents++;
+      }
+
+      public void afterDestroy(EntryEvent<Object, Object> event) {
+        totalEvents++;
+      }
+
+      public void afterInvalidate(EntryEvent<Object, Object> event) {
+        totalEvents++;
+      }
+    });
+    RegionAttributes attr = factory.create();
+    Region region = ((Cache)cache).createRegion(regionName, attr);
+    if (doRI) {
+      region.registerInterest("ALL_KEYS");
+    }
+  }
+
+  public static void registerCQs(Integer numOfListeners, String name) throws Exception {
+    QueryService qs = pool.getQueryService();
+
+    CqAttributesFactory caf = new CqAttributesFactory();
+
+    CqListenerAdapter[] cqListeners = new CqListenerAdapter[numOfListeners];
+    for (int i = 0; i < numOfListeners; i++) {
+      cqListeners[i] = new CqListenerAdapter() {
+        public void onEvent(CqEvent event) {
+          event.getNewValue();
+          cqEvents++;
+        }
+
+        public void onError(CqEvent event) {
+          event.getNewValue();
+          cqErrors++;
+        }
+      };
+      caf.addCqListener(cqListeners[i]);
+    }
+
+    CqQuery cQuery = qs.newCq(name, CQ1, caf.create());
+    cQuery.execute();
+
+    if (qs.getCq(name) == null) {
+      fail("Failed to get CQ " + name);
+    }
+  }
+}
+


[33/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
new file mode 100755
index 0000000..6413518
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
@@ -0,0 +1,1106 @@
+package com.gemstone.gemfire.internal.cache;
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.CacheEvent;
+import com.gemstone.gemfire.cache.CacheListener;
+import com.gemstone.gemfire.cache.CacheTransactionManager;
+import com.gemstone.gemfire.cache.CacheWriter;
+import com.gemstone.gemfire.cache.CacheWriterException;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.EntryEvent;
+import com.gemstone.gemfire.cache.EntryNotFoundException;
+import com.gemstone.gemfire.cache.InterestPolicy;
+import com.gemstone.gemfire.cache.PartitionAttributesFactory;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionEvent;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.SubscriptionAttributes;
+import com.gemstone.gemfire.cache.TransactionEvent;
+import com.gemstone.gemfire.cache.TransactionListener;
+import com.gemstone.gemfire.cache.TransactionWriter;
+import com.gemstone.gemfire.cache.client.ClientCache;
+import com.gemstone.gemfire.cache.client.ClientCacheFactory;
+import com.gemstone.gemfire.cache.client.ClientRegionFactory;
+import com.gemstone.gemfire.cache.client.ClientRegionShortcut;
+import com.gemstone.gemfire.cache.execute.Function;
+import com.gemstone.gemfire.cache.execute.FunctionContext;
+import com.gemstone.gemfire.cache.query.CqAttributes;
+import com.gemstone.gemfire.cache.query.CqAttributesFactory;
+import com.gemstone.gemfire.cache.query.CqEvent;
+import com.gemstone.gemfire.cache.query.CqListener;
+import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
+import com.gemstone.gemfire.cache.util.CacheWriterAdapter;
+import com.gemstone.gemfire.cache30.CacheTestCase;
+import com.gemstone.gemfire.distributed.DistributedMember;
+import com.gemstone.gemfire.internal.AvailablePort;
+import com.gemstone.gemfire.internal.cache.execute.CustomerIDPartitionResolver;
+import com.gemstone.gemfire.internal.cache.execute.data.CustId;
+import com.gemstone.gemfire.internal.cache.execute.data.Customer;
+import com.gemstone.gemfire.internal.cache.execute.data.Order;
+import com.gemstone.gemfire.internal.cache.execute.data.OrderId;
+
+import dunit.Host;
+import dunit.SerializableCallable;
+import dunit.VM;
+
+/**
+ * @author sbawaska
+ *
+ */
+public class RemoteCQTransactionDUnitTest extends CacheTestCase {
+  final protected String CUSTOMER = "custRegion";
+  final protected String ORDER = "orderRegion";
+  final protected String D_REFERENCE = "distrReference";
+  
+  private final SerializableCallable getNumberOfTXInProgress = new SerializableCallable() {
+    public Object call() throws Exception {
+      TXManagerImpl mgr = getGemfireCache().getTxManager();
+      return mgr.hostedTransactionsInProgressForTest();
+    }
+  };
+  private final SerializableCallable verifyNoTxState = new SerializableCallable() {
+    public Object call() throws Exception {
+      //TXManagerImpl mgr = getGemfireCache().getTxManager();
+      //assertEquals(0, mgr.hostedTransactionsInProgressForTest());
+      final TXManagerImpl mgr = getGemfireCache().getTxManager();
+      waitForCriterion(new WaitCriterion() {
+        @Override
+        public boolean done() {
+          return mgr.hostedTransactionsInProgressForTest() == 0;
+        }
+
+        @Override
+        public String description() {
+          return "";
+        }
+      }, 30 * 1000, 500, true/*throwOnTimeout*/);
+      return null;
+    }
+  };
+  /**
+   * @param name
+   */
+  public RemoteCQTransactionDUnitTest(String name) {
+    super(name);
+  }
+
+  protected enum OP {
+    PUT, GET, DESTROY, INVALIDATE, KEYS, VALUES, ENTRIES, PUTALL, GETALL, REMOVEALL
+  }
+  
+  @Override
+  public void tearDown2() throws Exception {
+//    try { Thread.sleep(5000); } catch (InterruptedException e) { } // FOR MANUAL TESTING OF STATS - DON"T KEEP THIS
+    try {
+      invokeInEveryVM(verifyNoTxState);
+    } finally {
+      closeAllCache();
+      super.tearDown2();
+    }
+  }
+  
+  void createRegion(boolean accessor, int redundantCopies, InterestPolicy interestPolicy) {
+    AttributesFactory af = new AttributesFactory();
+    af.setScope(Scope.DISTRIBUTED_ACK);
+    af.setDataPolicy(DataPolicy.REPLICATE);
+    af.setConcurrencyChecksEnabled(getConcurrencyChecksEnabled());
+    getCache().createRegion(D_REFERENCE,af.create());
+    af = new AttributesFactory();
+    af.setConcurrencyChecksEnabled(getConcurrencyChecksEnabled());
+    if (interestPolicy != null) {
+      af.setSubscriptionAttributes(new SubscriptionAttributes(interestPolicy));
+    }
+    af.setPartitionAttributes(new PartitionAttributesFactory<CustId, Customer>()
+        .setTotalNumBuckets(4).setLocalMaxMemory(accessor ? 0 : 1)
+        .setPartitionResolver(new CustomerIDPartitionResolver("resolver1"))
+        .setRedundantCopies(redundantCopies).create());
+    getCache().createRegion(CUSTOMER, af.create());
+    af.setPartitionAttributes(new PartitionAttributesFactory<OrderId, Order>()
+        .setTotalNumBuckets(4).setLocalMaxMemory(accessor ? 0 : 1)
+        .setPartitionResolver(new CustomerIDPartitionResolver("resolver2"))
+        .setRedundantCopies(redundantCopies).setColocatedWith(CUSTOMER).create());
+    getCache().createRegion(ORDER, af.create());
+  }
+
+  protected boolean getConcurrencyChecksEnabled() {
+    return false;
+  }
+
+  void populateData() {
+    Region custRegion = getCache().getRegion(CUSTOMER);
+    Region orderRegion = getCache().getRegion(ORDER);
+    Region refRegion = getCache().getRegion(D_REFERENCE);
+    for (int i=0; i<5; i++) {
+      CustId custId = new CustId(i);
+      Customer customer = new Customer("customer"+i, "address"+i);
+      OrderId orderId = new OrderId(i, custId);
+      Order order = new Order("order"+i);
+      custRegion.put(custId, customer);
+      orderRegion.put(orderId, order);
+      refRegion.put(custId,customer);
+    }
+  }
+
+  protected void initAccessorAndDataStore(VM accessor, VM datastore, final int redundantCopies) {
+    accessor.invoke(new SerializableCallable() {
+      public Object call() throws Exception {
+        createRegion(true/*accessor*/, redundantCopies, null);
+        return null;
+      }
+    });
+
+    datastore.invoke(new SerializableCallable() {
+      public Object call() throws Exception {
+        createRegion(false/*accessor*/, redundantCopies, null);
+        populateData();
+        return null;
+      }
+    });
+  }
+
+  protected void initAccessorAndDataStore(VM accessor, VM datastore1, VM datastore2, final int redundantCopies) {
+    datastore2.invoke(new SerializableCallable() {
+      public Object call() throws Exception {
+        createRegion(false/*accessor*/, redundantCopies, null);
+        return null;
+      }
+    });
+
+    initAccessorAndDataStore(accessor, datastore1, redundantCopies);
+  }
+
+  private void initAccessorAndDataStoreWithInterestPolicy(VM accessor, VM datastore1, VM datastore2, final int redundantCopies) {
+    datastore2.invoke(new SerializableCallable() {
+      public Object call() throws Exception {
+        createRegion(false/*accessor*/, redundantCopies, InterestPolicy.ALL);
+        return null;
+      }
+    });
+
+    initAccessorAndDataStore(accessor, datastore1, redundantCopies);
+  }
+
+  
+  void validateContains(CustId custId, Set<OrderId> orderId, boolean doesIt)  {
+    validateContains(custId,orderId,doesIt,doesIt);
+  }
+  
+  void validateContains(CustId custId, Set<OrderId> ordersSet, boolean containsKey,boolean containsValue) {
+    Region<CustId, Customer> custRegion = getCache().getRegion(CUSTOMER);
+    Region<OrderId, Order> orderRegion = getCache().getRegion(ORDER);
+    Region<CustId, Order> refRegion = getCache().getRegion(D_REFERENCE);
+    boolean rContainsKC = custRegion.containsKey(custId);
+    boolean rContainsKO = containsKey;
+    for (OrderId o : ordersSet) {
+      getGemfireCache().getLoggerI18n().fine("SWAP:rContainsKO:"+rContainsKO+" containsKey:"+orderRegion.containsKey(o));
+      rContainsKO = rContainsKO && orderRegion.containsKey(o);
+    }
+    boolean rContainsKR = refRegion.containsKey(custId);
+    
+    boolean rContainsVC = custRegion.containsValueForKey(custId);
+    boolean rContainsVO = containsValue;
+    for (OrderId o: ordersSet) {
+      rContainsVO = rContainsVO && orderRegion.containsValueForKey(o);
+    }
+    boolean rContainsVR = refRegion.containsValueForKey(custId);
+    
+    
+    assertEquals(containsKey,rContainsKC);
+    assertEquals(containsKey,rContainsKO);
+    assertEquals(containsKey,rContainsKR);
+    assertEquals(containsValue,rContainsVR);
+    assertEquals(containsValue,rContainsVC);
+    assertEquals(containsValue,rContainsVO);
+    
+    
+    if(containsKey) {
+      Region.Entry eC =  custRegion.getEntry(custId);
+      for (OrderId o : ordersSet) {
+        assertNotNull(orderRegion.getEntry(o));
+      }
+      Region.Entry eR = refRegion.getEntry(custId);
+      assertNotNull(eC);
+      assertNotNull(eR);
+//      assertEquals(1,custRegion.size());
+  //    assertEquals(1,orderRegion.size());
+    //  assertEquals(1,refRegion.size());
+      
+    } else {
+      //assertEquals(0,custRegion.size());
+      //assertEquals(0,orderRegion.size());
+      //assertEquals(0,refRegion.size());
+      try {
+        Region.Entry eC =  custRegion.getEntry(custId);
+        assertNull("should have had an EntryNotFoundException:"+eC,eC);
+        
+      } catch(EntryNotFoundException enfe) {
+        // this is what we expect
+      }
+      try {
+        for (OrderId o : ordersSet) {
+          assertNull("should have had an EntryNotFoundException:"+orderRegion.getEntry(o),orderRegion.getEntry(o));
+        }
+        
+      } catch(EntryNotFoundException enfe) {
+        // this is what we expect
+      }
+      try {
+        Region.Entry eR =  refRegion.getEntry(custId);
+        assertNull("should have had an EntryNotFoundException:"+eR,eR);
+      } catch(EntryNotFoundException enfe) {
+        // this is what we expect
+      }
+      
+    }
+    
+  }
+
+
+  void verifyAfterCommit(OP op) {
+    Region<CustId, Customer> custRegion = getCache().getRegion(CUSTOMER);
+    Region<CustId, Customer> refRegion = getCache().getRegion(D_REFERENCE);
+    Region<OrderId, Order> orderRegion = getCache().getRegion(ORDER);
+    CustId custId = new CustId(1);
+    OrderId orderId = new OrderId(1, custId);
+    OrderId orderId2 = new OrderId(2, custId);
+    OrderId orderId3 = new OrderId(3, custId);
+    Customer expectedCust;
+    Order expectedOrder;
+    Order expectedOrder2;
+    Order expectedOrder3;
+    Customer expectedRef;
+    switch (op) {
+    case PUT:
+      expectedCust = new Customer("foo", "bar");
+      expectedOrder = new Order("fooOrder");
+      expectedOrder2 = new Order("fooOrder2");
+      expectedOrder3 = new Order("fooOrder3");
+      expectedRef = expectedCust;
+      assertNotNull(custRegion.getEntry(custId));
+      assertEquals(expectedCust, custRegion.getEntry(custId).getValue());
+      /*
+      assertNotNull(orderRegion.getEntry(orderId));
+      assertEquals(expectedOrder, orderRegion.getEntry(orderId).getValue());
+      
+      assertNotNull(orderRegion.getEntry(orderId2));
+      assertEquals(expectedOrder2, orderRegion.getEntry(orderId2).getValue());
+      
+      assertNotNull(orderRegion.getEntry(orderId3));
+      assertEquals(expectedOrder3, orderRegion.getEntry(orderId3).getValue());
+      */
+      assertNotNull(refRegion.getEntry(custId));
+      assertEquals(expectedRef, refRegion.getEntry(custId).getValue());
+      
+      //Set<OrderId> ordersSet = new HashSet<OrderId>();
+      //ordersSet.add(orderId);ordersSet.add(orderId2);ordersSet.add(orderId3);
+      //validateContains(custId, ordersSet, true);
+      break;
+    case GET:
+      expectedCust = custRegion.get(custId);
+      expectedOrder = orderRegion.get(orderId);
+      expectedRef = refRegion.get(custId);
+      validateContains(custId, Collections.singleton(orderId), true);
+      break;
+    case DESTROY:
+      assertTrue(!custRegion.containsKey(custId));
+      assertTrue(!orderRegion.containsKey(orderId));
+      assertTrue(!refRegion.containsKey(custId));
+      validateContains(custId, Collections.singleton(orderId), false);
+      break;
+    case INVALIDATE:
+      boolean validateContainsKey = true;
+      if (!((GemFireCacheImpl)custRegion.getCache()).isClient()) {
+        assertTrue(custRegion.containsKey(custId));
+        assertTrue(orderRegion.containsKey(orderId));
+        assertTrue(refRegion.containsKey(custId));
+      }
+      assertNull(custRegion.get(custId));
+      assertNull(orderRegion.get(orderId));
+      assertNull(refRegion.get(custId));
+      validateContains(custId,Collections.singleton(orderId),validateContainsKey,false);
+      break;
+    default:
+      throw new IllegalStateException();
+    }
+  }
+  
+  
+  void verifyAfterRollback(OP op) {
+    Region<CustId, Customer> custRegion = getCache().getRegion(CUSTOMER);
+    Region<OrderId, Order> orderRegion = getCache().getRegion(ORDER);
+    Region<CustId, Customer> refRegion = getCache().getRegion(D_REFERENCE);
+    assertNotNull(custRegion);
+    assertNotNull(orderRegion);
+    assertNotNull(refRegion);
+    
+    CustId custId = new CustId(1);
+    OrderId orderId = new OrderId(1, custId);
+    OrderId orderId2 = new OrderId(2, custId);
+    OrderId orderId3 = new OrderId(3, custId);
+    Customer expectedCust;
+    Order expectedOrder;
+    Customer expectedRef;
+    switch (op) {
+    case PUT:
+      expectedCust = new Customer("customer1", "address1");
+      expectedOrder = new Order("order1");
+      expectedRef = new Customer("customer1", "address1");
+      assertEquals(expectedCust, custRegion.getEntry(custId).getValue());
+      assertEquals(expectedOrder, orderRegion.getEntry(orderId).getValue());
+      getCache().getLogger().info("SWAP:verifyRollback:"+orderRegion);
+      getCache().getLogger().info("SWAP:verifyRollback:"+orderRegion.getEntry(orderId2));
+      assertNull(getGemfireCache().getTXMgr().getTXState());
+      assertNull(""+orderRegion.getEntry(orderId2),orderRegion.getEntry(orderId2));
+      assertNull(orderRegion.getEntry(orderId3));
+      assertNull(orderRegion.get(orderId2));
+      assertNull(orderRegion.get(orderId3));
+      assertEquals(expectedRef, refRegion.getEntry(custId).getValue());
+      validateContains(custId, Collections.singleton(orderId), true);
+      break;
+    case GET:
+      expectedCust = custRegion.getEntry(custId).getValue();
+      expectedOrder = orderRegion.getEntry(orderId).getValue();
+      expectedRef = refRegion.getEntry(custId).getValue();
+      validateContains(custId, Collections.singleton(orderId), true);
+      break;
+    case DESTROY:
+      assertTrue(!custRegion.containsKey(custId));
+      assertTrue(!orderRegion.containsKey(orderId));
+      assertTrue(!refRegion.containsKey(custId));
+      validateContains(custId, Collections.singleton(orderId), true);
+      break;
+    case INVALIDATE:
+      assertTrue(custRegion.containsKey(custId));
+      assertTrue(orderRegion.containsKey(orderId));
+      assertTrue(refRegion.containsKey(custId));
+      assertNull(custRegion.get(custId));
+      assertNull(orderRegion.get(orderId));
+      assertNull(refRegion.get(custId));
+      validateContains(custId,Collections.singleton(orderId),true,true);
+      break;
+    default:
+      throw new IllegalStateException();
+    }
+  }
+  
+  
+  
+
+
+  abstract class CacheCallback {
+    protected boolean isAccessor;
+    protected Exception ex = null;
+    protected void verifyOrigin(EntryEvent event) {
+      try {
+        assertEquals(!isAccessor, event.isOriginRemote());
+      } catch (Exception e) {
+        ex = e;
+      }
+    }
+    protected void verifyPutAll(EntryEvent event) {
+      CustId knownCustId = new CustId(1);
+      OrderId knownOrderId = new OrderId(2, knownCustId);
+      if (event.getKey().equals(knownOrderId)) {
+        try {
+          assertTrue(event.getOperation().isPutAll());
+          assertNotNull(event.getTransactionId());
+        } catch (Exception e) {
+          ex = e;
+        }
+      }
+    }
+
+  }
+  
+  class TestCacheListener extends CacheCallback implements CacheListener {
+    TestCacheListener(boolean isAccessor) {
+      this.isAccessor = isAccessor;
+    }
+    public void afterCreate(EntryEvent event) {
+      verifyOrigin(event);
+      verifyPutAll(event);
+    }
+    public void afterUpdate(EntryEvent event) {
+      verifyOrigin(event);
+      verifyPutAll(event);
+    }
+    public void afterDestroy(EntryEvent event) {
+      verifyOrigin(event);
+    }
+    public void afterInvalidate(EntryEvent event) {
+      verifyOrigin(event);
+    }
+    public void afterRegionClear(RegionEvent event) {
+    }
+    public void afterRegionCreate(RegionEvent event) {
+    }
+    public void afterRegionDestroy(RegionEvent event) {
+    }
+    public void afterRegionInvalidate(RegionEvent event) {
+    }
+    public void afterRegionLive(RegionEvent event) {
+    }
+    public void close() {
+    }
+  }
+
+  class TestCacheWriter extends CacheCallback implements CacheWriter {
+    
+    private volatile boolean wasFired = false;
+    
+    TestCacheWriter(boolean isAccessor) {
+      this.isAccessor = isAccessor;
+    }
+    public void beforeCreate(EntryEvent event) throws CacheWriterException {
+      getGemfireCache().getLogger().info("SWAP:beforeCreate:"+event+" op:"+event.getOperation());
+      verifyOrigin(event);
+      verifyPutAll(event);
+      setFired(event);
+    }
+    public void setFired(EntryEvent event) {
+      wasFired = true;
+    }
+    public void beforeUpdate(EntryEvent event) throws CacheWriterException {
+      getGemfireCache().getLogger().info("SWAP:beforeCreate:"+event+" op:"+event.getOperation());
+      verifyOrigin(event);
+      verifyPutAll(event);
+      setFired(event);
+    }
+    public void beforeDestroy(EntryEvent event) throws CacheWriterException {
+      verifyOrigin(event);
+      setFired(event);
+    }
+    public void beforeRegionClear(RegionEvent event)
+        throws CacheWriterException {
+      setFired(null);
+    }
+    public void beforeRegionDestroy(RegionEvent event)
+        throws CacheWriterException {
+      setFired(null);
+    }
+    public void close() {
+    }
+  }
+
+  abstract class txCallback {
+    protected boolean isAccessor;
+    protected Exception ex = null;
+    protected void verify(TransactionEvent txEvent) {
+      for (CacheEvent e : txEvent.getEvents()) {
+        verifyOrigin(e);
+        verifyPutAll(e);
+      }
+    }
+    private void verifyOrigin(CacheEvent event) {
+      try {
+        assertEquals(true, event.isOriginRemote()); //change to !isAccessor after fixing #41498
+      } catch (Exception e) {
+        ex = e;
+      }
+    }
+    private void verifyPutAll(CacheEvent p_event) {
+      if (!(p_event instanceof EntryEvent)) {
+        return;
+      }
+      EntryEvent event = (EntryEvent)p_event;
+      CustId knownCustId = new CustId(1);
+      OrderId knownOrderId = new OrderId(2, knownCustId);
+      if (event.getKey().equals(knownOrderId)) {
+        try {
+          assertTrue(event.getOperation().isPutAll());
+          assertNotNull(event.getTransactionId());
+        } catch (Exception e) {
+          ex = e;
+        }
+      }
+    }
+  }
+  
+  class TestTxListener extends txCallback implements TransactionListener {
+    private boolean listenerInvoked;
+    TestTxListener(boolean isAccessor) {
+      this.isAccessor = isAccessor;
+    }
+    public void afterCommit(TransactionEvent event) {
+      listenerInvoked = true;
+      verify(event);
+    }
+    public void afterFailedCommit(TransactionEvent event) {
+      verify(event);
+    }
+    public void afterRollback(TransactionEvent event) {
+      listenerInvoked = true;
+      verify(event);
+    }
+    public boolean isListenerInvoked() {
+      return this.listenerInvoked;
+    }
+    public void close() {
+    }
+  }
+
+  class TestTxWriter extends txCallback implements TransactionWriter {
+    public TestTxWriter(boolean isAccessor) {
+      this.isAccessor = isAccessor;
+    }
+    public void beforeCommit(TransactionEvent event) {
+      verify(event);
+    }
+    public void close() {
+    }
+  }
+
+
+  
+  final CustId expectedCustId = new CustId(6);
+  final Customer expectedCustomer = new Customer("customer6", "address6");
+  class TXFunction implements Function {
+    static final String id = "TXFunction";
+    public void execute(FunctionContext context) {
+      Region r = null;
+      r = getGemfireCache().getRegion(CUSTOMER);
+      getGemfireCache().getLogger().fine("SWAP:callingPut");
+      r.put(expectedCustId, expectedCustomer);
+      GemFireCacheImpl.getInstance().getLogger().warning(" XXX DOIN A PUT ",new Exception());
+      context.getResultSender().lastResult(Boolean.TRUE);
+    }
+    public String getId() {
+      return id;
+    }
+    public boolean hasResult() {
+      return true;
+    }
+    public boolean optimizeForWrite() {
+      return true;
+    }
+    public boolean isHA() {
+      return false;
+    }
+  }
+  
+  enum Executions {
+    OnRegion,
+    OnMember
+  }
+  
+  /**
+   * @param ds1
+   * @param pr
+   * @return first key found on the given member
+   */
+  CustId getKeyOnMember(final DistributedMember owner,
+      PartitionedRegion pr) {
+    CustId retVal = null;
+    for (int i=0; i<5; i++) {
+      CustId custId = new CustId(i);
+      DistributedMember member = pr.getOwnerForKey(pr.getKeyInfo(custId));
+      if (member.equals(owner)) {
+        retVal = custId;
+        break;
+      }
+    }
+    return retVal;
+  }
+  /**
+   * @param i
+   * @return
+   */
+  protected Set<Customer> getCustomerSet(int size) {
+    Set<Customer> expectedSet = new HashSet<Customer>();
+    for (int i=0; i<size; i++) {
+      expectedSet.add(new Customer("customer"+i, "address"+i));
+    }
+    return expectedSet;
+  }
+
+  Set<CustId> getCustIdSet(int size) {
+    Set<CustId> expectedSet = new HashSet<CustId>();
+    for (int i=0; i<size; i++) {
+      expectedSet.add(new CustId(i));
+    }
+    return expectedSet;
+  }
+
+
+  class OneUpdateCacheListener extends CacheListenerAdapter {
+    boolean success = false;
+    
+    public boolean getSuccess() {
+      return success;
+    }
+    
+    @Override
+    public void afterCreate(EntryEvent event) {
+      fail("create not expected");
+    }
+    @Override
+    public void afterUpdate(EntryEvent event) {
+      if(!success) {
+        System.out.println("WE WIN!");
+        success = true;
+      } else {
+        fail("Should have only had one update");
+      }
+    }
+    @Override
+    public void afterDestroy(EntryEvent event) {
+      fail("destroy not expected");
+    }
+    @Override
+    public void afterInvalidate(EntryEvent event) {
+      fail("invalidate not expected");
+    }
+  }
+  
+  class OneDestroyAndThenOneCreateCacheWriter extends CacheWriterAdapter {
+    private boolean oneDestroy;
+    private boolean oneCreate;
+    
+    public void checkSuccess() throws Exception {
+      if(oneDestroy && oneCreate) {
+        // chill
+      } else {
+        fail("Didn't get both events. oneDestroy="+oneDestroy+" oneCreate="+oneCreate);
+      }
+    }
+
+    @Override
+    public void beforeCreate(EntryEvent event) throws CacheWriterException {
+     if(!oneDestroy) {
+       fail("destroy should have arrived in writer before create");
+     } else {
+       if(oneCreate) {
+         fail("more than one create detected! expecting destroy then create");
+       } else {
+         oneCreate = true;
+       }
+     }
+    }
+    @Override
+    public void beforeUpdate(EntryEvent event) throws CacheWriterException {
+        fail("update not expected");
+    }
+    @Override
+    public void beforeDestroy(EntryEvent event) throws CacheWriterException {
+      if(oneDestroy) {
+        fail("only one destroy expected");
+      } else {
+        if(oneCreate) {
+          fail("destroy is supposed to precede create");
+        } else {
+          oneDestroy = true;
+        }
+      }
+    }
+    
+  }
+
+  protected Integer startServer(VM vm) {
+    return (Integer) vm.invoke(new SerializableCallable() {
+      public Object call() throws Exception {
+        int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+        CacheServer s = getCache().addCacheServer();
+        s.setPort(port);
+        s.start();
+        return port;
+      }
+    });
+  }
+  protected void createClientRegion(VM vm, final int port, final boolean isEmpty, final boolean ri, final boolean CQ) {
+    vm.invoke(new SerializableCallable() {
+      public Object call() throws Exception {
+        ClientCacheFactory ccf = new ClientCacheFactory();
+        ccf.addPoolServer("localhost"/*getServerHostName(Host.getHost(0))*/, port);
+        ccf.setPoolSubscriptionEnabled(true);
+        ccf.set("log-level", getDUnitLogLevel());
+        ClientCache cCache = getClientCache(ccf);
+        ClientRegionFactory<Integer, String> crf = cCache
+            .createClientRegionFactory(isEmpty ? ClientRegionShortcut.PROXY
+                : ClientRegionShortcut.CACHING_PROXY);
+        crf.setConcurrencyChecksEnabled(getConcurrencyChecksEnabled());
+        crf.addCacheListener(new ClientListener());
+        Region r = crf.create(D_REFERENCE);
+        Region cust = crf.create(CUSTOMER);
+        Region order = crf.create(ORDER);
+        if (ri) {
+          r.registerInterestRegex(".*");
+          cust.registerInterestRegex(".*");
+          order.registerInterestRegex(".*");
+        }
+        if(CQ) {
+          CqAttributesFactory cqf = new CqAttributesFactory();
+          cqf.addCqListener(new ClientCQListener());
+          CqAttributes ca = cqf.create();
+          cCache.getQueryService().newCq("SELECT * FROM "+cust.getFullPath(), ca).execute();
+        }
+        return null;
+      }
+    });
+  }
+
+  protected class ClientCQListener implements CqListener {
+
+    boolean invoked = false;
+    public void onError(CqEvent aCqEvent) {
+      // TODO Auto-generated method stub
+      
+    }
+
+    public void onEvent(CqEvent aCqEvent) {
+      // TODO Auto-generated method stub
+      invoked =true;
+      
+    }
+
+    public void close() {
+      // TODO Auto-generated method stub
+      
+    }
+    
+  }
+  
+protected static class ClientListener extends CacheListenerAdapter {
+    boolean invoked = false;
+    int invokeCount = 0;
+    int invalidateCount = 0;
+    int putCount = 0;
+    boolean putAllOp = false;
+    boolean isOriginRemote = false;
+    int creates;
+    int updates;
+    
+    @Override
+    public void afterCreate(EntryEvent event) {
+      event.getRegion().getCache().getLogger().warning("ZZZ AFTER CREATE:"+event.getKey());
+      invoked = true;
+      invokeCount++;
+      putCount++;
+      creates++;
+      event.getRegion().getCache().getLogger().warning("ZZZ AFTER CREATE:"+event.getKey()+" isPutAll:"+event.getOperation().isPutAll()+" op:"+event.getOperation());
+      putAllOp = event.getOperation().isPutAll();
+      isOriginRemote = event.isOriginRemote();
+    }
+    @Override
+    public void afterUpdate(EntryEvent event) {
+    	event.getRegion().getCache().getLogger().warning("ZZZ AFTER UPDATE:"+event.getKey()+" isPutAll:"+event.getOperation().isPutAll()+" op:"+event.getOperation());
+        putAllOp = event.getOperation().isPutAll();
+      invoked = true;
+      invokeCount++;
+      putCount++;
+      updates++;
+      isOriginRemote = event.isOriginRemote();
+    }
+    
+    @Override
+    public void afterInvalidate(EntryEvent event) {
+      event.getRegion().getCache().getLogger().warning("ZZZ AFTER UPDATE:"+event.getKey());
+      invoked = true;
+      invokeCount++;
+      invalidateCount++;
+      isOriginRemote = event.isOriginRemote();
+    }
+    
+    public void reset() {
+    	invoked = false;
+    	invokeCount = 0;
+    	invalidateCount = 0;
+    	putCount = 0;
+    	isOriginRemote = false;
+    	creates = 0;
+    	updates = 0;
+    }
+  }
+  
+  protected static class ServerListener extends CacheListenerAdapter {
+    boolean invoked = false;
+    int creates;
+    int updates;
+    @Override
+    public void afterCreate(EntryEvent event) {
+      invoked = true;
+      creates++;
+    }
+    @Override
+    public void afterUpdate(EntryEvent event) {
+      invoked = true;
+      updates++;
+    }
+    @Override
+    public void afterDestroy(EntryEvent event) {
+      invoked = true;
+    }
+    @Override
+    public void afterInvalidate(EntryEvent event) {
+      invoked = true;
+    }
+  }
+  
+  private static final String EMPTY_REGION = "emptyRegionName";
+  
+  public void testTXWithCQCommitInDatastoreCQ() throws Exception {
+    Host host = Host.getHost(0);
+    VM accessor = host.getVM(0);
+    VM datastore = host.getVM(1);
+    VM client = host.getVM(2);
+    
+    initAccessorAndDataStore(accessor, datastore, 0);
+    int port = startServer(datastore);
+    
+    createClientRegion(client, port, false, true, true);
+    datastore.invoke(new SerializableCallable() {
+      public Object call() throws Exception {
+        Region<CustId, Customer> custRegion = getCache().getRegion(CUSTOMER);
+        Region<OrderId, Order> orderRegion = getCache().getRegion(ORDER);
+        Region<CustId,Customer> refRegion = getCache().getRegion(D_REFERENCE);
+        CustId custId = new CustId(1);
+        OrderId orderId = new OrderId(1, custId);
+        getCache().getCacheTransactionManager().begin();
+        custRegion.put(custId, new Customer("foo", "bar"));
+        orderRegion.put(orderId, new Order("fooOrder"));
+        refRegion.put(custId, new Customer("foo", "bar"));
+        getCache().getCacheTransactionManager().commit();
+        return null;
+      }
+    });
+    
+    Thread.sleep(10000);
+    client.invoke(new SerializableCallable() {
+      public Object call() throws Exception {
+        Region<CustId, Customer> custRegion = getCache().getRegion(CUSTOMER);
+        Region<OrderId, Order> orderRegion = getCache().getRegion(ORDER);
+        Region<CustId,Customer> refRegion = getCache().getRegion(D_REFERENCE);
+        ClientListener cl = (ClientListener) custRegion.getAttributes().getCacheListeners()[0];
+        getCache().getLogger().info("SWAP:CLIENTinvoked:"+cl.invoked);
+        
+        assertTrue(((ClientCQListener)custRegion.getCache().getQueryService().getCqs()[0].getCqAttributes().getCqListener()).invoked);
+        assertTrue(cl.invoked);
+        return null;
+      }
+    });
+  }
+  
+  
+  public void testTXWithCQCommitInDatastoreConnectedToAccessorCQ() throws Exception {
+    Host host = Host.getHost(0);
+    VM accessor = host.getVM(0);
+    VM datastore = host.getVM(1);
+    VM client = host.getVM(2);
+    
+    initAccessorAndDataStore(accessor, datastore, 0);
+    int port = startServer(accessor);
+    
+    createClientRegion(client, port, false, true, true);
+    datastore.invoke(new SerializableCallable() {
+      public Object call() throws Exception {
+        Region<CustId, Customer> custRegion = getCache().getRegion(CUSTOMER);
+        Region<OrderId, Order> orderRegion = getCache().getRegion(ORDER);
+        Region<CustId,Customer> refRegion = getCache().getRegion(D_REFERENCE);
+        CustId custId = new CustId(1);
+        OrderId orderId = new OrderId(1, custId);
+        getCache().getCacheTransactionManager().begin();
+        custRegion.put(custId, new Customer("foo", "bar"));
+//        orderRegion.put(orderId, new Order("fooOrder"));
+//        refRegion.put(custId, new Customer("foo", "bar"));
+        getCache().getCacheTransactionManager().commit();
+        return null;
+      }
+    });
+    
+    Thread.sleep(10000);
+    client.invoke(new SerializableCallable() {
+      public Object call() throws Exception {
+        Region<CustId, Customer> custRegion = getCache().getRegion(CUSTOMER);
+        Region<OrderId, Order> orderRegion = getCache().getRegion(ORDER);
+        Region<CustId,Customer> refRegion = getCache().getRegion(D_REFERENCE);
+        ClientListener cl = (ClientListener) custRegion.getAttributes().getCacheListeners()[0];
+        getCache().getLogger().info("SWAP:CLIENTinvoked:"+cl.invoked);
+        assertTrue(cl.invoked);
+        assertTrue(((ClientCQListener)custRegion.getCache().getQueryService().getCqs()[0].getCqAttributes().getCqListener()).invoked);
+        return null;
+      }
+    });
+  }
+  
+  
+  public void testTXWithCQCommitInDatastoreConnectedToDatastoreCQ() throws Exception {
+    Host host = Host.getHost(0);
+    VM accessor = host.getVM(0);
+    VM datastore = host.getVM(1);
+    VM client = host.getVM(2);
+    
+    initAccessorAndDataStore(accessor, datastore, 0);
+    int port = startServer(datastore);
+    
+    createClientRegion(client, port, false, true, true);
+    datastore.invoke(new SerializableCallable() {
+      public Object call() throws Exception {
+        Region<CustId, Customer> custRegion = getCache().getRegion(CUSTOMER);
+        Region<OrderId, Order> orderRegion = getCache().getRegion(ORDER);
+        Region<CustId,Customer> refRegion = getCache().getRegion(D_REFERENCE);
+        CustId custId = new CustId(1);
+        OrderId orderId = new OrderId(1, custId);
+        getCache().getCacheTransactionManager().begin();
+        custRegion.put(custId, new Customer("foo", "bar"));
+//        orderRegion.put(orderId, new Order("fooOrder"));
+//        refRegion.put(custId, new Customer("foo", "bar"));
+        getCache().getCacheTransactionManager().commit();
+        return null;
+      }
+    });
+    
+    Thread.sleep(10000);
+    client.invoke(new SerializableCallable() {
+      public Object call() throws Exception {
+        Region<CustId, Customer> custRegion = getCache().getRegion(CUSTOMER);
+        Region<OrderId, Order> orderRegion = getCache().getRegion(ORDER);
+        Region<CustId,Customer> refRegion = getCache().getRegion(D_REFERENCE);
+        ClientListener cl = (ClientListener) custRegion.getAttributes().getCacheListeners()[0];
+        getCache().getLogger().info("SWAP:CLIENTinvoked:"+cl.invoked);
+        assertTrue(cl.invoked);
+        assertTrue(((ClientCQListener)custRegion.getCache().getQueryService().getCqs()[0].getCqAttributes().getCqListener()).invoked);
+        return null;
+      }
+    });
+  }
+  
+  public void testTXWithCQCommitInAccessorConnectedToDatastoreCQ() throws Exception {
+    Host host = Host.getHost(0);
+    VM accessor = host.getVM(0);
+    VM datastore = host.getVM(1);
+    VM client = host.getVM(2);
+    
+    initAccessorAndDataStore(accessor, datastore, 0);
+    int port = startServer(datastore);
+    
+    createClientRegion(client, port, false, true, true);
+    accessor.invoke(new SerializableCallable() {
+      public Object call() throws Exception {
+        Region<CustId, Customer> custRegion = getCache().getRegion(CUSTOMER);
+        Region<OrderId, Order> orderRegion = getCache().getRegion(ORDER);
+        Region<CustId,Customer> refRegion = getCache().getRegion(D_REFERENCE);
+        CustId custId = new CustId(1);
+        OrderId orderId = new OrderId(1, custId);
+        getCache().getCacheTransactionManager().begin();
+        custRegion.put(custId, new Customer("foo", "bar"));
+//        orderRegion.put(orderId, new Order("fooOrder"));
+//        refRegion.put(custId, new Customer("foo", "bar"));
+        getCache().getCacheTransactionManager().commit();
+        return null;
+      }
+    });
+    
+    Thread.sleep(10000);
+    client.invoke(new SerializableCallable() {
+      public Object call() throws Exception {
+        Region<CustId, Customer> custRegion = getCache().getRegion(CUSTOMER);
+        Region<OrderId, Order> orderRegion = getCache().getRegion(ORDER);
+        Region<CustId,Customer> refRegion = getCache().getRegion(D_REFERENCE);
+        ClientListener cl = (ClientListener) custRegion.getAttributes().getCacheListeners()[0];
+        getCache().getLogger().info("SWAP:CLIENTinvoked:"+cl.invoked);
+        assertTrue(cl.invoked);
+        assertTrue(((ClientCQListener)custRegion.getCache().getQueryService().getCqs()[0].getCqAttributes().getCqListener()).invoked);
+        return null;
+      }
+    });
+  }
+  
+  public void testTXWithCQCommitInAccessorConnectedToAccessorCQ() throws Exception {
+    Host host = Host.getHost(0);
+    VM accessor = host.getVM(0);
+    VM datastore = host.getVM(1);
+    VM client = host.getVM(2);
+    
+    initAccessorAndDataStore(accessor, datastore, 0);
+    int port = startServer(accessor);
+    
+    createClientRegion(client, port, false, true, true);
+    accessor.invoke(new SerializableCallable() {
+      public Object call() throws Exception {
+        Region<CustId, Customer> custRegion = getCache().getRegion(CUSTOMER);
+        Region<OrderId, Order> orderRegion = getCache().getRegion(ORDER);
+        Region<CustId,Customer> refRegion = getCache().getRegion(D_REFERENCE);
+        CustId custId = new CustId(1);
+        OrderId orderId = new OrderId(1, custId);
+        getCache().getCacheTransactionManager().begin();
+        custRegion.put(custId, new Customer("foo", "bar"));
+//        orderRegion.put(orderId, new Order("fooOrder"));
+//        refRegion.put(custId, new Customer("foo", "bar"));
+        getCache().getCacheTransactionManager().commit();
+        return null;
+      }
+    });
+    
+    Thread.sleep(10000);
+    client.invoke(new SerializableCallable() {
+      public Object call() throws Exception {
+        Region<CustId, Customer> custRegion = getCache().getRegion(CUSTOMER);
+        Region<OrderId, Order> orderRegion = getCache().getRegion(ORDER);
+        Region<CustId,Customer> refRegion = getCache().getRegion(D_REFERENCE);
+        ClientListener cl = (ClientListener) custRegion.getAttributes().getCacheListeners()[0];
+        getCache().getLogger().info("SWAP:CLIENTinvoked:"+cl.invoked);
+        assertTrue(cl.invoked);
+        assertTrue(((ClientCQListener)custRegion.getCache().getQueryService().getCqs()[0].getCqAttributes().getCqListener()).invoked);
+        return null;
+      }
+    });
+  }
+  
+  
+  public void testCQCommitInDatastoreConnectedToAccessorCQ() throws Exception {
+    Host host = Host.getHost(0);
+    VM accessor = host.getVM(0);
+    VM datastore = host.getVM(1);
+    VM client = host.getVM(2);
+    
+    initAccessorAndDataStore(accessor, datastore, 0);
+    int port = startServer(accessor);
+    
+    createClientRegion(client, port, false, true, true);
+    datastore.invoke(new SerializableCallable() {
+      public Object call() throws Exception {
+        Region<CustId, Customer> custRegion = getCache().getRegion(CUSTOMER);
+        Region<OrderId, Order> orderRegion = getCache().getRegion(ORDER);
+        Region<CustId,Customer> refRegion = getCache().getRegion(D_REFERENCE);
+        CustId custId = new CustId(1);
+        OrderId orderId = new OrderId(1, custId);
+        getCache().getCacheTransactionManager().begin();
+        custRegion.put(custId, new Customer("foo", "bar"));
+//        orderRegion.put(orderId, new Order("fooOrder"));
+//        refRegion.put(custId, new Customer("foo", "bar"));
+        getCache().getCacheTransactionManager().commit();
+        return null;
+      }
+    });
+    
+    Thread.sleep(10000);
+    client.invoke(new SerializableCallable() {
+      public Object call() throws Exception {
+        Region<CustId, Customer> custRegion = getCache().getRegion(CUSTOMER);
+        Region<OrderId, Order> orderRegion = getCache().getRegion(ORDER);
+        Region<CustId,Customer> refRegion = getCache().getRegion(D_REFERENCE);
+        ClientListener cl = (ClientListener) custRegion.getAttributes().getCacheListeners()[0];
+        getCache().getLogger().info("SWAP:CLIENTinvoked:"+cl.invoked);
+        assertTrue(cl.invoked);
+        assertTrue(((ClientCQListener)custRegion.getCache().getQueryService().getCqs()[0].getCqAttributes().getCqListener()).invoked);
+        return null;
+      }
+    });
+  }
+
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
new file mode 100755
index 0000000..05eb566
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
@@ -0,0 +1,814 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+/**
+ *
+ */
+package com.gemstone.gemfire.internal.cache.ha;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import com.gemstone.gemfire.LogWriter;
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.DiskStoreFactory;
+import com.gemstone.gemfire.cache.ExpirationAttributes;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionAttributes;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.client.PoolFactory;
+import com.gemstone.gemfire.cache.client.PoolManager;
+import com.gemstone.gemfire.cache.query.CqAttributes;
+import com.gemstone.gemfire.cache.query.CqAttributesFactory;
+import com.gemstone.gemfire.cache.query.CqListener;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.cache.query.SelectResults;
+import com.gemstone.gemfire.cache.query.cq.dunit.CqQueryTestListener;
+import com.gemstone.gemfire.cache.query.data.Portfolio;
+import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.cache30.CertifiableTestCacheListener;
+import com.gemstone.gemfire.distributed.DistributedSystem;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.internal.AvailablePort;
+import com.gemstone.gemfire.internal.cache.CacheServerImpl;
+import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
+import com.gemstone.gemfire.internal.cache.tier.sockets.ClientUpdateMessageImpl;
+import com.gemstone.gemfire.internal.cache.tier.sockets.ConflationDUnitTest;
+import com.gemstone.gemfire.internal.cache.InternalRegionArguments;
+import com.gemstone.gemfire.internal.cache.LocalRegion;
+
+import dunit.DistributedTestCase;
+import dunit.Host;
+import dunit.VM;
+
+/**
+ *
+ *
+ * @author ashetkar
+ * @since 5.7
+ *
+ */
+public class CQListGIIDUnitTest extends DistributedTestCase {
+  private final static int CREATE = 0;
+
+  private final static int UPDATE = 1;
+
+  private final static int DESTROY = 2;
+
+  private final static int INVALIDATE = 3;
+
+  private final static int CLOSE = 4;
+
+  private final static int REGION_CLEAR = 5;
+
+  private final static int REGION_INVALIDATE = 6;
+
+  protected static Cache cache = null;
+
+  protected static VM serverVM0 = null;
+
+  private static VM serverVM1 = null;
+
+  protected static VM clientVM1 = null;
+
+  protected static VM clientVM2 = null;
+
+  private static int PORT1;
+
+  private static int PORT2;
+
+  private static final String regionName = "CQListGIIDUnitTest";
+
+  private static final Map map = new HashMap();
+
+  private static LogWriter logger = null;
+
+  public static final String[] regions = new String[] { "regionA", "regionB" };
+
+  public static final String KEY = "key-";
+
+  public String[] cqs = new String[] {
+  // 0 - Test for ">"
+      "SELECT ALL * FROM /root/" + regions[0] + " p where p.ID > 0",
+
+      // 1 - Test for "=" and "and".
+      "SELECT ALL * FROM /root/" + regions[0]
+          + " p where p.ID = 2 and p.status='active'",
+
+      // 2 - Test for "<" and "and".
+      "SELECT ALL * FROM /root/" + regions[1]
+          + " p where p.ID < 5 and p.status='active'",
+
+      // FOLLOWING CQS ARE NOT TESTED WITH VALUES; THEY ARE USED TO TEST PARSING
+      // LOGIC WITHIN CQ.
+      // 3
+      "SELECT * FROM /root/" + regions[0] + " ;",
+      // 4
+      "SELECT ALL * FROM /root/" + regions[0],
+      // 5
+      "import com.gemstone.gemfire.cache.\"query\".data.Portfolio; "
+          + "SELECT ALL * FROM /root/" + regions[0] + " TYPE Portfolio",
+      // 6
+      "import com.gemstone.gemfire.cache.\"query\".data.Portfolio; "
+          + "SELECT ALL * FROM /root/" + regions[0] + " p TYPE Portfolio",
+      // 7
+      "SELECT ALL * FROM /root/" + regions[1]
+          + " p where p.ID < 5 and p.status='active';",
+      // 8
+      "SELECT ALL * FROM /root/" + regions[0] + "  ;",
+      // 9
+      "SELECT ALL * FROM /root/" + regions[0] + " p where p.description = NULL",
+      // 10
+      "SELECT ALL * FROM /root/" + regions[0]
+          + " p where p.ID > 0 and p.status='active'", };
+
+  /**
+   * @param name
+   *          name of the test
+   */
+  public CQListGIIDUnitTest(String name) {
+    super(name);
+  }
+
+  /**
+   * Sets up the test.
+   */
+  public void setUp() throws Exception {
+    super.setUp();
+
+    final Host host = Host.getHost(0);
+    serverVM0 = host.getVM(0);
+    serverVM1 = host.getVM(1);
+    clientVM1 = host.getVM(2);
+    clientVM2 = host.getVM(3);
+
+    PORT1 = ((Integer)serverVM0.invoke(CQListGIIDUnitTest.class,
+        "createServerCache",
+        new Object[] { HARegionQueue.HA_EVICTION_POLICY_MEMORY })).intValue();
+    PORT2 = ((Integer)serverVM1.invoke(CQListGIIDUnitTest.class,
+        "createServerCache",
+        new Object[] { HARegionQueue.HA_EVICTION_POLICY_ENTRY })).intValue();
+  }
+
+  /**
+   * Tears down the test.
+   */
+  public void tearDown2() throws Exception {
+    super.tearDown2();
+    serverVM0.invoke(ConflationDUnitTest.class, "unsetIsSlowStart");
+    serverVM1.invoke(ConflationDUnitTest.class, "unsetIsSlowStart");
+    closeCache();
+    clientVM1.invoke(CQListGIIDUnitTest.class, "closeCache");
+    clientVM2.invoke(CQListGIIDUnitTest.class, "closeCache");
+    // then close the servers
+    serverVM0.invoke(CQListGIIDUnitTest.class, "closeCache");
+    serverVM1.invoke(CQListGIIDUnitTest.class, "closeCache");
+    disconnectAllFromDS();
+  }
+
+  private void createCache(Properties props) throws Exception {
+    DistributedSystem ds = getSystem(props);
+    ds.disconnect();
+    ds = getSystem(props);
+    assertNotNull(ds);
+    cache = CacheFactory.create(ds);
+    assertNotNull(cache);
+  }
+
+  public static Integer createServerCache() throws Exception {
+    return createServerCache(null);
+  }
+
+  public static Integer createServerCache(String ePolicy) throws Exception {
+    return createServerCache(ePolicy, Integer.valueOf(1));
+  }
+
+  public static Integer createServerCache(String ePolicy, Integer cap)
+      throws Exception {
+    new CQListGIIDUnitTest("temp").createCache(new Properties());
+    AttributesFactory factory = new AttributesFactory();
+    factory.setScope(Scope.DISTRIBUTED_ACK);
+    factory.setDataPolicy(DataPolicy.REPLICATE);
+    RegionAttributes attrs = factory.create();
+    // cache.createRegion(regionName, attrs);
+    createRegion(regions[0], "root", attrs);
+    createRegion(regions[1], "root", attrs);
+    Thread.sleep(2000);
+    logger = cache.getLogger();
+
+    int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    CacheServer server1 = cache.addCacheServer();
+    server1.setPort(port);
+    server1.setNotifyBySubscription(true);
+    if (ePolicy != null) {
+      File overflowDirectory = new File("bsi_overflow_"+port);
+      overflowDirectory.mkdir();
+      DiskStoreFactory dsf = cache.createDiskStoreFactory();
+      File[] dirs1 = new File[] {overflowDirectory};
+
+      server1.getClientSubscriptionConfig().setEvictionPolicy(ePolicy);
+      server1.getClientSubscriptionConfig().setCapacity(cap.intValue());
+      // specify diskstore for this server
+      server1.getClientSubscriptionConfig().setDiskStoreName(dsf.setDiskDirs(dirs1).create("bsi").getName());
+    }
+    server1.start();
+    Thread.sleep(2000);
+    return Integer.valueOf(server1.getPort());
+  }
+
+  public static Integer createOneMoreBridgeServer(Boolean notifyBySubscription)
+      throws Exception {
+    int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    CacheServer server1 = cache.addCacheServer();
+    server1.setPort(port);
+    server1.setNotifyBySubscription(notifyBySubscription.booleanValue());
+    server1.getClientSubscriptionConfig().setEvictionPolicy(
+        HARegionQueue.HA_EVICTION_POLICY_MEMORY);
+    // let this server to use default diskstore
+    server1.start();
+    return Integer.valueOf(server1.getPort());
+  }
+
+  public static final Region createRegion(String name, String rootName,
+      RegionAttributes attrs) throws CacheException {
+    Region root = cache.getRegion(rootName);
+    if (root == null) {
+      // don't put listeners on root region
+      RegionAttributes rootAttrs = attrs;
+      AttributesFactory fac = new AttributesFactory(attrs);
+      ExpirationAttributes expiration = ExpirationAttributes.DEFAULT;
+
+      // fac.setCacheListener(null);
+      fac.setCacheLoader(null);
+      fac.setCacheWriter(null);
+      fac.setPoolName(null);
+      fac.setPartitionAttributes(null);
+      fac.setRegionTimeToLive(expiration);
+      fac.setEntryTimeToLive(expiration);
+      fac.setRegionIdleTimeout(expiration);
+      fac.setEntryIdleTimeout(expiration);
+      rootAttrs = fac.create();
+      root = cache.createRegion(rootName, rootAttrs);
+    }
+
+    return createSubregion(root, name, attrs, null);
+  }
+
+  /**
+   * A helper for creating a subregion, potentially using a package protected
+   * method to do so.  
+   * @param root the parent region
+   * @param name the name of the subregion to create
+   * @param attrs the attributes used to create the subregion
+   * @param internalArgs if not null, then use the package protected creation mechanism
+   * @return the subregion whose parent is the provided root
+   * @throws CacheException
+   * @see Region#createSubregion(String, RegionAttributes)
+   * @see LocalRegion#createSubregion(String, RegionAttributes, InternalRegionArguments)
+   */
+  public static Region createSubregion(Region root, String name,
+      RegionAttributes attrs, final InternalRegionArguments internalArgs) throws CacheException
+  {
+    if (internalArgs == null) {
+      return root.createSubregion(name, attrs);
+    } else {
+      try {
+        LocalRegion lr = (LocalRegion) root;
+        return lr.createSubregion(name, attrs, internalArgs);
+      } catch (IOException ioe) {
+        AssertionError assErr = new AssertionError("unexpected exception");
+        assErr.initCause(ioe);
+        throw assErr;
+      } catch (ClassNotFoundException cnfe) {
+        AssertionError assErr = new AssertionError("unexpected exception");
+        assErr.initCause(cnfe);
+        throw assErr;
+      } 
+    }
+  }
+  
+  public static void createClientCache(Integer port1, Integer port2,
+      String rLevel) throws Exception {
+    createClientCache(port1, port2, Integer.valueOf(-1), rLevel, Boolean.FALSE);
+  }
+
+  public static void createClientCache(Integer port1, Integer port2,
+      String rLevel, Boolean addListener) throws Exception {
+    createClientCache(port1, port2, Integer.valueOf(-1), rLevel, addListener);
+  }
+
+  public static void createClientCache(Integer port1, Integer port2,
+      Integer port3, String rLevel) throws Exception {
+    createClientCache(port1, port2, port3, rLevel, Boolean.FALSE);
+  }
+
+  public static void destroyClientPool() {
+    cache.getRegion("root").getSubregion(regions[0]).close();
+    cache.getRegion("root").getSubregion(regions[1]).close();
+    PoolManager.find("clientPool").destroy();
+  }
+  
+  public static void createClientCache(Integer port1, Integer port2,
+      Integer port3, String rLevel, Boolean addListener) throws Exception {
+    CacheServerTestUtil.disableShufflingOfEndpoints();
+    String host = DistributedTestCase.getIPLiteral();
+
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "");
+    new CQListGIIDUnitTest("temp").createCache(props);
+
+    PoolFactory pf = PoolManager.createFactory();
+    int endPointCount = 1;
+    pf.addServer(host, port1);
+    if (port2.intValue() != -1) {
+      pf.addServer(host, port2);
+      endPointCount++;
+    }
+    if (port3.intValue() != -1) {
+      pf.addServer(host, port3);
+      endPointCount++;
+    }
+    pf.setRetryAttempts(5);
+    pf.setReadTimeout(2500);
+    pf.setSocketBufferSize(32768);
+    pf.setPingInterval(1000);
+    pf.setMinConnections(endPointCount*2);
+    pf.setSubscriptionRedundancy(Integer.parseInt(rLevel));
+    pf.setSubscriptionEnabled(true).create("clientPool");
+
+    try {
+      cache.getQueryService();
+    }
+    catch (Exception cqe) {
+      fail("Failed to getCQService.", cqe);
+    }
+
+    AttributesFactory factory = new AttributesFactory();
+    factory.setScope(Scope.LOCAL);
+    factory.setPoolName("clientPool");
+
+    RegionAttributes attrs = factory.create();
+    createRegion(regions[0], "root", attrs);
+    createRegion(regions[1], "root", attrs);
+    logger = cache.getLogger();
+  }
+
+  /* Register CQs */
+  public static void createCQ(String cqName, String queryStr) {
+    getLogWriter().info("### Create CQ. ###" + cqName);
+    // Get CQ Service.
+    QueryService cqService = null;
+    try {
+      cqService = cache.getQueryService();
+    }
+    catch (Exception cqe) {
+      fail("Failed to getCQService.", cqe);
+    }
+    // Create CQ Attributes.
+    CqAttributesFactory cqf = new CqAttributesFactory();
+    CqListener[] cqListeners = { new CqQueryTestListener(getLogWriter()) };
+    ((CqQueryTestListener)cqListeners[0]).cqName = cqName;
+
+    cqf.initCqListeners(cqListeners);
+    CqAttributes cqa = cqf.create();
+
+    // Create CQ.
+    try {
+      CqQuery cq1 = cqService.newCq(cqName, queryStr, cqa);
+      assertTrue("newCq() state mismatch", cq1.getState().isStopped());
+    }
+    catch (Exception ex) {
+      getLogWriter().info("CqService is :" + cqService);
+      ex.printStackTrace();
+      AssertionError err = new AssertionError("Failed to create CQ " + cqName
+          + " . ");
+      err.initCause(ex);
+      throw err;
+    }
+  }
+
+  public static void executeCQ(String cqName, Boolean initialResults) {
+    getLogWriter().info("### DEBUG EXECUTE CQ START ####");
+    // Get CQ Service.
+    QueryService cqService = null;
+    CqQuery cq1 = null;
+    cqService = cache.getQueryService();
+
+    // Get CqQuery object.
+    try {
+      cq1 = cqService.getCq(cqName);
+      if (cq1 == null) {
+        getLogWriter().info(
+            "Failed to get CqQuery object for CQ name: " + cqName);
+        fail("Failed to get CQ " + cqName, new Exception("Failed to get CQ "
+            + cqName));
+      }
+      else {
+        getLogWriter().info("Obtained CQ, CQ name: " + cq1.getName());
+        assertTrue("newCq() state mismatch", cq1.getState().isStopped());
+      }
+    }
+    catch (Exception ex) {
+      getLogWriter().info("CqService is :" + cqService);
+      getLogWriter().error(ex);
+      AssertionError err = new AssertionError("Failed to execute  CQ " + cqName);
+      err.initCause(ex);
+      throw err;
+    }
+
+    if (initialResults.booleanValue()) {
+      SelectResults cqResults = null;
+
+      try {
+        cqResults = cq1.executeWithInitialResults();
+      }
+      catch (Exception ex) {
+        getLogWriter().info("CqService is :" + cqService);
+        ex.printStackTrace();
+        AssertionError err = new AssertionError("Failed to execute  CQ "
+            + cqName);
+        err.initCause(ex);
+        throw err;
+      }
+      getLogWriter().info("initial result size = " + cqResults.size());
+      assertTrue("executeWithInitialResults() state mismatch", cq1.getState()
+          .isRunning());
+      // if (expectedResultsSize >= 0) {
+      // assertEquals("unexpected results size", expectedResultsSize, cqResults
+      // .size());
+      // }
+    }
+    else {
+
+      try {
+        cq1.execute();
+      }
+      catch (Exception ex) {
+        getLogWriter().info("CqService is :" + cqService);
+        ex.printStackTrace();
+        AssertionError err = new AssertionError("Failed to execute  CQ "
+            + cqName);
+        err.initCause(ex);
+        throw err;
+      }
+      assertTrue("execute() state mismatch", cq1.getState().isRunning());
+    }
+  }
+
+  public static void registerInterestListCQ(String regionName, int keySize) {
+    // Get CQ Service.
+    Region region = null;
+    try {
+      region = cache.getRegion("root").getSubregion(regionName);
+      region.getAttributesMutator().setCacheListener(
+          new CertifiableTestCacheListener(getLogWriter()));
+    }
+    catch (Exception cqe) {
+      AssertionError err = new AssertionError("Failed to get Region.");
+      err.initCause(cqe);
+      throw err;
+    }
+
+    try {
+      List list = new ArrayList();
+      for (int i = 1; i <= keySize; i++) {
+        list.add(KEY + i);
+      }
+      region.registerInterest(list);
+    }
+    catch (Exception ex) {
+      AssertionError err = new AssertionError("Failed to Register InterestList");
+      err.initCause(ex);
+      throw err;
+    }
+  }
+
+  public static void waitForCreated(String cqName, String key) {
+    waitForEvent(0, cqName, key);
+  }
+
+  public static void waitForEvent(int event, String cqName, String key) {
+    // Get CQ Service.
+    QueryService cqService = null;
+    try {
+      cqService = cache.getQueryService();
+    }
+    catch (Exception cqe) {
+      cqe.printStackTrace();
+      fail("Failed to getCQService.", cqe);
+    }
+
+    CqQuery cQuery = cqService.getCq(cqName);
+    if (cQuery == null) {
+      fail("Failed to get CqQuery for CQ : " + cqName, new Exception(
+          "Failed to get CqQuery for CQ : " + cqName));
+    }
+
+    CqAttributes cqAttr = cQuery.getCqAttributes();
+    CqListener[] cqListener = cqAttr.getCqListeners();
+    CqQueryTestListener listener = (CqQueryTestListener)cqListener[0];
+
+    switch (event) {
+      case CREATE:
+        listener.waitForCreated(key);
+        break;
+
+      case UPDATE:
+        listener.waitForUpdated(key);
+        break;
+
+      case DESTROY:
+        listener.waitForDestroyed(key);
+        break;
+
+      case INVALIDATE:
+        listener.waitForInvalidated(key);
+        break;
+
+      case CLOSE:
+        listener.waitForClose();
+        break;
+
+      case REGION_CLEAR:
+        listener.waitForRegionClear();
+        break;
+
+      case REGION_INVALIDATE:
+        listener.waitForRegionInvalidate();
+        break;
+
+    }
+  }
+
+  public static void registerInterestListAll() {
+    try {
+      Region r = cache.getRegion("/" + regionName);
+      assertNotNull(r);
+      r.registerInterest("ALL_KEYS");
+    }
+    catch (Exception ex) {
+      fail("failed in registerInterestListAll", ex);
+    }
+  }
+
+  public static void registerInterestList() {
+    try {
+      Region r = cache.getRegion("/" + regionName);
+      assertNotNull(r);
+      r.registerInterest("k1");
+      r.registerInterest("k3");
+      r.registerInterest("k5");
+    }
+    catch (Exception ex) {
+      fail("failed while registering keys", ex);
+    }
+  }
+
+  public static void putEntries(String rName, Integer num) {
+    try {
+      Region r = cache.getRegion("root").getSubregion(rName);
+      assertNotNull(r);
+      for (int i = 0; i < num.longValue(); i++) {
+        r.put(KEY + i, new Portfolio(i + 1));
+      }
+      getLogWriter().info(
+          "### Number of Entries in Region " + rName + ": " + r.keys().size());
+    }
+    catch (Exception ex) {
+      fail("failed in putEntries()", ex);
+    }
+  }
+
+  /**
+   *
+   *
+   * @throws Exception
+   */
+  public void _testSpecificClientCQIsGIIedPart1() throws Exception {
+    Integer size = Integer.valueOf(10);
+    // slow start for dispatcher
+    serverVM0.invoke(ConflationDUnitTest.class, "setIsSlowStart",
+        new Object[] { "30000" });
+    serverVM1.invoke(ConflationDUnitTest.class, "setIsSlowStart",
+        new Object[] { "30000" });
+
+    // createClientCache(Integer.valueOf(PORT1), Integer.valueOf(PORT2), "1");
+    clientVM1.invoke(CQListGIIDUnitTest.class, "createClientCache",
+        new Object[] { Integer.valueOf(PORT1), Integer.valueOf(PORT2), "1" });
+    clientVM2.invoke(CQListGIIDUnitTest.class, "createClientCache",
+        new Object[] { Integer.valueOf(PORT1), Integer.valueOf(PORT2), "0" });
+
+    clientVM1.invoke(CQListGIIDUnitTest.class, "createCQ", new Object[] {
+        "testSpecificClientCQIsGIIed_0", cqs[0] });
+    clientVM1.invoke(CQListGIIDUnitTest.class, "executeCQ", new Object[] {
+        "testSpecificClientCQIsGIIed_0", Boolean.FALSE });
+    clientVM2.invoke(CQListGIIDUnitTest.class, "createCQ", new Object[] {
+        "testSpecificClientCQIsGIIed_0", cqs[0] });
+    clientVM2.invoke(CQListGIIDUnitTest.class, "executeCQ", new Object[] {
+        "testSpecificClientCQIsGIIed_0", Boolean.FALSE });
+
+    serverVM1.invoke(CQListGIIDUnitTest.class, "stopServer");
+
+    serverVM0.invoke(CQListGIIDUnitTest.class, "putEntries", new Object[] {
+        regions[0], size });
+
+    serverVM1.invoke(CQListGIIDUnitTest.class, "startServer");
+    Thread.sleep(3000); // TODO: Find a better 'n reliable alternative
+
+    serverVM0.invoke(CQListGIIDUnitTest.class, "VerifyCUMCQList", new Object[] {
+        size, Integer.valueOf(2) });
+    serverVM1.invoke(CQListGIIDUnitTest.class, "VerifyCUMCQList", new Object[] {
+        size, Integer.valueOf(1) });
+    serverVM0.invoke(ConflationDUnitTest.class, "unsetIsSlowStart");
+    serverVM1.invoke(ConflationDUnitTest.class, "unsetIsSlowStart");
+  }
+
+  /**
+   * This test asserts that cq list of a client for an event is not lost if that
+   * client's queue has been GII'ed to a server where that event already
+   * existed.
+   *
+   * @throws Exception
+   */
+  public void testClientCQNotLostAtGIIReceiver() throws Exception {
+    Integer size = Integer.valueOf(10);
+    VM serverVM2 = clientVM2;
+
+    int port3 = ((Integer)serverVM2.invoke(CQListGIIDUnitTest.class,
+        "createServerCache",
+        new Object[] { HARegionQueue.HA_EVICTION_POLICY_MEMORY })).intValue();
+
+    // slow start for dispatcher
+    serverVM0.invoke(ConflationDUnitTest.class, "setIsSlowStart",
+        new Object[] { "45000" });
+
+    // createClientCache(Integer.valueOf(PORT1), Integer.valueOf(PORT2), "1");
+    createClientCache(Integer.valueOf(PORT1), Integer.valueOf(PORT2),
+        Integer.valueOf(port3), "1");
+    try {
+    clientVM1.invoke(CQListGIIDUnitTest.class, "createClientCache",
+        new Object[] { Integer.valueOf(PORT1), Integer.valueOf(port3),
+            Integer.valueOf(PORT2), "1" });
+    try {
+    createCQ("testSpecificClientCQIsGIIed_0", cqs[0]);
+    executeCQ("testSpecificClientCQIsGIIed_0", Boolean.FALSE);
+    clientVM1.invoke(CQListGIIDUnitTest.class, "createCQ", new Object[] {
+        "testSpecificClientCQIsGIIed_0", cqs[0] });
+    clientVM1.invoke(CQListGIIDUnitTest.class, "executeCQ", new Object[] {
+        "testSpecificClientCQIsGIIed_0", Boolean.FALSE });
+
+    serverVM0.invoke(CQListGIIDUnitTest.class, "putEntries", new Object[] {
+        regions[0], size });
+
+    serverVM1.invoke(CQListGIIDUnitTest.class, "VerifyCUMCQList", new Object[] {
+        size, Integer.valueOf(1) });
+
+    serverVM2.invoke(CQListGIIDUnitTest.class, "stopServer");
+    Thread.sleep(3000); // TODO: Find a better 'n reliable alternative
+
+    serverVM0.invoke(CQListGIIDUnitTest.class, "VerifyCUMCQList", new Object[] {
+      size, Integer.valueOf(2) });
+    serverVM1.invoke(CQListGIIDUnitTest.class, "VerifyCUMCQList", new Object[] {
+        size, Integer.valueOf(2) });
+    } finally {
+      clientVM1.invoke(CQListGIIDUnitTest.class, "destroyClientPool");
+    }
+
+    } finally {
+      destroyClientPool();
+    }
+  }
+
+  public static void VerifyCUMCQList(Integer numOfKeys, Integer numOfClients) {
+    try {
+      Iterator iter = cache.getCacheServers().iterator();
+      if (iter.hasNext()) {
+        CacheServerImpl server = (CacheServerImpl)iter.next();
+        Map haContainer = server.getAcceptor().getCacheClientNotifier()
+            .getHaContainer();
+        Object[] keys = haContainer.keySet().toArray();
+        logger.fine("### numOfKeys :" + numOfKeys.intValue() + " keys.length : " + keys.length +
+            " haContainer size : " + haContainer.size());
+        assertEquals(numOfKeys.intValue(), keys.length);
+        for (int i = 0; i < numOfKeys.intValue(); i++) {
+          logger.fine("i=: " + i);
+          ClientUpdateMessageImpl cum = (ClientUpdateMessageImpl)haContainer
+              .get(keys[i]);
+          assertNotNull(cum);
+          assertNotNull(cum.getClientCqs());
+          assertEquals("This test may fail if the image provider gets an ack from client before providing image",
+              numOfClients.intValue(), cum.getClientCqs().size());
+        }
+      }
+    }
+    catch (Exception e) {
+      fail("failed in VerifyCUMCQList()" + e, e);
+    }
+  }
+
+  private static void stopOneBridgeServer(Integer port) {
+    try {
+      Iterator iter = cache.getCacheServers().iterator();
+      if (iter.hasNext()) {
+        CacheServer server = (CacheServer)iter.next();
+        if (server.getPort() == port.intValue()) {
+          server.stop();
+        }
+      }
+    }
+    catch (Exception e) {
+      fail("failed in stopOneBridgeServer()" + e);
+    }
+  }
+
+  public static void stopServer() {
+    try {
+      Iterator iter = cache.getCacheServers().iterator();
+      if (iter.hasNext()) {
+        CacheServer server = (CacheServer)iter.next();
+        server.stop();
+      }
+    }
+    catch (Exception e) {
+      fail("failed in stopServer()" + e);
+    }
+  }
+
+  public static void startServer() {
+    try {
+      Iterator iter = cache.getCacheServers().iterator();
+      if (iter.hasNext()) {
+        CacheServer server = (CacheServer)iter.next();
+        server.start();
+      }
+    }
+    catch (Exception e) {
+      fail("failed in startServer()" + e);
+    }
+  }
+
+  public static void waitTillMessagesAreDispatched(Integer port, Long waitLimit) {
+    try {
+      boolean dispatched = false;
+      Map haContainer = null;
+      haContainer = cache.getRegion(Region.SEPARATOR
+          + CacheServerImpl.generateNameForClientMsgsRegion(port.intValue()));
+      if (haContainer == null) {
+        Object[] servers = cache.getCacheServers().toArray();
+        for (int i = 0; i < servers.length; i++) {
+          if (port.intValue() == ((CacheServerImpl)servers[i]).getPort()) {
+            haContainer = ((CacheServerImpl)servers[i]).getAcceptor()
+                .getCacheClientNotifier().getHaContainer();
+            break;
+          }
+        }
+      }
+      long startTime = System.currentTimeMillis();
+      while (waitLimit.longValue() > (System.currentTimeMillis() - startTime)) {
+        if (haContainer.size() == 0) {
+          dispatched = true;
+          break;
+        }
+        try {
+          Thread.sleep(50);
+        }
+        catch (InterruptedException ie) {
+          fail("interrupted");
+        }
+      }
+      logger.fine("Exiting sleep, time elapsed was: "
+          + (System.currentTimeMillis() - startTime));
+      if (!dispatched) {
+        throw new Exception(
+            "Test tuning issue: The HARegionQueue is not fully drained, so cannot continue the test.");
+      }
+    }
+    catch (Exception e) {
+      fail("failed in waitTillMessagesAreDispatched()" + e);
+    }
+  }
+
+  public static void closeCache() {
+    if (cache != null && !cache.isClosed()) {
+      cache.close();
+      cache.getDistributedSystem().disconnect();
+    }
+  }
+
+}


[64/70] incubator-geode git commit: GEODE-864: Waiting for conflation thread in conflation tests

Posted by up...@apache.org.
GEODE-864: Waiting for conflation thread in conflation tests

For parallel queues, there is a actually a separate conflation thread
that removes entries from the queue on conflation. The tests need to
wait for this thread to finish it's work.

As part of this change, I refactored the ParallelWANConflationDUnitTest
to remove a bunch of duplicate code, replaced the VM.invoke(String)
calls with lambdas, and scaled the test down to create fewer buckets and
do fewer puts so that it runs in 1/4 of the time.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/a7249514
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/a7249514
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/a7249514

Branch: refs/heads/develop
Commit: a7249514eb2f09e5ca4920e7dc7aedfce4c2fe12
Parents: 27d965d
Author: Dan Smith <up...@apache.org>
Authored: Tue Jan 26 11:26:21 2016 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Tue Jan 26 16:50:11 2016 -0800

----------------------------------------------------------------------
 .../gemfire/internal/cache/wan/WANTestBase.java |  149 ++-
 ...arallelGatewaySenderOperationsDUnitTest.java |    8 +-
 .../ParallelWANConflationDUnitTest.java         | 1017 ++++++------------
 .../wan/serial/SerialWANStatsDUnitTest.java     |    2 +-
 4 files changed, 424 insertions(+), 752 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a7249514/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
index 230c8d8..5539eb1 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
@@ -39,6 +39,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import com.gemstone.gemfire.cache.AttributesFactory;
@@ -117,6 +118,7 @@ import com.gemstone.gemfire.test.dunit.DistributedTestCase;
 import com.gemstone.gemfire.test.dunit.Host;
 import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.util.test.TestUtil;
+import com.jayway.awaitility.Awaitility;
 
 import junit.framework.Assert;
 
@@ -2160,6 +2162,8 @@ public class WANTestBase extends DistributedTestCase{
         }
       }
       sender.pause();
+      ((AbstractGatewaySender) sender).getEventProcessor().waitForDispatcherToPause();
+      
     }
     finally {
       exp.remove();
@@ -2167,27 +2171,6 @@ public class WANTestBase extends DistributedTestCase{
     }
   }
   
-  public static void pauseSenderAndWaitForDispatcherToPause(String senderId) {
-    final ExpectedException exln = addExpectedException("Could not connect");
-    ExpectedException exp = addExpectedException(ForceReattemptException.class
-        .getName());
-    try {
-      Set<GatewaySender> senders = cache.getGatewaySenders();
-      GatewaySender sender = null;
-      for (GatewaySender s : senders) {
-        if (s.getId().equals(senderId)) {
-          sender = s;
-          break;
-        }
-      }
-      sender.pause();
-      ((AbstractGatewaySender)sender).getEventProcessor().waitForDispatcherToPause();
-    } finally {
-      exp.remove();
-      exln.remove();
-    }    
-  }
-
   public static void resumeSender(String senderId) {
     final ExpectedException exln = addExpectedException("Could not connect");
     ExpectedException exp = addExpectedException(ForceReattemptException.class
@@ -3189,35 +3172,23 @@ public class WANTestBase extends DistributedTestCase{
   
   
   public static Map putCustomerPartitionedRegion(int numPuts) {
-    assertNotNull(cache);
-    assertNotNull(customerRegion);
-    Map custKeyValues = new HashMap();
-    for (int i = 1; i <= numPuts; i++) {
-      CustId custid = new CustId(i);
-      Customer customer = new Customer("name" + i, "Address" + i);
-      try {
-        customerRegion.put(custid, customer);
-        custKeyValues.put(custid, customer);
-        assertTrue(customerRegion.containsKey(custid));
-        assertEquals(customer,customerRegion.get(custid));
-      }
-      catch (Exception e) {
-        fail(
-            "putCustomerPartitionedRegion : failed while doing put operation in CustomerPartitionedRegion ",
-            e);
-      }
-      getLogWriter().info("Customer :- { " + custid + " : " + customer + " }");
-    }
-    return custKeyValues;
+    String valueSuffix = "";
+    return putCustomerPartitionedRegion(numPuts, valueSuffix);
   }
   
   public static Map updateCustomerPartitionedRegion(int numPuts) {
+    String valueSuffix = "_update";
+    return putCustomerPartitionedRegion(numPuts, valueSuffix);
+  }
+
+  protected static Map putCustomerPartitionedRegion(int numPuts,
+      String valueSuffix) {
     assertNotNull(cache);
     assertNotNull(customerRegion);
-    Map custKeyValues = new HashMap();    
+    Map custKeyValues = new HashMap();
     for (int i = 1; i <= numPuts; i++) {
       CustId custid = new CustId(i);
-      Customer customer = new Customer("name" + i, "Address" + i + "_update");
+      Customer customer = new Customer("name" + i, "Address" + i + valueSuffix);
       try {
         customerRegion.put(custid, customer);
         assertTrue(customerRegion.containsKey(custid));
@@ -3240,24 +3211,22 @@ public class WANTestBase extends DistributedTestCase{
     Map orderKeyValues = new HashMap();
     for (int i = 1; i <= numPuts; i++) {
       CustId custid = new CustId(i);
-      for (int j = 1; j <= 1; j++) {
-        int oid = (i * 1) + j;
-        OrderId orderId = new OrderId(oid, custid);
-        Order order = new Order("OREDR" + oid);
-        try {
-          orderRegion.put(orderId, order);
-          orderKeyValues.put(orderId, order);
-          assertTrue(orderRegion.containsKey(orderId));
-          assertEquals(order,orderRegion.get(orderId));
+      int oid = i + 1;
+      OrderId orderId = new OrderId(oid, custid);
+      Order order = new Order("OREDR" + oid);
+      try {
+        orderRegion.put(orderId, order);
+        orderKeyValues.put(orderId, order);
+        assertTrue(orderRegion.containsKey(orderId));
+        assertEquals(order,orderRegion.get(orderId));
 
-        }
-        catch (Exception e) {
-          fail(
-              "putOrderPartitionedRegion : failed while doing put operation in OrderPartitionedRegion ",
-              e);
-        }
-        getLogWriter().info("Order :- { " + orderId + " : " + order + " }");
       }
+      catch (Exception e) {
+        fail(
+            "putOrderPartitionedRegion : failed while doing put operation in OrderPartitionedRegion ",
+            e);
+      }
+      getLogWriter().info("Order :- { " + orderId + " : " + order + " }");
     }
     return orderKeyValues;
   }
@@ -3412,36 +3381,7 @@ public class WANTestBase extends DistributedTestCase{
     }
     return shipmentKeyValue;
   }
-
-  public static void doPutsPDXSerializable(String regionName, int numPuts) {
-    Region r = cache.getRegion(Region.SEPARATOR + regionName);
-    assertNotNull(r);
-    for (int i = 0; i < numPuts; i++) {
-      r.put("Key_" + i, new SimpleClass(i, (byte)i));
-    }
-  }
   
-  public static void doPutsPDXSerializable2(String regionName, int numPuts) {
-    Region r = cache.getRegion(Region.SEPARATOR + regionName);
-    assertNotNull(r);
-    for (int i = 0; i < numPuts; i++) {
-      r.put("Key_" + i, new SimpleClass1(false, (short) i, "" + i, i,"" +i ,""+ i,i, i));
-    }
-  }
-  
-  
-  public static void doTxPuts(String regionName, int numPuts) {
-    Region r = cache.getRegion(Region.SEPARATOR + regionName);
-    assertNotNull(r);
-    CacheTransactionManager mgr = cache.getCacheTransactionManager();
-
-    mgr.begin();
-    r.put(0, 0);
-    r.put(100, 100);
-    r.put(200, 200);
-    mgr.commit();
-  }
-    
   public static Map updateShipmentPartitionedRegion(int numPuts) {
     assertNotNull(cache);
     assertNotNull(shipmentRegion);
@@ -3495,7 +3435,36 @@ public class WANTestBase extends DistributedTestCase{
     }
     return shipmentKeyValue;
   }
+
+  public static void doPutsPDXSerializable(String regionName, int numPuts) {
+    Region r = cache.getRegion(Region.SEPARATOR + regionName);
+    assertNotNull(r);
+    for (int i = 0; i < numPuts; i++) {
+      r.put("Key_" + i, new SimpleClass(i, (byte)i));
+    }
+  }
+  
+  public static void doPutsPDXSerializable2(String regionName, int numPuts) {
+    Region r = cache.getRegion(Region.SEPARATOR + regionName);
+    assertNotNull(r);
+    for (int i = 0; i < numPuts; i++) {
+      r.put("Key_" + i, new SimpleClass1(false, (short) i, "" + i, i,"" +i ,""+ i,i, i));
+    }
+  }
   
+  
+  public static void doTxPuts(String regionName, int numPuts) {
+    Region r = cache.getRegion(Region.SEPARATOR + regionName);
+    assertNotNull(r);
+    CacheTransactionManager mgr = cache.getCacheTransactionManager();
+
+    mgr.begin();
+    r.put(0, 0);
+    r.put(100, 100);
+    r.put(200, 200);
+    mgr.commit();
+  }
+    
   public static void doNextPuts(String regionName, int start, int numPuts) {
     //waitForSitesToUpdate();
     ExpectedException exp = addExpectedException(CacheClosedException.class
@@ -3512,6 +3481,10 @@ public class WANTestBase extends DistributedTestCase{
   }
   
   public static void checkQueueSize(String senderId, int numQueueEntries) {
+    Awaitility.await().atMost(10, TimeUnit.SECONDS).until(() -> testQueueSize(senderId, numQueueEntries));
+  }
+  
+  public static void testQueueSize(String senderId, int numQueueEntries) {
     GatewaySender sender = null;
     for (GatewaySender s : cache.getGatewaySenders()) {
       if (s.getId().equals(senderId)) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a7249514/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
index 19f6c4b..3d0eb5b 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
@@ -210,10 +210,10 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
     vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 100 });
     
     //now, pause all of the senders
-    vm4.invoke(WANTestBase.class, "pauseSenderAndWaitForDispatcherToPause", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "pauseSenderAndWaitForDispatcherToPause", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "pauseSenderAndWaitForDispatcherToPause", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "pauseSenderAndWaitForDispatcherToPause", new Object[] { "ln" });
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
     
     //SECOND RUN: keep one thread doing puts to the region
     vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a7249514/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
index 4acaaf4..763b9c4 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
@@ -40,92 +40,31 @@ public class ParallelWANConflationDUnitTest extends WANTestBase {
   }
 
   public void testParallelPropagationConflationDisabled() throws Exception {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true  });
-    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true  });
-    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, false, false, null, true  });
-
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 0, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 0, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 0, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 0, 100, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    pause(3000);
-
-    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, null, 1, 100, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, null, 1, 100, isOffHeap() });
-
-    pause(2000);
-    
-    final Map keyValues = new HashMap();
-    final Map updateKeyValues = new HashMap();
-    for(int i=0; i< 1000; i++) {
-      keyValues.put(i, i);
-    }
-    
-    
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, keyValues });
+    initialSetUp();
 
-    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() });
-    for(int i=0;i<500;i++) {
-      updateKeyValues.put(i, i+"_updated");
-    }
+    createSendersNoConflation();
+
+    createSenderPRs();
+
+    startPausedSenders();
+
+    createReceiverPrs();
+
+    final Map keyValues = putKeyValues();
+
+    vm4.invoke(() ->checkQueueSize( "ln", keyValues.size() ));
     
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues });
+    final Map updateKeyValues = updateKeyValues();
 
-    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", (keyValues.size() + updateKeyValues.size()) });
+    vm4.invoke(() ->checkQueueSize( "ln", (keyValues.size() + updateKeyValues.size()) ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName, 0 });
+    vm2.invoke(() ->validateRegionSize(
+        testName, 0 ));
 
-    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    resumeSenders();
 
     keyValues.putAll(updateKeyValues);
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName, keyValues.size() });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      testName, keyValues.size() });
-    
-    vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
-        testName, keyValues });
-    vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
-        testName, keyValues });
+    validateReceiverRegionSize(keyValues);
     
   }
 
@@ -137,661 +76,421 @@ public class ParallelWANConflationDUnitTest extends WANTestBase {
    * @throws Exception
    */
   public void testParallelPropagationBatchConflation() throws Exception {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-    
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 50, false, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-      true, 100, 50, false, false, null, true });
-    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-      true, 100, 50, false, false, null, true });
-    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-    true, 100, 50, false, false, null, true });
+    initialSetUp();
+    
+    vm4.invoke(() ->createSender( "ln", 2,
+        true, 100, 50, false, false, null, true ));
+    vm5.invoke(() ->createSender( "ln", 2,
+      true, 100, 50, false, false, null, true ));
+    vm6.invoke(() ->createSender( "ln", 2,
+      true, 100, 50, false, false, null, true ));
+    vm7.invoke(() ->createSender( "ln", 2,
+    true, 100, 50, false, false, null, true ));
   
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 0, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 0, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 0, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 0, 100, isOffHeap() });
+    createSenderPRs();
     
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    startSenders();
     
-    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    pauseSenders();
     
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, null, 1, 100, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, null, 1, 100, isOffHeap() });
+    createReceiverPrs();
 
     final Map keyValues = new HashMap();
     
-    for (int i = 1; i <= 100; i++) {
+    for (int i = 1; i <= 10; i++) {
       for (int j = 1; j <= 10; j++) {
         keyValues.put(j, i) ;
       }
-      vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] {
-        testName, keyValues });
+      vm4.invoke(() ->putGivenKeyValue(
+        testName, keyValues ));
     }
     
-    vm4.invoke(WANTestBase.class, "enableConflation", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "enableConflation", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "enableConflation", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "enableConflation", new Object[] { "ln" });
+    vm4.invoke(() ->enableConflation( "ln" ));
+    vm5.invoke(() ->enableConflation( "ln" ));
+    vm6.invoke(() ->enableConflation( "ln" ));
+    vm7.invoke(() ->enableConflation( "ln" ));
     
-    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    resumeSenders();
     
-    pause(2000);
-    ArrayList<Integer> v4List = (ArrayList<Integer>)vm4.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
-    ArrayList<Integer> v5List = (ArrayList<Integer>)vm5.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
-    ArrayList<Integer> v6List = (ArrayList<Integer>)vm6.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
-    ArrayList<Integer> v7List = (ArrayList<Integer>)vm7.invoke(
-        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
+    ArrayList<Integer> v4List = (ArrayList<Integer>)vm4.invoke(() -> 
+        WANTestBase.getSenderStats( "ln", 0 ));
+    ArrayList<Integer> v5List = (ArrayList<Integer>)vm5.invoke(() -> 
+        WANTestBase.getSenderStats( "ln", 0 ));
+    ArrayList<Integer> v6List = (ArrayList<Integer>)vm6.invoke(() -> 
+        WANTestBase.getSenderStats( "ln", 0 ));
+    ArrayList<Integer> v7List = (ArrayList<Integer>)vm7.invoke(() -> 
+        WANTestBase.getSenderStats( "ln", 0 ));
     
-    getLogWriter().info("KBKBKB: batch conflated events : vm4 : " + v4List.get(8));
-    getLogWriter().info("KBKBKB: batch conflated events : vm5 : " + v5List.get(8));
-    getLogWriter().info("KBKBKB: batch conflated events : vm6 : " + v6List.get(8));
-    getLogWriter().info("KBKBKB: batch conflated events : vm7 : " + v7List.get(8));
-    getLogWriter().info("KBKBKB: batch conflated events : " + (v4List.get(8) + v5List.get(8) + v6List.get(8) + v7List.get(8)));
     assertTrue("No events conflated in batch", (v4List.get(8) + v5List.get(8) + v6List.get(8) + v7List.get(8)) > 0);
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      testName, 10 });
+    vm2.invoke(() ->validateRegionSize(
+      testName, 10 ));
 
   }
   
   public void testParallelPropagationConflation() throws Exception {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, true, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, true, false, null, true });
-    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, true, false, null, true });
-    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, true, false, null, true });
-
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 0, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 0, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 0, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 0, 100, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    pause(3000);
-
-    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, null, 1, 100, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, null, 1, 100, isOffHeap() });
-
-    pause(2000);
-    
-    final Map keyValues = new HashMap();
-    final Map updateKeyValues = new HashMap();
-    for(int i=0; i< 1000; i++) {
-      keyValues.put(i, i);
-    }
-    
-    
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, keyValues });
+    doTestParallelPropagationConflation(0);
+  }
+  
+  public void testParallelPropagationConflationRedundancy2() throws Exception {
+    doTestParallelPropagationConflation(2);
+  }
+  
+  public void doTestParallelPropagationConflation(int redundancy) throws Exception {
+    initialSetUp();
 
-    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() });
-    for(int i=0;i<500;i++) {
-      updateKeyValues.put(i, i+"_updated");
-    }
-    
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues });
+    createSendersWithConflation();
 
-    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() + updateKeyValues.size() }); // creates aren't conflated
-    
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues });
+    createSenderPRs(redundancy);
 
-    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() + updateKeyValues.size() }); // creates aren't conflated
+    startPausedSenders();
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName, 0 });
+    createReceiverPrs();
 
-    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    final Map keyValues = putKeyValues();
 
-    keyValues.putAll(updateKeyValues);
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName, keyValues.size() });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      testName, keyValues.size() });
-    
-    vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
-        testName, keyValues });
-    vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
-        testName, keyValues });
-  }
-  
-
-  /**
-   * Reproduce the bug #47213.
-   * The test is same as above test, with the only difference that 
-   * redundancy is set to 1.
-   * @throws Exception
-   */
-  public void testParallelPropagationConflation_Bug47213() throws Exception {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, true, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, true, false, null, true });
-    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, true, false, null, true });
-    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, true, false, null, true });
-
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 2, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 2, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 2, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 2, 100, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    pause(3000);
-
-    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, null, 1, 100, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, null, 1, 100, isOffHeap() });
-
-    pause(2000);//give some time for all the senders to pause
-    
-    final Map keyValues = new HashMap();
-    final Map updateKeyValues = new HashMap();
-    for(int i=0; i< 1000; i++) {
-      keyValues.put(i, i);
-    }
-    
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, keyValues });
+    vm4.invoke(() ->checkQueueSize( "ln", keyValues.size() ));
+    final Map updateKeyValues = updateKeyValues();
 
-    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() });
-    for(int i=0;i<500;i++) {
-      updateKeyValues.put(i, i+"_updated");
-    }
+    vm4.invoke(() ->checkQueueSize( "ln", keyValues.size() + updateKeyValues.size() )); // creates aren't conflated
     
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues });
+    vm4.invoke(() ->putGivenKeyValue( testName, updateKeyValues ));
 
-    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() + updateKeyValues.size() }); // creates aren't conflated
+    vm4.invoke(() ->checkQueueSize( "ln", keyValues.size() + updateKeyValues.size() )); // creates aren't conflated
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName, 0 });
+    vm2.invoke(() ->validateRegionSize(
+        testName, 0 ));
 
-    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    resumeSenders();
 
     keyValues.putAll(updateKeyValues);
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName, keyValues.size() });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      testName, keyValues.size() });
-    
-    vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
-        testName, keyValues });
-    vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
-        testName, keyValues });
+    validateReceiverRegionSize(keyValues);
   }
   
   public void testParallelPropagationConflationOfRandomKeys() throws Exception {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, true, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, true, false, null, true });
-    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, true, false, null, true });
-    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, true, false, null, true });
-
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 0, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 0, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 0, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, "ln", 0, 100, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    pause(3000);
-
-    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, null, 1, 100, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName, null, 1, 100, isOffHeap() });
-
-    pause(2000);
+    initialSetUp();
 
-    final Map keyValues = new HashMap();
-    final Map updateKeyValues = new HashMap();
-    for(int i=0; i< 1000; i++) {
-      keyValues.put(i, i);
-    }
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, keyValues });
+    createSendersWithConflation();
+
+    createSenderPRs();
+
+    startPausedSenders();
+
+    createReceiverPrs();
+
+    final Map keyValues = putKeyValues();
 
-    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() });
+    vm4.invoke(() ->checkQueueSize( "ln", keyValues.size() ));
     
-    while(updateKeyValues.size()!=500) {
+    final Map updateKeyValues = new HashMap();
+    while(updateKeyValues.size()!=10) {
       int key = (new Random()).nextInt(keyValues.size());
       updateKeyValues.put(key, key+"_updated");
     }
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues });
+    vm4.invoke(() ->putGivenKeyValue( testName, updateKeyValues ));
 
-    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() + updateKeyValues.size() });
+    vm4.invoke(() ->checkQueueSize( "ln", keyValues.size() + updateKeyValues.size() ));
 
-    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues });
+    vm4.invoke(() ->putGivenKeyValue( testName, updateKeyValues ));
 
-    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() + updateKeyValues.size() });
+    vm4.invoke(() ->checkQueueSize( "ln", keyValues.size() + updateKeyValues.size() ));
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName, 0 });
+    vm2.invoke(() ->validateRegionSize(
+        testName, 0 ));
 
-    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    resumeSenders();
 
     
     keyValues.putAll(updateKeyValues);
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName, keyValues.size() });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      testName, keyValues.size() });
-    vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
-      testName, keyValues });
-    vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
-      testName, keyValues });
+    validateReceiverRegionSize(keyValues);
     
   }
   
   public void testParallelPropagationColocatedRegionConflation()
       throws Exception {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, true, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, true, false, null, true });
-    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, true, false, null, true });
-    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, true, false, null, true });
-
-    vm4.invoke(WANTestBase.class,
-        "createCustomerOrderShipmentPartitionedRegion", new Object[] {
-            testName, "ln", 0, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class,
-        "createCustomerOrderShipmentPartitionedRegion", new Object[] {
-            testName, "ln", 0, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class,
-        "createCustomerOrderShipmentPartitionedRegion", new Object[] {
-            testName, "ln", 0, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class,
-        "createCustomerOrderShipmentPartitionedRegion", new Object[] {
-            testName, "ln", 0, 100, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    pause(3000);
-
-    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
-    vm2.invoke(WANTestBase.class,
-        "createCustomerOrderShipmentPartitionedRegion", new Object[] {
-            testName, null, 1, 100, isOffHeap() });
-    vm3.invoke(WANTestBase.class,
-        "createCustomerOrderShipmentPartitionedRegion", new Object[] {
-            testName, null, 1, 100, isOffHeap() });
-
-    pause(2000);
-
-    Map custKeyValues = (Map)vm4.invoke(WANTestBase.class, "putCustomerPartitionedRegion",
-        new Object[] { 1000 });
-    Map orderKeyValues = (Map)vm4.invoke(WANTestBase.class, "putOrderPartitionedRegion",
-        new Object[] { 1000 });
-    Map shipmentKeyValues = (Map)vm4.invoke(WANTestBase.class, "putShipmentPartitionedRegion",
-        new Object[] { 1000 });
-
-    vm4.invoke(
-        WANTestBase.class,
-        "checkQueueSize",
-        new Object[] {
+    initialSetUp();
+
+    createSendersWithConflation();
+
+    createOrderShipmentOnSenders();
+
+    startPausedSenders();
+
+    createOrderShipmentOnReceivers();
+
+    Map custKeyValues = (Map)vm4.invoke(() ->putCustomerPartitionedRegion( 20 ));
+    Map orderKeyValues = (Map)vm4.invoke(() ->putOrderPartitionedRegion( 20 ));
+    Map shipmentKeyValues = (Map)vm4.invoke(() ->putShipmentPartitionedRegion( 20 ));
+
+    vm4.invoke(() -> 
+        WANTestBase.checkQueueSize(
             "ln",
             (custKeyValues.size() + orderKeyValues.size() + shipmentKeyValues
-                .size()) });
-
-    Map updatedCustKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateCustomerPartitionedRegion",
-        new Object[] { 500 });
-    Map updatedOrderKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateOrderPartitionedRegion",
-        new Object[] { 500 });
-    Map updatedShipmentKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateShipmentPartitionedRegion",
-        new Object[] { 500 });
-
-    vm4.invoke(
-        WANTestBase.class,
-        "checkQueueSize",
-        new Object[] {
+                .size()) ));
+
+    Map updatedCustKeyValues = (Map)vm4.invoke(() ->updateCustomerPartitionedRegion( 10 ));
+    Map updatedOrderKeyValues = (Map)vm4.invoke(() ->updateOrderPartitionedRegion( 10 ));
+    Map updatedShipmentKeyValues = (Map)vm4.invoke(() ->updateShipmentPartitionedRegion( 10 ));
+    int sum = (custKeyValues.size() + orderKeyValues.size() + shipmentKeyValues
+        .size())
+        + updatedCustKeyValues.size()
+        + updatedOrderKeyValues.size()
+        + updatedShipmentKeyValues.size();
+    vm4.invoke(() -> 
+        WANTestBase.checkQueueSize(
             "ln",
-            (custKeyValues.size() + orderKeyValues.size() + shipmentKeyValues
-                .size())
-                + updatedCustKeyValues.size()
-                + updatedOrderKeyValues.size()
-                + updatedShipmentKeyValues.size() });
-
-    updatedCustKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateCustomerPartitionedRegion",
-        new Object[] { 500 });
-    updatedOrderKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateOrderPartitionedRegion",
-        new Object[] { 500 });
-    updatedShipmentKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateShipmentPartitionedRegion",
-        new Object[] { 500 });
-
-    vm4.invoke(
-        WANTestBase.class,
-        "checkQueueSize",
-        new Object[] {
+            sum));
+
+    
+    updatedCustKeyValues = (Map)vm4.invoke(() ->updateCustomerPartitionedRegion( 10 ));
+    updatedOrderKeyValues = (Map)vm4.invoke(() ->updateOrderPartitionedRegion( 10 ));
+    updatedShipmentKeyValues = (Map)vm4.invoke(() ->updateShipmentPartitionedRegion( 10 ));
+    int sum2 = (custKeyValues.size() + orderKeyValues.size() + shipmentKeyValues
+        .size())
+        + updatedCustKeyValues.size()
+        + updatedOrderKeyValues.size()
+        + updatedShipmentKeyValues.size();
+    vm4.invoke(() -> 
+        WANTestBase.checkQueueSize(
             "ln",
-            (custKeyValues.size() + orderKeyValues.size() + shipmentKeyValues
-                .size())
-                + updatedCustKeyValues.size()
-                + updatedOrderKeyValues.size()
-                + updatedShipmentKeyValues.size() });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        WANTestBase.customerRegionName, 0 });
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        WANTestBase.orderRegionName, 0 });
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        WANTestBase.shipmentRegionName, 0 });
-
-    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+            sum2));
+
+    vm2.invoke(() ->validateRegionSize(
+        WANTestBase.customerRegionName, 0 ));
+    vm2.invoke(() ->validateRegionSize(
+        WANTestBase.orderRegionName, 0 ));
+    vm2.invoke(() ->validateRegionSize(
+        WANTestBase.shipmentRegionName, 0 ));
+
+    resumeSenders();
     
     custKeyValues.putAll(updatedCustKeyValues);
     orderKeyValues.putAll(updatedOrderKeyValues);
     shipmentKeyValues.putAll(updatedShipmentKeyValues);
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        WANTestBase.customerRegionName, custKeyValues.size() });
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        WANTestBase.orderRegionName, orderKeyValues.size() });
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        WANTestBase.shipmentRegionName, shipmentKeyValues.size() });
-
-    vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
-        WANTestBase.customerRegionName, custKeyValues });
-    vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
-        WANTestBase.orderRegionName, orderKeyValues });
-    vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
-        WANTestBase.shipmentRegionName, shipmentKeyValues });
-    
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        WANTestBase.customerRegionName, custKeyValues.size() });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        WANTestBase.orderRegionName, orderKeyValues.size() });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        WANTestBase.shipmentRegionName, shipmentKeyValues.size() });
-
-    vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
-        WANTestBase.customerRegionName, custKeyValues });
-    vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
-        WANTestBase.orderRegionName, orderKeyValues });
-    vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
-        WANTestBase.shipmentRegionName, shipmentKeyValues });
+    validateColocatedRegionContents(custKeyValues, orderKeyValues,
+        shipmentKeyValues);
     
   }
   
+  //
+  //This is the same as the previous test, except for the UsingCustId methods
   public void testParallelPropagationColoatedRegionConflationSameKey()
       throws Exception {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
-
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, true, false, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, true, false, null, true });
-    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, true, false, null, true });
-    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        true, 100, 10, true, false, null, true });
-
-    vm4.invoke(WANTestBase.class,
-        "createCustomerOrderShipmentPartitionedRegion", new Object[] {
-            testName, "ln", 0, 100, isOffHeap() });
-    vm5.invoke(WANTestBase.class,
-        "createCustomerOrderShipmentPartitionedRegion", new Object[] {
-            testName, "ln", 0, 100, isOffHeap() });
-    vm6.invoke(WANTestBase.class,
-        "createCustomerOrderShipmentPartitionedRegion", new Object[] {
-            testName, "ln", 0, 100, isOffHeap() });
-    vm7.invoke(WANTestBase.class,
-        "createCustomerOrderShipmentPartitionedRegion", new Object[] {
-            testName, "ln", 0, 100, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    pause(3000);
-
-    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
-    vm2.invoke(WANTestBase.class,
-        "createCustomerOrderShipmentPartitionedRegion", new Object[] {
-            testName, null, 1, 100, isOffHeap() });
-    vm3.invoke(WANTestBase.class,
-        "createCustomerOrderShipmentPartitionedRegion", new Object[] {
-            testName, null, 1, 100, isOffHeap() });
-
-    pause(2000);
-
-    Map custKeyValues = (Map)vm4.invoke(WANTestBase.class, "putCustomerPartitionedRegion",
-        new Object[] { 1000 });
-    Map orderKeyValues = (Map)vm4.invoke(WANTestBase.class, "putOrderPartitionedRegionUsingCustId",
-        new Object[] { 1000 });
-    Map shipmentKeyValues = (Map)vm4.invoke(WANTestBase.class, "putShipmentPartitionedRegionUsingCustId",
-        new Object[] { 1000 });
-
-    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", (custKeyValues.size() + orderKeyValues.size() + shipmentKeyValues
-      .size()) });
-
-    Map updatedCustKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateCustomerPartitionedRegion",
-        new Object[] { 500 });
-    Map updatedOrderKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateOrderPartitionedRegionUsingCustId",
-        new Object[] { 500 });
-    Map updatedShipmentKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateShipmentPartitionedRegionUsingCustId",
-        new Object[] { 500 });
-
-    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", (custKeyValues.size() + orderKeyValues.size() + shipmentKeyValues
-        .size()) + updatedCustKeyValues.size() + updatedOrderKeyValues.size() + updatedShipmentKeyValues.size() });
-
-    updatedCustKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateCustomerPartitionedRegion",
-        new Object[] { 500 });
-    updatedOrderKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateOrderPartitionedRegionUsingCustId",
-        new Object[] { 500 });
-    updatedShipmentKeyValues = (Map)vm4.invoke(WANTestBase.class, "updateShipmentPartitionedRegionUsingCustId",
-        new Object[] { 500 });
-
-    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", (custKeyValues.size() + orderKeyValues.size() + shipmentKeyValues
-        .size()) + updatedCustKeyValues.size() + updatedOrderKeyValues.size() + updatedShipmentKeyValues.size() });
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        WANTestBase.customerRegionName, 0 });
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        WANTestBase.orderRegionName, 0 });
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        WANTestBase.shipmentRegionName, 0 });
-
-    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    initialSetUp();
+
+    createSendersWithConflation();
+
+    createOrderShipmentOnSenders();
+
+    startPausedSenders();
+
+    createOrderShipmentOnReceivers();
+
+    Map custKeyValues = (Map)vm4.invoke(() ->putCustomerPartitionedRegion( 20 ));
+    Map orderKeyValues = (Map)vm4.invoke(() ->putOrderPartitionedRegionUsingCustId( 20 ));
+    Map shipmentKeyValues = (Map)vm4.invoke(() ->putShipmentPartitionedRegionUsingCustId( 20 ));
+
+    vm4.invoke(() ->checkQueueSize( "ln", (custKeyValues.size() + orderKeyValues.size() + shipmentKeyValues
+      .size()) ));
+
+    Map updatedCustKeyValues = (Map)vm4.invoke(() ->updateCustomerPartitionedRegion( 10 ));
+    Map updatedOrderKeyValues = (Map)vm4.invoke(() ->updateOrderPartitionedRegionUsingCustId( 10 ));
+    Map updatedShipmentKeyValues = (Map)vm4.invoke(() ->updateShipmentPartitionedRegionUsingCustId( 10 ));
+    int sum = (custKeyValues.size() + orderKeyValues.size() + shipmentKeyValues
+        .size()) + updatedCustKeyValues.size() + updatedOrderKeyValues.size() + updatedShipmentKeyValues.size() ;
+
+    vm4.invoke(() ->checkQueueSize( "ln", sum));
+
+    updatedCustKeyValues = (Map)vm4.invoke(() ->updateCustomerPartitionedRegion( 10 ));
+    updatedOrderKeyValues = (Map)vm4.invoke(() ->updateOrderPartitionedRegionUsingCustId( 10 ));
+    updatedShipmentKeyValues = (Map)vm4.invoke(() ->updateShipmentPartitionedRegionUsingCustId( 10 ));
+
+    int sum2 = (custKeyValues.size() + orderKeyValues.size() + shipmentKeyValues
+        .size()) + updatedCustKeyValues.size() + updatedOrderKeyValues.size() + updatedShipmentKeyValues.size();
+    vm4.invoke(() ->checkQueueSize( "ln", sum2));
+
+    vm2.invoke(() ->validateRegionSize(
+        WANTestBase.customerRegionName, 0 ));
+    vm2.invoke(() ->validateRegionSize(
+        WANTestBase.orderRegionName, 0 ));
+    vm2.invoke(() ->validateRegionSize(
+        WANTestBase.shipmentRegionName, 0 ));
+
+    resumeSenders();
 
     custKeyValues.putAll(updatedCustKeyValues);
     orderKeyValues.putAll(updatedOrderKeyValues);
     shipmentKeyValues.putAll(updatedShipmentKeyValues);
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        WANTestBase.customerRegionName, custKeyValues.size() });
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        WANTestBase.orderRegionName, orderKeyValues.size() });
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        WANTestBase.shipmentRegionName, shipmentKeyValues.size() });
-
-    vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
-        WANTestBase.customerRegionName, custKeyValues });
-    vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
-        WANTestBase.orderRegionName, orderKeyValues });
-    vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
-        WANTestBase.shipmentRegionName, shipmentKeyValues });
-
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        WANTestBase.customerRegionName, custKeyValues.size() });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        WANTestBase.orderRegionName, orderKeyValues.size() });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        WANTestBase.shipmentRegionName, shipmentKeyValues.size() });
-
-    vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
-        WANTestBase.customerRegionName, custKeyValues });
-    vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
-        WANTestBase.orderRegionName, orderKeyValues });
-    vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
-        WANTestBase.shipmentRegionName, shipmentKeyValues });
+    validateColocatedRegionContents(custKeyValues, orderKeyValues,
+        shipmentKeyValues);
+  }
+  
+  protected void validateColocatedRegionContents(Map custKeyValues,
+      Map orderKeyValues, Map shipmentKeyValues) {
+    vm2.invoke(() ->validateRegionSize(
+        WANTestBase.customerRegionName, custKeyValues.size() ));
+    vm2.invoke(() ->validateRegionSize(
+        WANTestBase.orderRegionName, orderKeyValues.size() ));
+    vm2.invoke(() ->validateRegionSize(
+        WANTestBase.shipmentRegionName, shipmentKeyValues.size() ));
+
+    vm2.invoke(() ->validateRegionContents(
+        WANTestBase.customerRegionName, custKeyValues ));
+    vm2.invoke(() ->validateRegionContents(
+        WANTestBase.orderRegionName, orderKeyValues ));
+    vm2.invoke(() ->validateRegionContents(
+        WANTestBase.shipmentRegionName, shipmentKeyValues ));
+    
+    vm3.invoke(() ->validateRegionSize(
+        WANTestBase.customerRegionName, custKeyValues.size() ));
+    vm3.invoke(() ->validateRegionSize(
+        WANTestBase.orderRegionName, orderKeyValues.size() ));
+    vm3.invoke(() ->validateRegionSize(
+        WANTestBase.shipmentRegionName, shipmentKeyValues.size() ));
+
+    vm3.invoke(() ->validateRegionContents(
+        WANTestBase.customerRegionName, custKeyValues ));
+    vm3.invoke(() ->validateRegionContents(
+        WANTestBase.orderRegionName, orderKeyValues ));
+    vm3.invoke(() ->validateRegionContents(
+        WANTestBase.shipmentRegionName, shipmentKeyValues ));
+  }
+
+  protected void createOrderShipmentOnReceivers() {
+    vm2.invoke(() ->createCustomerOrderShipmentPartitionedRegion(
+            testName, null, 1, 8, isOffHeap() ));
+    vm3.invoke(() ->createCustomerOrderShipmentPartitionedRegion(
+            testName, null, 1, 8, isOffHeap() ));
+  }
+
+  protected void createOrderShipmentOnSenders() {
+    vm4.invoke(() ->createCustomerOrderShipmentPartitionedRegion(
+            testName, "ln", 0, 8, isOffHeap() ));
+    vm5.invoke(() ->createCustomerOrderShipmentPartitionedRegion(
+            testName, "ln", 0, 8, isOffHeap() ));
+    vm6.invoke(() ->createCustomerOrderShipmentPartitionedRegion(
+            testName, "ln", 0, 8, isOffHeap() ));
+    vm7.invoke(() ->createCustomerOrderShipmentPartitionedRegion(
+            testName, "ln", 0, 8, isOffHeap() ));
+  }
+  
+  protected Map updateKeyValues() {
+    final Map updateKeyValues = new HashMap();
+    for(int i=0;i<10;i++) {
+      updateKeyValues.put(i, i+"_updated");
+    }
+    
+    vm4.invoke(() ->putGivenKeyValue( testName, updateKeyValues ));
+    return updateKeyValues;
+  }
+
+  protected Map putKeyValues() {
+    final Map keyValues = new HashMap();
+    for(int i=0; i< 20; i++) {
+      keyValues.put(i, i);
+    }
+    
+    
+    vm4.invoke(() ->putGivenKeyValue( testName, keyValues ));
+    return keyValues;
+  }
+
+  protected void validateReceiverRegionSize(final Map keyValues) {
+    vm2.invoke(() ->validateRegionSize(
+        testName, keyValues.size() ));
+    vm3.invoke(() ->validateRegionSize(
+      testName, keyValues.size() ));
+    
+    vm2.invoke(() ->validateRegionContents(
+        testName, keyValues ));
+    vm3.invoke(() ->validateRegionContents(
+        testName, keyValues ));
+  }
+
+  protected void resumeSenders() {
+    vm4.invoke(() ->resumeSender( "ln" ));
+    vm5.invoke(() ->resumeSender( "ln" ));
+    vm6.invoke(() ->resumeSender( "ln" ));
+    vm7.invoke(() ->resumeSender( "ln" ));
+  }
+
+  protected void createReceiverPrs() {
+    vm2.invoke(() ->createPartitionedRegion(
+        testName, null, 1, 8, isOffHeap() ));
+    vm3.invoke(() ->createPartitionedRegion(
+        testName, null, 1, 8, isOffHeap() ));
+  }
+
+  protected void startPausedSenders() {
+    startSenders();
+
+    pauseSenders();
+  }
+
+  protected void pauseSenders() {
+    vm4.invoke(() ->pauseSender( "ln" ));
+    vm5.invoke(() ->pauseSender( "ln" ));
+    vm6.invoke(() ->pauseSender( "ln" ));
+    vm7.invoke(() ->pauseSender( "ln" ));
+  }
+
+  protected void startSenders() {
+    vm4.invoke(() ->startSender( "ln" ));
+    vm5.invoke(() ->startSender( "ln" ));
+    vm6.invoke(() ->startSender( "ln" ));
+    vm7.invoke(() ->startSender( "ln" ));
+  }
+  
+  protected void createSenderPRs() {
+    createSenderPRs(0);
+  }
+
+  protected void createSenderPRs(int redundancy) {
+    vm4.invoke(() ->createPartitionedRegion(
+        testName, "ln", redundancy, 8, isOffHeap() ));
+    vm5.invoke(() ->createPartitionedRegion(
+        testName, "ln", redundancy, 8, isOffHeap() ));
+    vm6.invoke(() ->createPartitionedRegion(
+        testName, "ln", redundancy, 8, isOffHeap() ));
+    vm7.invoke(() ->createPartitionedRegion(
+        testName, "ln", redundancy, 8, isOffHeap() ));
+  }
+
+  protected void initialSetUp() {
+    Integer lnPort = (Integer)vm0.invoke(() ->createFirstLocatorWithDSId( 1 ));
+    Integer nyPort = (Integer)vm1.invoke(() ->createFirstRemoteLocator( 2, lnPort ));
+
+    vm2.invoke(() ->createReceiver( nyPort ));
+    vm3.invoke(() ->createReceiver( nyPort ));
+
+    vm4.invoke(() ->createCache(lnPort ));
+    vm5.invoke(() ->createCache(lnPort ));
+    vm6.invoke(() ->createCache(lnPort ));
+    vm7.invoke(() ->createCache(lnPort ));
+  }
+  
+  protected void createSendersNoConflation() {
+    vm4.invoke(() ->createSender( "ln", 2,
+        true, 100, 10, false, false, null, true ));
+    vm5.invoke(() ->createSender( "ln", 2,
+        true, 100, 10, false, false, null, true  ));
+    vm6.invoke(() ->createSender( "ln", 2,
+        true, 100, 10, false, false, null, true  ));
+    vm7.invoke(() ->createSender( "ln", 2,
+        true, 100, 10, false, false, null, true  ));
+  }
+  
+  protected void createSendersWithConflation() {
+    vm4.invoke(() ->createSender( "ln", 2,
+        true, 100, 2, true, false, null, true ));
+    vm5.invoke(() ->createSender( "ln", 2,
+        true, 100, 2, true, false, null, true ));
+    vm6.invoke(() ->createSender( "ln", 2,
+        true, 100, 2, true, false, null, true ));
+    vm7.invoke(() ->createSender( "ln", 2,
+        true, 100, 2, true, false, null, true ));
   }
   
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a7249514/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
index 979439b..a142f82 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
@@ -537,7 +537,7 @@ public class SerialWANStatsDUnitTest extends WANTestBase {
 
     vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
 
-    vm4.invoke(WANTestBase.class, "pauseSenderAndWaitForDispatcherToPause", new Object[] { "ln" });
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
 
     vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
         testName, null,1, 100, isOffHeap()  });


[04/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
new file mode 100644
index 0000000..fed9202
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
@@ -0,0 +1,597 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+/**
+ * 
+ */
+package com.gemstone.gemfire.internal.cache.wan.serial;
+
+
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+
+import dunit.AsyncInvocation;
+
+/**
+ * @author skumar
+ * 
+ */
+public class SerialWANPersistenceEnabledGatewaySenderDUnitTest extends
+    WANTestBase {
+
+  private static final long serialVersionUID = 1L;
+
+  public SerialWANPersistenceEnabledGatewaySenderDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+  }
+
+  /**
+   * Just enable the persistence for GatewaySender and see if it remote site
+   * receives all the events.
+   */
+  public void testReplicatedRegionWithGatewaySenderPersistenceEnabled() {
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+
+  }
+
+  /**
+   * Enable persistence for the Region and see if the remote site gets all the
+   * events.
+   */
+  public void testPersistentReplicatedRegionWithGatewaySender() {
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
+        new Object[] { testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
+        new Object[] { testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
+        new Object[] { testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
+        new Object[] { testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
+        new Object[] { testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
+        new Object[] { testName + "_RR", "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+
+  }
+
+  /**
+   * Enable persistence for region as well as GatewaySender and see if remote
+   * site receives all the events.
+   * 
+   */
+  public void testPersistentReplicatedRegionWithGatewaySenderPersistenceEnabled() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true });
+
+    vm2.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
+        new Object[] { testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
+        new Object[] { testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
+        new Object[] { testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
+        new Object[] { testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
+        new Object[] { testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPersistentReplicatedRegion",
+        new Object[] { testName + "_RR", "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+
+  }
+
+  /**
+   * Enable persistence for GatewaySender, kill the sender and restart it. Check
+   * if the remote site receives all the event.
+   */
+  public void testReplicatedRegionWithGatewaySenderPersistenceEnabled_Restart() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    String firstDStore = (String)vm4.invoke(WANTestBase.class,
+        "createSenderWithDiskStore", new Object[] { "ln", 2, false,
+            100, 10, false, true, null, null, true });
+    String secondDStore = (String)vm5.invoke(WANTestBase.class,
+        "createSenderWithDiskStore", new Object[] { "ln", 2, false,
+            100, 10, false, true, null, null, true });
+
+    getLogWriter().info("The first ds is " + firstDStore);
+    getLogWriter().info("The first ds is " + secondDStore);
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+
+    getLogWriter().info("Completed puts in the region");
+
+    // verify if the queue has all the events
+    // vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", 1000
+    // });
+    // vm5.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", 1000
+    // });
+    //
+    // vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+    // testName + "_RR", 0 });
+    // vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+    // testName + "_RR", 0 });
+
+    // kill the vm
+    vm4.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm5.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm6.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm7.invoke(WANTestBase.class, "killSender", new Object[] {});
+    
+    getLogWriter().info("Killed all the sender. ");
+    // restart the vm
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] {
+        "ln", 2, false, 100, 10, false, true, null,
+        firstDStore, true });
+    getLogWriter().info("Creted the sender.... in vm4 ");
+    vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] {
+        "ln", 2, false, 100, 10, false, true, null,
+        secondDStore, true });
+    getLogWriter().info("Creted the sender.... in vm5 ");
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "startSender",
+        new Object[] { "ln" });
+    getLogWriter().info("Started the sender in vm 4");
+
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    getLogWriter().info("Started the sender in vm 5");
+    try {
+      inv1.join();
+    } catch (InterruptedException e) {
+      fail("Got interrupted exception while waiting for startSender to finish.");
+    }
+
+    pause(5000);
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+
+  }
+
+  /**
+   * Enable persistence for Region and persistence for GatewaySender. Kill the
+   * vm with regions and bring that up again. Check if the remote site receives
+   * all the event. again?
+   * 
+   */
+  public void testPersistentReplicatedRegionWithGatewaySenderPersistenceEnabled_Restart() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    String firstDStore = (String)vm4.invoke(WANTestBase.class,
+        "createSenderWithDiskStore", new Object[] { "ln", 2, false,
+            100, 10, false, true, null, null, true });
+    String secondDStore = (String)vm5.invoke(WANTestBase.class,
+        "createSenderWithDiskStore", new Object[] { "ln", 2, false,
+            100, 10, false, true, null, null, true  });
+
+    getLogWriter().info("The first ds is " + firstDStore);
+    getLogWriter().info("The first ds is " + secondDStore);
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+
+    getLogWriter().info("Completed puts in the region");
+
+    // kill the vm
+    vm4.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm5.invoke(WANTestBase.class, "killSender", new Object[] {});
+
+    getLogWriter().info("Killed the sender. ");
+    // restart the vm
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    
+    vm4.invoke(WANTestBase.class,
+        "createSenderWithDiskStore", new Object[] { "ln", 2, false,
+      100, 10, false, true, null, firstDStore, true  });
+    getLogWriter().info("Created the sender.... in vm4 ");
+    vm5.invoke(WANTestBase.class,
+        "createSenderWithDiskStore", new Object[] { "ln", 2, false,
+            100, 10, false, true, null, secondDStore, true  });
+    getLogWriter().info("Created the sender.... in vm5 ");
+    
+    vm4.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", isOffHeap() });
+    
+    vm5.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", isOffHeap() });
+  
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "startSender",
+        new Object[] { "ln" });
+    getLogWriter().info("Started the sender in vm 4");
+
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    getLogWriter().info("Started the sender in vm 5");
+    try {
+      inv1.join();
+    } catch (InterruptedException e) {
+      fail("Got interrupted exception while waiting for startSedner to finish.");
+    }
+
+    pause(5000);
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+
+  }
+  
+  /**
+   * Enable persistence for Region. No persistence for GatewaySender. Kill the
+   * vm with regions and bring that up again. Check if the remote site receives
+   * all the event. again?
+   * 
+   */
+  public void testPersistentReplicatedRegionWithGatewaySender_Restart() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class,
+        "createSender", new Object[] { "ln", 2, false,
+            100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class,
+        "createSender", new Object[] { "ln", 2, false,
+            100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+
+    getLogWriter().info("Completed puts in the region");
+
+    // verify if the queue has all the events
+    // vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", 1000
+    // });
+    // vm5.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", 1000
+    // });
+    //
+    // vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+    // testName + "_RR", 0 });
+    // vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+    // testName + "_RR", 0 });
+
+    // kill the vm
+    vm4.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm5.invoke(WANTestBase.class, "killSender", new Object[] {});
+
+    getLogWriter().info("Killed the sender. ");
+    // restart the vm
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] {
+        "ln", 2, false, 100, 10, false, false, null, true});
+    getLogWriter().info("Creted the sender.... in vm4 ");
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] {
+        "ln", 2, false, 100, 10, false, false, null, true});
+    getLogWriter().info("Creted the sender.... in vm5 ");
+    
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    getLogWriter().info("Started the sender in vm 4");
+
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    getLogWriter().info("Started the sender in vm 5");
+    
+    AsyncInvocation inv1 =  vm4.invokeAsync(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", isOffHeap() });
+    
+    try {
+      inv1.join();
+    } catch (InterruptedException e) {
+      fail("Got interrupted exception while waiting for startSedner to finish.");
+    }
+
+    pause(5000);
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+      1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+
+  }
+  
+  
+  /**
+   * Enable persistence for Region and persistence for GatewaySender. Kill the
+   * vm with regions and bring that up again. Check if the remote site receives
+   * all the event. again?
+   * In this case put is continuously happening while the vm is down.
+   */
+  public void testPersistentReplicatedRegionWithGatewaySenderPersistenceEnabled_Restart2() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    String firstDStore = (String)vm4.invoke(WANTestBase.class,
+        "createSenderWithDiskStore", new Object[] { "ln", 2, false,
+            100, 10, false, true, null, null, true  });
+    String secondDStore = (String)vm5.invoke(WANTestBase.class,
+        "createSenderWithDiskStore", new Object[] { "ln", 2, false,
+            100, 10, false, true, null, null, true  });
+
+    getLogWriter().info("The first ds is " + firstDStore);
+    getLogWriter().info("The first ds is " + secondDStore);
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+
+    getLogWriter().info("Completed puts in the region");
+
+    // kill the vm
+    vm4.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm5.invoke(WANTestBase.class, "killSender", new Object[] {});
+
+    getLogWriter().info("Killed the sender. ");
+    // restart the vm
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    
+    vm4.invoke(WANTestBase.class,
+        "createSenderWithDiskStore", new Object[] { "ln", 2, false,
+      100, 10, false, true, null, firstDStore, true  });
+    getLogWriter().info("Created the sender.... in vm4 ");
+    vm5.invoke(WANTestBase.class,
+        "createSenderWithDiskStore", new Object[] { "ln", 2, false,
+            100, 10, false, true, null, secondDStore, true  });
+    getLogWriter().info("Created the sender.... in vm5 ");
+    
+    vm4.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", isOffHeap() });
+    
+    vm5.invoke(WANTestBase.class, "createPersistentReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", isOffHeap() });
+  
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "startSender",
+        new Object[] { "ln" });
+    getLogWriter().info("Started the sender in vm 4");
+
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    getLogWriter().info("Started the sender in vm 5");
+    try {
+      inv1.join();
+    } catch (InterruptedException e) {
+      fail("Got interrupted exception while waiting for startSedner to finish.");
+    }
+
+    pause(5000);
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
new file mode 100644
index 0000000..8c1e9e5
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
@@ -0,0 +1,529 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.wan.serial;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+
+
+public class SerialWANPropagationLoopBackDUnitTest extends WANTestBase {
+  
+  private static final long serialVersionUID = 1L;
+  
+  public SerialWANPropagationLoopBackDUnitTest(String name) {
+    super(name);
+  }
+  
+  public void setUp() throws Exception {
+    super.setUp();
+  }
+  
+  public void testReplicatedSerialPropagationLoopBack() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { lnPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ny", 1,
+        false, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ny", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ny" });
+    
+    vm4.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ln",
+        false });
+    vm6.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ny",
+        false });
+    
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()});
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ny", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ny", isOffHeap()});
+
+    final Map keyValues = new HashMap();
+    for(int i=0; i< 1; i++) {
+      keyValues.put(i, i);
+    }
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR",
+      keyValues });
+    
+    keyValues.clear();
+    for(int i=1; i< 2; i++) {
+      keyValues.put(i, i);
+    }
+    vm6.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR",
+      keyValues });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 2 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 2 });
+    
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", 2 });
+    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", 2 });
+    vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", 2 });
+    vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", 2 });
+  
+  
+    pause(5000);
+    vm4.invoke(WANTestBase.class, "verifyQueueSize",
+        new Object[] { "ln", 0 });
+    vm6.invoke(WANTestBase.class, "verifyQueueSize",
+        new Object[] { "ny", 0 });
+    
+    Map queueMap1 = (HashMap)vm4.invoke(WANTestBase.class, "checkQueue",
+        new Object[] {});
+    Map queueMap2 = (HashMap)vm6.invoke(WANTestBase.class, "checkQueue",
+        new Object[] {});
+
+    List createList1 = (List)queueMap1.get("Create");
+    List updateList1 = (List)queueMap1.get("Update");
+    List createList2 = (List)queueMap2.get("Create");
+    List updateList2 = (List)queueMap2.get("Update");
+    
+    assertEquals(0, updateList1.size());
+    assertEquals(0, updateList2.size());
+    
+    assertEquals(1, createList1.size());
+    assertEquals(1, createList2.size());
+  }
+  
+  
+  public void testReplicatedSerialPropagationLoopBack3SitesLoop() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer tkPort = (Integer)vm2.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 3, lnPort });
+
+    
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { lnPort });
+    vm4.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm5.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
+    
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+    // using vm5 for sender in ds 3. cache is already created.
+    
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ny", 3,
+        false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "tk", 1,
+      false, 100, 10, false, false, null, true });
+
+    
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()});
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ny", isOffHeap()});
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "tk", isOffHeap()});
+
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ny" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "tk" });
+    
+    vm6.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ln",
+      false });
+    vm7.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ny",
+      false });
+    vm5.invoke(WANTestBase.class, "addQueueListener", new Object[] { "tk",
+      false });
+  
+    
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ny", isOffHeap() });
+
+
+    final Map keyValues = new HashMap();
+    for(int i=0; i< 1; i++) {
+      keyValues.put(i, i);
+    }
+    vm3.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR",
+      keyValues });
+    
+    keyValues.clear();
+    for(int i=1; i< 2; i++) {
+      keyValues.put(i, i);
+    }
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR",
+      keyValues });
+    
+    keyValues.clear();
+    for(int i=2; i< 3; i++) {
+      keyValues.put(i, i);
+    }
+    vm5.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR",
+      keyValues });
+    
+        
+    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 3 });
+    vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 3 });
+    vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 3 });
+    
+    
+    pause(5000);
+    vm6.invoke(WANTestBase.class, "verifyQueueSize",
+        new Object[] { "ln", 0 });
+    vm7.invoke(WANTestBase.class, "verifyQueueSize",
+        new Object[] { "ny", 0 });
+    vm5.invoke(WANTestBase.class, "verifyQueueSize",
+        new Object[] { "tk", 0 });
+    
+    
+    
+    Map queueMap1 = (HashMap)vm6.invoke(WANTestBase.class, "checkQueue",
+        new Object[] {});
+    Map queueMap2 = (HashMap)vm7.invoke(WANTestBase.class, "checkQueue",
+        new Object[] {});
+    Map queueMap3 = (HashMap)vm5.invoke(WANTestBase.class, "checkQueue",
+        new Object[] {});
+    
+    List createList1 = (List)queueMap1.get("Create");
+    List updateList1 = (List)queueMap1.get("Update");
+    List createList2 = (List)queueMap2.get("Create");
+    List updateList2 = (List)queueMap2.get("Update");
+    List createList3 = (List)queueMap3.get("Create");
+    List updateList3 = (List)queueMap3.get("Update");
+    
+    assertEquals(0, updateList1.size());
+    assertEquals(0, updateList2.size());
+    assertEquals(0, updateList3.size());
+    
+    assertEquals(2, createList1.size());
+    assertEquals(2, createList2.size());
+    assertEquals(2, createList3.size());
+  }
+  
+  
+  public void testReplicatedSerialPropagationLoopBack3SitesNtoNPutInAllDS() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer tkPort = (Integer)vm2.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 3, lnPort });
+
+    
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { lnPort });
+    vm4.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm5.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
+    
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+    // using vm5 for sender in ds 3. cache is already created.
+    
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+        false, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ny1", 3,
+        false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "tk1", 1,
+      false, 100, 10, false, false, null, true });
+
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln2", 3,
+      false, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ny2", 1,
+      false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "tk2", 2,
+    false, 100, 10, false, false, null, true });
+
+    
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln1,ln2", isOffHeap()});
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ny1,ny2", isOffHeap()});
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "tk1,tk2", isOffHeap() });
+
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ny1" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "tk1" });
+    
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln2" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ny2" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "tk2" });
+    
+    
+    vm6.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ln1",
+      false });
+    vm7.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ny1",
+      false });
+    vm5.invoke(WANTestBase.class, "addQueueListener", new Object[] { "tk1",
+      false });
+    vm6.invoke(WANTestBase.class, "addSecondQueueListener", new Object[] { "ln2",
+      false });
+    vm7.invoke(WANTestBase.class, "addSecondQueueListener", new Object[] { "ny2",
+      false });
+    vm5.invoke(WANTestBase.class, "addSecondQueueListener", new Object[] { "tk2",
+      false });
+  
+    
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln1,ln2", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ny1,ny2", isOffHeap() });
+    
+    final Map keyValues = new HashMap();
+    for(int i=0; i< 1; i++) {
+      keyValues.put(i, i);
+    }
+    vm3.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR",
+      keyValues });
+    
+    keyValues.clear();
+    for(int i=1; i< 2; i++) {
+      keyValues.put(i, i);
+    }
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR",
+      keyValues });
+    
+    keyValues.clear();
+    for(int i=2; i< 3; i++) {
+      
+      keyValues.put(i, i);
+    }
+    vm5.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR",
+      keyValues });
+    
+    pause(2000);
+    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 3 });
+    vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 3 });
+    vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 3 });
+    
+    pause(5000);
+    vm6.invoke(WANTestBase.class, "verifyQueueSize",
+        new Object[] { "ln1", 0 });
+    vm7.invoke(WANTestBase.class, "verifyQueueSize",
+        new Object[] { "ny1", 0 });
+    vm5.invoke(WANTestBase.class, "verifyQueueSize",
+        new Object[] { "tk1", 0 });
+    vm6.invoke(WANTestBase.class, "verifyQueueSize",
+        new Object[] { "ln2", 0 });
+    vm7.invoke(WANTestBase.class, "verifyQueueSize",
+        new Object[] { "ny2", 0 });
+    vm5.invoke(WANTestBase.class, "verifyQueueSize",
+        new Object[] { "tk2", 0 });
+    
+    
+    Map queueMap1 = (HashMap)vm6.invoke(WANTestBase.class, "checkQueue",
+        new Object[] {});
+    Map queueMap2 = (HashMap)vm7.invoke(WANTestBase.class, "checkQueue",
+        new Object[] {});
+    Map queueMap3 = (HashMap)vm5.invoke(WANTestBase.class, "checkQueue",
+        new Object[] {});
+    Map queueMap4 = (HashMap)vm6.invoke(WANTestBase.class, "checkQueue2",
+        new Object[] {});
+    Map queueMap5 = (HashMap)vm7.invoke(WANTestBase.class, "checkQueue2",
+        new Object[] {});
+    Map queueMap6 = (HashMap)vm5.invoke(WANTestBase.class, "checkQueue2",
+        new Object[] {});
+    
+    List createList1 = (List)queueMap1.get("Create");
+    List updateList1 = (List)queueMap1.get("Update");
+    List createList2 = (List)queueMap2.get("Create");
+    List updateList2 = (List)queueMap2.get("Update");
+    List createList3 = (List)queueMap3.get("Create");
+    List updateList3 = (List)queueMap3.get("Update");
+    
+    List createList4 = (List)queueMap4.get("Create");
+    List updateList4 = (List)queueMap4.get("Update");
+    
+    List createList5 = (List)queueMap5.get("Create");
+    List updateList5 = (List)queueMap5.get("Update");
+    
+    List createList6 = (List)queueMap6.get("Create");
+    List updateList6 = (List)queueMap6.get("Update");
+    
+    
+    assertEquals(0, updateList1.size());
+    assertEquals(0, updateList2.size());
+    assertEquals(0, updateList3.size());
+    assertEquals(0, updateList4.size());
+    assertEquals(0, updateList5.size());
+    assertEquals(0, updateList6.size());
+    
+    assertEquals(1, createList1.size());
+    assertEquals(1, createList2.size());
+    assertEquals(1, createList3.size());
+    assertEquals(1, createList4.size());
+    assertEquals(1, createList5.size());
+    assertEquals(1, createList6.size());
+  }
+
+  
+  public void testReplicatedSerialPropagationLoopBack3SitesNtoNPutFromOneDS() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer tkPort = (Integer)vm2.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 3, lnPort });
+
+    
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { lnPort });
+    vm4.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm5.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
+    
+    
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+        false, 100, 10, false, false, null, true });
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln2", 3,
+      false, 100, 10, false, false, null, true });
+    
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ny1", 3,
+        false, 100, 10, false, false, null, true });
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ny2", 1,
+      false, 100, 10, false, false, null, true });
+    
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "tk1", 1,
+      false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "tk2", 2,
+    false, 100, 10, false, false, null, true });
+
+    
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln1,ln2", isOffHeap() });
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ny1,ny2", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "tk1,tk2", isOffHeap() });
+
+    
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ny1" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "tk1" });
+    
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln2" });
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ny2" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "tk2" });
+    
+    
+    vm3.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ln1",
+      false });
+    vm4.invoke(WANTestBase.class, "addQueueListener", new Object[] { "ny1",
+      false });
+    vm5.invoke(WANTestBase.class, "addQueueListener", new Object[] { "tk1",
+      false });
+    vm3.invoke(WANTestBase.class, "addSecondQueueListener", new Object[] { "ln2",
+      false });
+    vm4.invoke(WANTestBase.class, "addSecondQueueListener", new Object[] { "ny2",
+      false });
+    vm5.invoke(WANTestBase.class, "addSecondQueueListener", new Object[] { "tk2",
+      false });
+  
+    final Map keyValues = new HashMap();
+    for(int i=0; i< 1; i++) {
+      keyValues.put(i, i);
+    }
+    vm3.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName + "_RR",
+      keyValues });
+    
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1 });
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1 });
+    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1 });
+    
+    pause(5000);
+    vm3.invoke(WANTestBase.class, "verifyQueueSize",
+        new Object[] { "ln1", 0 });
+    vm4.invoke(WANTestBase.class, "verifyQueueSize",
+        new Object[] { "ny1", 0 });
+    vm5.invoke(WANTestBase.class, "verifyQueueSize",
+        new Object[] { "tk1", 0 });
+    vm3.invoke(WANTestBase.class, "verifyQueueSize",
+        new Object[] { "ln2", 0 });
+    vm4.invoke(WANTestBase.class, "verifyQueueSize",
+        new Object[] { "ny2", 0 });
+    vm5.invoke(WANTestBase.class, "verifyQueueSize",
+        new Object[] { "tk2", 0 });
+    
+    
+    Map queueMap1 = (HashMap)vm3.invoke(WANTestBase.class, "checkQueue",
+        new Object[] {});
+    Map queueMap2 = (HashMap)vm4.invoke(WANTestBase.class, "checkQueue",
+        new Object[] {});
+    Map queueMap3 = (HashMap)vm5.invoke(WANTestBase.class, "checkQueue",
+        new Object[] {});
+    Map queueMap4 = (HashMap)vm3.invoke(WANTestBase.class, "checkQueue2",
+        new Object[] {});
+    Map queueMap5 = (HashMap)vm4.invoke(WANTestBase.class, "checkQueue2",
+        new Object[] {});
+    Map queueMap6 = (HashMap)vm5.invoke(WANTestBase.class, "checkQueue2",
+        new Object[] {});
+    
+    List createList1 = (List)queueMap1.get("Create");
+    List updateList1 = (List)queueMap1.get("Update");
+    List createList2 = (List)queueMap2.get("Create");
+    List updateList2 = (List)queueMap2.get("Update");
+    List createList3 = (List)queueMap3.get("Create");
+    List updateList3 = (List)queueMap3.get("Update");
+    
+    List createList4 = (List)queueMap4.get("Create");
+    List updateList4 = (List)queueMap4.get("Update");
+    
+    List createList5 = (List)queueMap5.get("Create");
+    List updateList5 = (List)queueMap5.get("Update");
+    
+    List createList6 = (List)queueMap6.get("Create");
+    List updateList6 = (List)queueMap6.get("Update");
+    
+    
+    assertEquals(0, updateList1.size());
+    assertEquals(0, updateList2.size());
+    assertEquals(0, updateList3.size());
+    assertEquals(0, updateList4.size());
+    assertEquals(0, updateList5.size());
+    assertEquals(0, updateList6.size());
+    
+    assertEquals(1, createList1.size());
+    assertEquals(0, createList2.size());
+    assertEquals(0, createList3.size());
+    assertEquals(1, createList4.size());
+    assertEquals(0, createList5.size());
+    assertEquals(0, createList6.size());
+  }
+
+}


[67/70] incubator-geode git commit: GEODE-872: Removing duplicate code from ConcurrentSerialGatewaySenderOperationsDUnitTest

Posted by up...@apache.org.
GEODE-872: Removing duplicate code from ConcurrentSerialGatewaySenderOperationsDUnitTest

This test was almost an exact copy of
SerialGatewaySenderOperationsDUnitTest, with a few lines changes. The
non concurrent test had already fixed the suspect string, but the
concurrent test did not. By throwing away the code from Concurrent* and
making it extend the non-concurrent test, this bug is fixed.

The test has also been tuned to do fewer operations and take less time.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/22606309
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/22606309
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/22606309

Branch: refs/heads/develop
Commit: 22606309a2cb95db34d10fbd3000ca31755c8fad
Parents: 68a85fe
Author: Dan Smith <up...@apache.org>
Authored: Wed Jan 27 15:05:58 2016 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Thu Jan 28 09:37:50 2016 -0800

----------------------------------------------------------------------
 .../gemfire/internal/cache/wan/WANTestBase.java |   8 +-
 ...tSerialGatewaySenderOperationsDUnitTest.java | 469 +---------
 .../SerialGatewaySenderOperationsDUnitTest.java | 901 ++++++++-----------
 3 files changed, 407 insertions(+), 971 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/22606309/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
index 3dd4742..a212baa 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
@@ -2239,10 +2239,14 @@ public class WANTestBase extends DistributedTestCase{
     }
   }
   
-  public static void startReceivers() throws IOException {
+  public static void startReceivers() {
     Set<GatewayReceiver> receivers = cache.getGatewayReceivers();
     for (GatewayReceiver receiver : receivers) {
-      receiver.start();
+      try {
+        receiver.start();
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
     }
   }
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/22606309/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
index b709334..b2a9a3b 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
@@ -19,16 +19,17 @@ package com.gemstone.gemfire.internal.cache.wan.concurrent;
 import java.util.Set;
 
 import com.gemstone.gemfire.cache.wan.GatewaySender;
+import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
 import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-import com.gemstone.gemfire.test.dunit.AsyncInvocation;
-import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
+import com.gemstone.gemfire.internal.cache.wan.serial.SerialGatewaySenderOperationsDUnitTest;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * @author skumar
  *
  */
-public class ConcurrentSerialGatewaySenderOperationsDUnitTest  extends WANTestBase {
+public class ConcurrentSerialGatewaySenderOperationsDUnitTest  extends SerialGatewaySenderOperationsDUnitTest {
 
   private static final long serialVersionUID = 1L;
 
@@ -36,466 +37,24 @@ public class ConcurrentSerialGatewaySenderOperationsDUnitTest  extends WANTestBa
     super(name);
   }
 
-  public void setUp() throws Exception {
-    super.setUp();
-    addExpectedException("Broken pipe");
-    addExpectedException("Connection reset");
-    addExpectedException("Unexpected IOException");
+  protected void createSenderVM5() {
+    vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 10, false, true, null, true, 5, OrderPolicy.KEY ));
   }
 
-  public void testSerialGatewaySenderOperationsWithoutStarting() {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
-    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true, 5, OrderPolicy.KEY });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true, 5, OrderPolicy.KEY });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        1000 });
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        10000 });
-
-    vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
-        "verifyGatewaySenderOperations", new Object[] { "ln" });
-    vm5.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
-        "verifyGatewaySenderOperations", new Object[] { "ln" });
-
+  protected void createSenderVM4() {
+    vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+        false, 100, 10, false, true, null, true, 5, OrderPolicy.KEY ));
   }
 
-  
-  public void testStartPauseResumeSerialGatewaySender() {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
-    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true, 5 , OrderPolicy.KEY});
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true, 5 , OrderPolicy.KEY});
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        1000 });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        10000 });
-
-    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
-    vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
-        "verifySenderPausedState", new Object[] { "ln" });
-    vm5.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
-        "verifySenderPausedState", new Object[] { "ln" });
-
-    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
-        new Object[] { testName + "_RR", 1000 });
-
-    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-
-    vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
-        "verifySenderResumedState", new Object[] { "ln" });
-    vm5.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
-        "verifySenderResumedState", new Object[] { "ln" });
-
-    try {
-      inv1.join();
-    } catch (InterruptedException e) {
-      e.printStackTrace();
-      fail("Interrupted the async invocation.");
-    }
-
-    getLogWriter().info("Completed puts in the region");
-
-    vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
-        "validateQueueContentsForConcurrentSerialGatewaySender", new Object[] { "ln", 0 });
-    vm5.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
-        "validateQueueContentsForConcurrentSerialGatewaySender", new Object[] { "ln", 0 });
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 10000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 10000 });
-
-  }
-
-  public void testStopSerialGatewaySender() throws Throwable {
-    addExpectedException("Broken pipe");
-    addExpectedException("Connection reset");
-    addExpectedException("RegionDestroyedException");
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
-    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true, 3, OrderPolicy.KEY});
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true, 3, OrderPolicy.KEY });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        20 });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        20 });
-    
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 20 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 20 });
-    
-    vm2.invoke(WANTestBase.class, "stopReceivers");
-    vm3.invoke(WANTestBase.class, "stopReceivers");
-    
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        20 });
-    
-    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 20 });
-    vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 20 });
-    
-    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-
-    vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
-        "verifySenderStoppedState", new Object[] { "ln" });
-    vm5.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
-        "verifySenderStoppedState", new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
-    vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
-    /**
-     * Should have no effect on GatewaySenderState
-     */
-    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-
-    vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
-        "verifySenderStoppedState", new Object[] { "ln" });
-    vm5.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
-        "verifySenderStoppedState", new Object[] { "ln" });
-
-    AsyncInvocation vm4async = vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
-    AsyncInvocation vm5async = vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
-    int START_WAIT_TIME = 30000;
-    vm4async.getResult(START_WAIT_TIME);
-    vm5async.getResult(START_WAIT_TIME);
-    
-    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 20 });
-    vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 20 });
-
-    vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-      110 });
-    
-    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 130 });
-    vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 130 });
-    
-    vm2.invoke(WANTestBase.class, "startReceivers");
-    vm3.invoke(WANTestBase.class, "startReceivers");
-
-    vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
-        "verifySenderResumedState", new Object[] { "ln" });
-    vm5.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
-        "verifySenderResumedState", new Object[] { "ln" });
-    
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      testName + "_RR", 110 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      testName + "_RR", 110 });
-    
-    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
-    vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
-  }
-
-
-  public void testStopOneSerialGatewaySenderBothPrimary() throws Throwable {
-    addExpectedException("Broken pipe");
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
-    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true, 4, OrderPolicy.KEY });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true, 4, OrderPolicy.KEY });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        100 });
-
-    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-
-    vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
-        "verifySenderStoppedState", new Object[] { "ln" });
-    
-    vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        200 });
-    
-    getLogWriter().info("Completed puts in the region");
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 200 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 200 });
-    
-  //Do some puts while restarting a sender
-    AsyncInvocation asyncPuts = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        2000 });
-    
-    Thread.sleep(10);
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    
-    asyncPuts.getResult();
-    getLogWriter().info("Completed puts in the region");
-    
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 2000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 2000 });
-    
-    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
-  }
-
-  public void Bug46921_testStopOneSerialGatewaySender_PrimarySecondary() {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
-    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true, 4, OrderPolicy.PARTITION });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true, 4, OrderPolicy.PARTITION });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        1000 });
-
-    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-
-    vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
-        "verifySenderStoppedState", new Object[] { "ln" });
-    
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        10000 });
-    
-    getLogWriter().info("Completed puts in the region");
-
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 10000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 10000 });
+  protected void validateQueueClosedVM4() {
+    vm4.invoke(() -> WANTestBase.validateQueueClosedForConcurrentSerialGatewaySender( "ln"));
   }
   
-  public void testStopOneSender_StartAnotherSender() {
-    addExpectedException("Broken pipe");
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true, 4, OrderPolicy.PARTITION });
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        1000 });
-    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-    vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
-        "verifySenderStoppedState", new Object[] { "ln" });
-
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-      false, 100, 10, false, true, null, true, 4, OrderPolicy.PARTITION });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      testName + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        10000 });
-    getLogWriter().info("Completed puts in the region");
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 10000 });
+  private void validateQueueContents(VM vm, String site, int size) {
+    vm.invoke(() -> WANTestBase.validateQueueContentsForConcurrentSerialGatewaySender( site, size));
   }
 
-  public void test_Bug44153_StopOneSender_StartAnotherSender_CheckQueueSize() {
-    addExpectedException("Broken pipe");
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true, 3, OrderPolicy.PARTITION });
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        1000 });
-    vm4.invoke(WANTestBase.class, "validateQueueContentsForConcurrentSerialGatewaySender", new Object[] { "ln", 1000});
-
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-      false, 100, 10, false, true, null, true, 3, OrderPolicy.PARTITION });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "validateQueueContentsForConcurrentSerialGatewaySender", new Object[] { "ln", 1000});
-
-    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-    vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
-        "verifySenderStoppedState", new Object[] { "ln" });
-    vm4.invoke(WANTestBase.class, "validateQueueClosedForConcurrentSerialGatewaySender", new Object[] { "ln"});
-
-
-    vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        10000 });
-
-    vm5.invoke(WANTestBase.class, "validateQueueContentsForConcurrentSerialGatewaySender", new Object[] { "ln",
-        11000 });
-    vm4.invoke(WANTestBase.class, "validateQueueClosedForConcurrentSerialGatewaySender", new Object[] { "ln"});
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap() });
-    getLogWriter().info("Completed puts in the region");
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 10000 });
-  }
-  
   public static void verifySenderPausedState(String senderId) {
     Set<GatewaySender> senders = cache.getGatewaySenders();
     AbstractGatewaySender sender = null;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/22606309/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
index d30289b..7f4535e 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
@@ -27,6 +27,7 @@ import com.gemstone.gemfire.internal.cache.wan.GatewaySenderException;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
 import com.gemstone.gemfire.test.dunit.AsyncInvocation;
 import com.gemstone.gemfire.test.dunit.RMIException;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * @author skumar
@@ -42,11 +43,11 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
 
   public void setUp() throws Exception {
     super.setUp();
-    addExpectedException("Connection reset");
     addExpectedException("Broken pipe");
+    addExpectedException("Connection reset");
+    addExpectedException("Unexpected IOException");
     addExpectedException("Connection refused");
     addExpectedException("could not get remote locator information");
-    addExpectedException("Unexpected IOException");
     
     //Stopping the gateway closed the region,
     //which causes this exception to get logged
@@ -54,111 +55,107 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
   }
 
   public void testSerialGatewaySenderOperationsWithoutStarting() {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        1000 });
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        10000 });
-
-    vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
-        "verifyGatewaySenderOperations", new Object[] { "ln" });
-    vm5.invoke(SerialGatewaySenderOperationsDUnitTest.class,
-        "verifyGatewaySenderOperations", new Object[] { "ln" });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+    createReceivers(nyPort);
+
+    createSenderCaches(lnPort);
+
+    createSenderVM4();
+    createSenderVM5();
+
+    createReceiverRegions();
+
+    createSenderRegions();
+
+    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+        10 ));
+    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+        100 ));
+
+    vm4.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifyGatewaySenderOperations( "ln" ));
+    vm5.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifyGatewaySenderOperations( "ln" ));
+
+  }
+
+  protected void createSenderRegions() {
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR", "ln", isOffHeap() ));
+  }
+
+  protected void createReceiverRegions() {
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR", null, isOffHeap() ));
+  }
+
+  protected void createSenderCaches(Integer lnPort) {
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm6.invoke(() -> WANTestBase.createCache( lnPort ));
+    vm7.invoke(() -> WANTestBase.createCache( lnPort ));
+  }
+
+  protected void createReceivers(Integer nyPort) {
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm3.invoke(() -> WANTestBase.createReceiver( nyPort ));
+  }
 
+  protected void createSenderVM5() {
+    vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 10, false, true, null, true ));
+  }
+
+  protected void createSenderVM4() {
+    vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+        false, 100, 10, false, true, null, true ));
   }
 
   
   public void testStartPauseResumeSerialGatewaySender() {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        1000 });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        10000 });
-
-    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
-    vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
-        "verifySenderPausedState", new Object[] { "ln" });
-    vm5.invoke(SerialGatewaySenderOperationsDUnitTest.class,
-        "verifySenderPausedState", new Object[] { "ln" });
-
-    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
-        new Object[] { testName + "_RR", 1000 });
-
-    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-
-    vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
-        "verifySenderResumedState", new Object[] { "ln" });
-    vm5.invoke(SerialGatewaySenderOperationsDUnitTest.class,
-        "verifySenderResumedState", new Object[] { "ln" });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+    createReceivers(nyPort);
+
+    createSenderCaches(lnPort);
+
+    createSenderVM4();
+    createSenderVM5();
+
+    createReceiverRegions();
+
+    createSenderRegions();
+
+    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+        10 ));
+
+    startSenders();
+
+    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+        100 ));
+
+    vm4.invoke(() -> WANTestBase.pauseSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.pauseSender( "ln" ));
+
+    vm4.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderPausedState( "ln" ));
+    vm5.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderPausedState( "ln" ));
+
+    AsyncInvocation inv1 = vm4.invokeAsync(() -> WANTestBase.doPuts( testName + "_RR", 10 ));
+
+    vm4.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.resumeSender( "ln" ));
+
+    vm4.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderResumedState( "ln" ));
+    vm5.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderResumedState( "ln" ));
 
     try {
       inv1.join();
@@ -169,456 +166,351 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
 
     getLogWriter().info("Completed puts in the region");
     
-    vm4.invoke(WANTestBase.class,
-        "validateQueueContents", new Object[] { "ln", 0 });
-    vm5.invoke(WANTestBase.class,
-        "validateQueueContents", new Object[] { "ln", 0 });
-    
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 10000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 10000 });
+    validateQueueContents(vm4, "ln", 0);
+    validateQueueContents(vm5, "ln", 0);
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        testName + "_RR", 100 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        testName + "_RR", 100 ));
 
   }
 
   public void testStopSerialGatewaySender() throws Throwable {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        20 });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        20 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+    createReceivers(nyPort);
+
+    createSenderCaches(lnPort);
+
+    createSenderVM4();
+    createSenderVM5();
+
+    createReceiverRegions();
+
+    createSenderRegions();
+
+    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+        20 ));
+
+    startSenders();
+
+    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+        20 ));
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 20 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 20 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        testName + "_RR", 20 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        testName + "_RR", 20 ));
     
-    vm2.invoke(WANTestBase.class, "stopReceivers");
-    vm3.invoke(WANTestBase.class, "stopReceivers");
+    vm2.invoke(() -> WANTestBase.stopReceivers());
+    vm3.invoke(() -> WANTestBase.stopReceivers());
     
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        20 });
+    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+        20 ));
     
-    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 20 });
-    vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 20 });
+    vm4.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 20 ));
+    vm5.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 20 ));
     
-    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.stopSender( "ln" ));
 
-    vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
-        "verifySenderStoppedState", new Object[] { "ln" });
-    vm5.invoke(SerialGatewaySenderOperationsDUnitTest.class,
-        "verifySenderStoppedState", new Object[] { "ln" });
+    vm4.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderStoppedState( "ln" ));
+    vm5.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderStoppedState( "ln" ));
 
-    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
-    vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+    vm4.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 0 ));
+    vm5.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 0 ));
     /**
      * Should have no effect on GatewaySenderState
      */
-    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.resumeSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.resumeSender( "ln" ));
 
-    vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
-        "verifySenderStoppedState", new Object[] { "ln" });
-    vm5.invoke(SerialGatewaySenderOperationsDUnitTest.class,
-        "verifySenderStoppedState", new Object[] { "ln" });
+    vm4.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderStoppedState( "ln" ));
+    vm5.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderStoppedState( "ln" ));
 
-    AsyncInvocation vm4async = vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
-    AsyncInvocation vm5async = vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    AsyncInvocation vm4async = vm4.invokeAsync(() -> WANTestBase.startSender( "ln" ));
+    AsyncInvocation vm5async = vm5.invokeAsync(() -> WANTestBase.startSender( "ln" ));
     int START_WAIT_TIME = 30000;
     vm4async.getResult(START_WAIT_TIME);
     vm5async.getResult(START_WAIT_TIME);
 
-    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 20 });
-    vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 20 });
+    vm4.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 20 ));
+    vm5.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 20 ));
 
-    vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-      110 });
+    vm5.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+      110 ));
     
-    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 130 });
-    vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 130 });
+    vm4.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 130 ));
+    vm5.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 130 ));
     
-    vm2.invoke(WANTestBase.class, "startReceivers");
-    vm3.invoke(WANTestBase.class, "startReceivers");
+    vm2.invoke(() -> WANTestBase.startReceivers());
+    vm3.invoke(() -> WANTestBase.startReceivers());
 
-    vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
-        "verifySenderResumedState", new Object[] { "ln" });
-    vm5.invoke(SerialGatewaySenderOperationsDUnitTest.class,
-        "verifySenderResumedState", new Object[] { "ln" });
+    vm4.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderResumedState( "ln" ));
+    vm5.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderResumedState( "ln" ));
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      testName + "_RR", 110 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      testName + "_RR", 110 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+      testName + "_RR", 110 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+      testName + "_RR", 110 ));
     
-    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
-    vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+    vm4.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 0 ));
+    vm5.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 0 ));
+  }
+
+  protected void startSenders() {
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
   }
 
   public void testStopOneSerialGatewaySenderBothPrimary() throws Throwable {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        100 });
-
-    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-
-    vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
-        "verifySenderStoppedState", new Object[] { "ln" });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+    createReceivers(nyPort);
+
+    createSenderCaches(lnPort);
+
+    createSenderVM4();
+    createSenderVM5();
+
+    createReceiverRegions();
+
+    createSenderRegions();
+
+    startSenders();
+
+    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+        100 ));
+
+    vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
+
+    vm4.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderStoppedState( "ln" ));
     
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        200 });
+    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+        200 ));
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 200 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 200 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        testName + "_RR", 200 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        testName + "_RR", 200 ));
     
     //Do some puts while restarting a sender
-    AsyncInvocation asyncPuts = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        2000 });
+    AsyncInvocation asyncPuts = vm4.invokeAsync(() -> WANTestBase.doPuts( testName + "_RR",
+        300 ));
     
     Thread.sleep(10);
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
     
     asyncPuts.getResult();
     getLogWriter().info("Completed puts in the region");
     
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 2000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 2000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        testName + "_RR", 300 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        testName + "_RR", 300 ));
     
-    Thread.sleep(5000);
-    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+    vm4.invoke(() -> WANTestBase.validateQueueSizeStat( "ln", 0 ));
     
     
   }
 
   public void testStopOneSerialGatewaySender_PrimarySecondary() {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        1000 });
-
-    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-
-    vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
-        "verifySenderStoppedState", new Object[] { "ln" });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+    createReceivers(nyPort);
+
+    createSenderCaches(lnPort);
+
+    createSenderVM4();
+    createSenderVM5();
+
+    createReceiverRegions();
+
+    createSenderRegions();
+
+    startSenders();
+
+    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+        10 ));
+
+    vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
+
+    vm4.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderStoppedState( "ln" ));
     
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        10000 });
+    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+        100 ));
     
     getLogWriter().info("Completed puts in the region");
 
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 10000 });
-    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 10000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        testName + "_RR", 100 ));
+    vm3.invoke(() -> WANTestBase.validateRegionSize(
+        testName + "_RR", 100 ));
   }
   
   public void testStopOneSender_StartAnotherSender() {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true });
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        1000 });
-    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-    vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
-        "verifySenderStoppedState", new Object[] { "ln" });
-
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-      false, 100, 10, false, true, null, true });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-      testName + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        10000 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR", null, isOffHeap() ));
+
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    createSenderVM4();
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR", "ln", isOffHeap() ));
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+        10 ));
+    vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
+    vm4.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderStoppedState( "ln" ));
+
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    createSenderVM5();
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+      testName + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm5.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+        100 ));
     getLogWriter().info("Completed puts in the region");
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 10000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        testName + "_RR", 100 ));
   }
 
   public void test_Bug44153_StopOneSender_StartAnotherSender_CheckQueueSize() {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true });
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        1000 });
-    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
-      1000 });
-    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-
-    vm4.invoke(SerialGatewaySenderOperationsDUnitTest.class,
-        "verifySenderStoppedState", new Object[] { "ln" });
-
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-      false, 100, 10, false, true, null, true });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm5.invoke(WANTestBase.class, "doPutsFrom", new Object[] { testName + "_RR", 1000, 11000 });
-
-    vm5.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
-        10000 });
-    vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-    vm5.invoke(SerialGatewaySenderOperationsDUnitTest.class,
-        "verifySenderStoppedState", new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
-      1000 });
-    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap() });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+    vm4.invoke(() -> WANTestBase.createCache( lnPort ));
+    createSenderVM4();
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR", "ln", isOffHeap() ));
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+        10 ));
+    validateQueueContents(vm4, "ln", 10);
+    vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
+
+    vm4.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderStoppedState( "ln" ));
+
+    vm5.invoke(() -> WANTestBase.createCache( lnPort ));
+    createSenderVM5();
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+
+    vm5.invoke(() -> WANTestBase.doPutsFrom( testName + "_RR", 10, 110 ));
+
+    validateQueueContents(vm5, "ln", 100);
+    validateQueueClosedVM4();
+    vm5.invoke(() -> WANTestBase.stopSender( "ln" ));
+    vm5.invoke(() -> SerialGatewaySenderOperationsDUnitTest.verifySenderStoppedState( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    validateQueueContents(vm4, "ln", 10);
+    vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
+
+    vm5.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm2.invoke(() -> WANTestBase.createReceiver( nyPort ));
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+        testName + "_RR", null, isOffHeap() ));
     getLogWriter().info("Completed puts in the region");
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 10000 });
-    vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 11000 });
-    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        testName + "_RR", 100 ));
+    vm5.invoke(() -> WANTestBase.stopSender( "ln" ));
+
+    vm4.invoke(() -> WANTestBase.startSender( "ln" ));
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        testName + "_RR", 110 ));
+    vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
   }
   
+  private void validateQueueClosedVM4() {
+    // TODO Auto-generated method stub
+    
+  }
+
+  private void validateQueueContents(VM vm, String site, int size) {
+    vm.invoke(() -> WANTestBase.validateQueueContents( site,
+        size ));
+  }
+
   /**
    * Destroy SerialGatewaySender on all the nodes.
    */
   public void testDestroySerialGatewaySenderOnAllNodes() {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        1000 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+    createReceivers(nyPort);
+
+    createSenderCaches(lnPort);
+
+    createSenderVM4();
+    createSenderVM5();
+
+    createReceiverRegions();
+
+    createSenderRegions();
+
+    startSenders();
+
+    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+        10 ));
     
     //before destroying, stop the sender
-    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
+    vm5.invoke(() -> WANTestBase.stopSender( "ln" ));
     
-    vm4.invoke(WANTestBase.class, "removeSenderFromTheRegion", new Object[] { "ln", testName + "_RR" });
-    vm5.invoke(WANTestBase.class, "removeSenderFromTheRegion", new Object[] { "ln", testName + "_RR" });
+    vm4.invoke(() -> WANTestBase.removeSenderFromTheRegion( "ln", testName + "_RR" ));
+    vm5.invoke(() -> WANTestBase.removeSenderFromTheRegion( "ln", testName + "_RR" ));
 
-    vm4.invoke(WANTestBase.class, "destroySender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "destroySender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.destroySender( "ln" ));
+    vm5.invoke(() -> WANTestBase.destroySender( "ln" ));
     
-    vm4.invoke(WANTestBase.class, "verifySenderDestroyed", new Object[] { "ln", false });
-    vm5.invoke(WANTestBase.class, "verifySenderDestroyed", new Object[] { "ln", false });
+    vm4.invoke(() -> WANTestBase.verifySenderDestroyed( "ln", false ));
+    vm5.invoke(() -> WANTestBase.verifySenderDestroyed( "ln", false ));
   }
 
   /**
    * Destroy SerialGatewaySender on a single node.
    */
   public void testDestroySerialGatewaySenderOnSingleNode() {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        1000 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+    createReceivers(nyPort);
+
+    createSenderCaches(lnPort);
+
+    createSenderVM4();
+    createSenderVM5();
+
+    createReceiverRegions();
+
+    createSenderRegions();
+
+    startSenders();
+
+    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+        10 ));
     
     //before destroying, stop the sender
-    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.stopSender( "ln" ));
         
-    vm4.invoke(WANTestBase.class, "removeSenderFromTheRegion", new Object[] { "ln", testName + "_RR" });
+    vm4.invoke(() -> WANTestBase.removeSenderFromTheRegion( "ln", testName + "_RR" ));
     
-    vm4.invoke(WANTestBase.class, "destroySender", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.destroySender( "ln" ));
     
-    vm4.invoke(WANTestBase.class, "verifySenderDestroyed", new Object[] { "ln", false });
-    vm5.invoke(WANTestBase.class, "verifySenderRunningState", new Object[] { "ln" });
+    vm4.invoke(() -> WANTestBase.verifySenderDestroyed( "ln", false ));
+    vm5.invoke(() -> WANTestBase.verifySenderRunningState( "ln" ));
   }
   
   /**
@@ -626,56 +518,37 @@ public class SerialGatewaySenderOperationsDUnitTest extends WANTestBase {
    * Hence, exception is thrown by the sender API.
    */
   public void testDestroySerialGatewaySenderExceptionScenario() {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-
-    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
-
-    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true });
-    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
-        false, 100, 10, false, true, null, true });
-
-    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap() });
-    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", null, isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
-        testName + "_RR", "ln", isOffHeap() });
-
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
-        1000 });
+    Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
+    Integer nyPort = (Integer)vm1.invoke(() -> WANTestBase.createFirstRemoteLocator( 2, lnPort ));
+
+    createReceivers(nyPort);
+
+    createSenderCaches(lnPort);
+
+    createSenderVM4();
+    createSenderVM5();
+
+    createReceiverRegions();
+
+    createSenderRegions();
+
+    startSenders();
+
+    vm4.invoke(() -> WANTestBase.doPuts( testName + "_RR",
+        10 ));
     
     try {
-      vm4.invoke(WANTestBase.class, "destroySender", new Object[] { "ln" });
+      vm4.invoke(() -> WANTestBase.destroySender( "ln" ));
     } catch (RMIException e) {
       assertTrue("Cause of the exception should be GatewaySenderException", e.getCause() instanceof GatewaySenderException);
     }
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-        testName + "_RR", 1000 });
+    vm2.invoke(() -> WANTestBase.validateRegionSize(
+        testName + "_RR", 10 ));
   }
   
   public static void verifySenderPausedState(String senderId) {
     Set<GatewaySender> senders = cache.getGatewaySenders();
-    GatewaySender sender = null;
+    AbstractGatewaySender sender = null;
     for (GatewaySender s : senders) {
       if (s.getId().equals(senderId)) {
         sender = (AbstractGatewaySender)s;


[19/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
new file mode 100644
index 0000000..ccda683
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
@@ -0,0 +1,967 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+/**
+ * 
+ */
+package com.gemstone.gemfire.internal.cache.wan.concurrent;
+
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionDestroyedException;
+import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
+import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+
+import dunit.AsyncInvocation;
+import dunit.DistributedTestCase;
+/**
+ * @author skumar
+ *
+ */
+public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTestBase {
+
+  private static final long serialVersionUID = 1L;
+  
+  public ConcurrentParallelGatewaySenderOperation_2_DUnitTest(String name) {
+    super(name);
+  }
+  
+  public void setUp() throws Exception {
+    super.setUp();
+    addExpectedException("RegionDestroyedException");
+    addExpectedException("Broken pipe");
+    addExpectedException("Connection reset");
+    addExpectedException("Unexpected IOException");
+  }
+  
+  // to test that when userPR is locally destroyed, shadow Pr is also locally
+  // destroyed and on recreation usrePr , shadow Pr is also recreated.
+  public void testParallelGatewaySender_SingleNode_UserPR_localDestroy_RecreateRegion() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    
+    try {
+      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+
+      vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
+          "ln", 2, true, 100, 10, false, false, null, false, 5, OrderPolicy.KEY });
+
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 10, isOffHeap() });
+
+      getLogWriter().info("Created PRs on local site");
+
+      vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", null, 1, 10, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+          10 });
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10 });
+
+      // since sender is paused, no dispatching
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 0 });
+
+      vm4.invoke(WANTestBase.class, "localDestroyRegion",
+          new Object[] { testName + "_PR" });
+
+      // since shodowPR is locally destroyed, so no data to dispatch
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 0 });
+
+      vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 10, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
+          testName + "_PR", 10, 20 });
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10 });
+
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10 });
+    } finally {
+      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+    }
+  }
+  
+  public void testParallelGatewaySender_SingleNode_UserPR_Destroy_RecreateRegion() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    try {
+      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+
+      vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
+          "ln", 2, true, 100, 10, false, false, null, false, 4, OrderPolicy.KEY });
+
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 10, isOffHeap() });
+
+      getLogWriter().info("Created PRs on local site");
+
+      vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", null, 1, 10, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+          10 });
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10 });
+
+      // since resume is paused, no dispatching
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 0 });
+
+      vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "destroyRegion", new Object[] { testName
+          + "_PR" });
+
+      // before destoy, there is wait for queue to drain, so data will be
+      // dispatched
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10 });
+
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 10, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
+          testName + "_PR", 10, 20 });
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10 });
+
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 20 });
+    } finally {
+      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+        "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+    }
+  }
+  
+  
+  public void testParallelGatewaySender_SingleNode_UserPR_Close_RecreateRegion() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class, "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME", new Object[] { lnPort });
+    
+    getLogWriter().info("Created cache on local site");
+    
+    getLogWriter().info("Created senders on local site");
+    
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, false, 7, OrderPolicy.KEY });
+  
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 1, 10, isOffHeap()});
+    
+    getLogWriter().info("Created PRs on local site");
+    
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 10, isOffHeap() });
+   
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 10 });
+    
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 10 });
+    
+    //since resume is paused, no dispatching
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 0 });
+    
+    vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class, "closeRegion", new Object[] { testName + "_PR" });
+    
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    
+    pause(500); //paused if there is any element which is received on remote site
+    
+    //before close, there is wait for queue to drain, so data will be dispatched
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 0 });
+    
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 1, 10, isOffHeap() });
+    
+    vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] { testName + "_PR", 10, 20 });
+    
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 10 });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 10 });
+    
+    vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+        "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+  }
+  
+  //to test that while localDestroy is in progress, put operation does not successed
+  public void testParallelGatewaySender_SingleNode_UserPR_localDestroy_SimultenuousPut_RecreateRegion() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    try {
+      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+
+      getLogWriter().info("Created cache on local site");
+
+      getLogWriter().info("Created senders on local site");
+
+      vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
+          "ln", 2, true, 100, 10, false, false, null, false, 5, OrderPolicy.KEY });
+
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 10, isOffHeap() });
+
+      getLogWriter().info("Created PRs on local site");
+
+      vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", null, 1, 10, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+          10 });
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10 });
+
+      // since resume is paused, no dispatching
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 0 });
+
+      AsyncInvocation putAsync = vm4.invokeAsync(WANTestBase.class,
+          "doPutsFrom", new Object[] { testName + "_PR", 100, 2000 });
+      AsyncInvocation localDestroyAsync = vm4.invokeAsync(WANTestBase.class,
+          "localDestroyRegion", new Object[] { testName + "_PR" });
+      try {
+        putAsync.join();
+        localDestroyAsync.join();
+      } catch (InterruptedException e) {
+        e.printStackTrace();
+        fail("Interrupted the async invocation.");
+      }
+
+      if (localDestroyAsync.getException() != null) {
+        fail("Not Expected Exception got", putAsync.getException());
+      }
+
+      if (putAsync.getException() != null
+          && !(putAsync.getException() instanceof RegionDestroyedException)) {
+        fail("Expected RegionDestroyedException but got",
+            putAsync.getException());
+      }
+
+      vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+
+      pause(500); // paused if there is any element which is received on remote
+                  // site
+
+      // since shodowPR is locally destroyed, so no data to dispatch
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 0 });
+
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 10, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
+          testName + "_PR", 10, 20 });
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10 });
+
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10 });
+    } finally {
+      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+    }
+  }
+  
+  public void testParallelGatewaySender_SingleNode_UserPR_Destroy_SimultenuousPut_RecreateRegion() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    try {
+      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+
+      vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
+          "ln", 2, true, 100, 10, false, false, null, false, 6, OrderPolicy.KEY });
+
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 10, isOffHeap() });
+      vm4.invoke(WANTestBase.class, "addCacheListenerAndDestroyRegion", new Object[] {
+        testName + "_PR"});
+      
+      getLogWriter().info("Created PRs on local site");
+
+      vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", null, 1, 10, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+          10 });
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10 });
+
+      // since resume is paused, no dispatching
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 0 });
+
+      vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+
+      AsyncInvocation putAsync = vm4.invokeAsync(WANTestBase.class,
+          "doPutsFrom", new Object[] { testName + "_PR", 10, 101 });
+      try {
+        putAsync.join();
+      } catch (InterruptedException e) {
+        e.printStackTrace();
+        fail("Interrupted the async invocation.");
+      }
+
+      if (putAsync.getException() != null
+          && !(putAsync.getException() instanceof RegionDestroyedException)) {
+        fail("Expected RegionDestroyedException but got",
+            putAsync.getException());
+      }
+
+      // before destroy, there is wait for queue to drain, so data will be
+      // dispatched
+      vm2.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "validateRegionSizeWithinRange", new Object[] { testName + "_PR", 10,
+              101 }); // possible size is more than 10
+
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 10, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
+          testName + "_PR", 10, 20 });
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10 });
+
+      vm2.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "validateRegionSizeWithinRange", new Object[] { testName + "_PR", 20,
+              101 });// possible size is more than 20
+    } finally {
+      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+    }
+    
+  }
+  
+  public void testParallelGatewaySender_SingleNode_UserPR_Destroy_NodeDown()
+      throws Exception {
+    addExpectedException("Broken pipe");
+    addExpectedException("Connection reset");
+    addExpectedException("Unexpected IOException");
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    try {
+      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+      vm5.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+      vm6.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+
+      vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
+          "ln", 2, true, 100, 10, false, false, null, false, 5, OrderPolicy.KEY });
+      vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
+          "ln", 2, true, 100, 10, false, false, null, false, 5, OrderPolicy.KEY });
+      vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
+          "ln", 2, true, 100, 10, false, false, null, false, 5, OrderPolicy.KEY });
+
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+      vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+      vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+      vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+      vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 10, isOffHeap() });
+      vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 10, isOffHeap() });
+      vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 10, isOffHeap() });
+
+      getLogWriter().info("Created PRs on local site");
+
+      vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", null, 1, 10, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+          10000 });
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10000 });
+
+      // since resume is paused, no dispatching
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 0 });
+
+      vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+      vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+      vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+
+      pause(200);
+      AsyncInvocation localDestroyAsync = vm4.invokeAsync(WANTestBase.class,
+          "destroyRegion", new Object[] { testName + "_PR" });
+
+      AsyncInvocation closeAsync = vm4.invokeAsync(WANTestBase.class,
+          "closeCache");
+      try {
+        localDestroyAsync.join();
+        closeAsync.join();
+      } catch (InterruptedException e) {
+        e.printStackTrace();
+        fail("Interrupted the async invocation.");
+      }
+
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10000 });// possible size is more than 20
+    } finally {
+      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+      vm5.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+      vm6.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+    }
+
+  }
+  
+  public void testParallelGatewaySender_SingleNode_UserPR_Close_SimultenuousPut_RecreateRegion() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    try {
+      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+
+      getLogWriter().info("Created cache on local site");
+
+      getLogWriter().info("Created senders on local site");
+
+      vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
+          "ln", 2, true, 100, 10, false, false, null, false, 5, OrderPolicy.KEY });
+
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 10, isOffHeap() });
+
+      getLogWriter().info("Created PRs on local site");
+
+      vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", null, 1, 10, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+          10 });
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10 });
+
+      // since resume is paused, no dispatching
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 0 });
+
+      AsyncInvocation putAsync = vm4.invokeAsync(WANTestBase.class,
+          "doPutsFrom", new Object[] { testName + "_PR", 10, 2000 });
+      AsyncInvocation localDestroyAsync = vm4.invokeAsync(
+          ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "closeRegion", new Object[] { testName + "_PR" });
+      try {
+        putAsync.join();
+        localDestroyAsync.join();
+      } catch (InterruptedException e) {
+        e.printStackTrace();
+        fail("Interrupted the async invocation.");
+      }
+
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 0 });
+
+      vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 10, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
+          testName + "_PR", 10, 20 });
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10 });
+
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10 });
+    } finally {
+      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+    }
+  }
+  
+  public void testParallelGatewaySenders_SingleNode_UserPR_localDestroy_RecreateRegion() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer tkPort = (Integer)vm2.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 3, lnPort });
+    Integer pnPort = (Integer)vm3.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 4, lnPort });
+    
+    vm4.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm5.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
+    vm6.invoke(WANTestBase.class, "createReceiver", new Object[] { pnPort });
+
+    try {
+      vm7.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+
+      getLogWriter().info("Created cache on local site");
+
+      vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
+          "ln1", 2, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+
+      vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
+          "ln2", 3, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+
+      vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
+          "ln3", 4, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+
+      vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
+      vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln2" });
+      vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln3" });
+
+      vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln1,ln2,ln3", 1, 10, isOffHeap() });
+
+      getLogWriter().info("Created PRs on local site");
+
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", null, 1, 10, isOffHeap() });
+      vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", null, 1, 10, isOffHeap() });
+      vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", null, 1, 10, isOffHeap() });
+
+      vm7.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+          10 });
+      pause(1000);
+      vm7.invoke(WANTestBase.class, "localDestroyRegion",
+          new Object[] { testName + "_PR" });
+
+      vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln1,ln2,ln3", 1, 10, isOffHeap() });
+
+      vm7.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
+          testName + "_PR", 10, 20 });
+
+      vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10 });
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 20 });
+      vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 20 });
+      vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 20 });
+    } finally {
+      vm7.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+    }
+  }
+  
+  public void testParallelGatewaySender_MultipleNode_UserPR_localDestroy_Recreate() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    try {
+      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+      vm5.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 100, isOffHeap() });
+      vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
+          "ln", 2, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+      vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
+          "ln", 2, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+      vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+      getLogWriter().info("Created PRs on local site");
+
+      vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", null, 1, 100, isOffHeap() });
+
+      AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
+          new Object[] { testName + "_PR", 1000 });
+      pause(1000);
+      vm5.invoke(WANTestBase.class, "localDestroyRegion",
+          new Object[] { testName + "_PR" });
+
+      try {
+        inv1.join();
+      } catch (InterruptedException ex) {
+        ex.printStackTrace();
+        fail("Interrupted the async invocation.");
+      }
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 1000 });
+
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 1000 });
+
+      vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
+          testName + "_PR", 1000, 2000 });
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 2000 });
+
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 2000 });
+    } finally {
+      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+      vm5.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+    }
+  }
+  
+  public void testParallelGatewaySenders_MultiplNode_UserPR_localDestroy_Recreate() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer tkPort = (Integer)vm2.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 3, lnPort });
+    
+    vm6.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm7.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
+    
+    try {
+      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+      vm5.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln1,ln2", 1, 100, isOffHeap() });
+      vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln1,ln2", 1, 100, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
+          "ln1", 2, true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
+      vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
+          "ln2", 3, true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
+      vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
+          "ln1", 2, true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
+      vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
+          "ln2", 3, true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
+
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln2" });
+      vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
+      vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln2" });
+
+      vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", null, 1, 100, isOffHeap() });
+      vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", null, 1, 100, isOffHeap() });
+
+      AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
+          new Object[] { testName + "_PR", 1000 });
+      pause(1000);
+      vm5.invoke(WANTestBase.class, "localDestroyRegion",
+          new Object[] { testName + "_PR" });
+
+      try {
+        inv1.join();
+      } catch (InterruptedException ex) {
+        ex.printStackTrace();
+        fail("Interrupted the async invocation.");
+      }
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 1000 });
+
+      vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 1000 });
+      vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 1000 });
+
+      vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln1,ln2", 1, 100, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
+          testName + "_PR", 1000, 2000 });
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 2000 });
+
+      vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 2000 });
+      vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 2000 });
+    } finally {
+      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+      vm5.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+    }
+  }
+  
+  public void testParallelGatewaySender_ColocatedPartitionedRegions_localDestroy() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    try {
+      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+      vm5.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+
+      vm4.invoke(WANTestBase.class,
+          "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
+              "ln", 1, 100, isOffHeap() });
+      vm5.invoke(WANTestBase.class,
+          "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
+              "ln", 1, 100, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
+          "ln", 2, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+      vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
+          "ln", 2, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+      vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+      getLogWriter().info("Created PRs on local site");
+
+      vm2.invoke(WANTestBase.class,
+          "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
+              null, 1, 100, isOffHeap() });
+
+      AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class,
+          "putcolocatedPartitionedRegion", new Object[] { 2000 });
+      pause(1000);
+
+      try {
+        vm5.invoke(WANTestBase.class, "localDestroyRegion",
+            new Object[] { customerRegionName });
+      } catch (Exception ex) {
+        assertTrue(ex.getCause() instanceof UnsupportedOperationException);
+      }
+
+      try {
+        inv1.join();
+      } catch (Exception e) {
+        fail("Unexpected exception", e);
+      }
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          customerRegionName, 2000 });
+      vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          customerRegionName, 2000 });
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          customerRegionName, 2000 });
+    } finally {
+      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+      vm5.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+    }
+    
+  }
+  
+  public void testParallelGatewaySender_ColocatedPartitionedRegions_destroy() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    try {
+      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+      vm5.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+
+      vm4.invoke(WANTestBase.class,
+          "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
+              "ln", 1, 100, isOffHeap() });
+      vm5.invoke(WANTestBase.class,
+          "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
+              "ln", 1, 100, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
+          "ln", 2, true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY });
+      vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
+          "ln", 2, true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY });
+
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+      vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+      getLogWriter().info("Created PRs on local site");
+
+      vm2.invoke(WANTestBase.class,
+          "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
+              null, 1, 100, isOffHeap() });
+
+      AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class,
+          "putcolocatedPartitionedRegion", new Object[] { 2000 });
+      pause(1000);
+
+      try {
+        vm5.invoke(WANTestBase.class, "destroyRegion",
+            new Object[] { customerRegionName });
+      } catch (Exception ex) {
+        assertTrue(ex.getCause() instanceof IllegalStateException);
+        return;
+      }
+      fail("Excpeted UnsupportedOperationException");
+    } finally {
+      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+      vm5.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+    }
+  }
+  
+  public static void createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME(
+      Integer locPort) {
+    createCache(false, locPort);
+    AbstractGatewaySender.MAXIMUM_SHUTDOWN_WAIT_TIME = -1;
+  }
+
+  public static void clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME() {
+    AbstractGatewaySender.MAXIMUM_SHUTDOWN_WAIT_TIME = 0;
+  }
+  
+  public static void closeRegion(String regionName) {
+    Region r = cache.getRegion(Region.SEPARATOR + regionName);
+    assertNotNull(r);
+    r.close();
+  }
+
+  public static void validateRegionSizeWithinRange(String regionName,
+      final int min, final int max) {
+    final Region r = cache.getRegion(Region.SEPARATOR + regionName);
+    assertNotNull(r);
+    WaitCriterion wc = new WaitCriterion() {
+      public boolean done() {
+        if (r.keySet().size() > min && r.keySet().size() <= max) {
+          return true;
+        }
+        return false;
+      }
+
+      public String description() {
+        return "Expected region entries to be within range : " + min + " "
+            + max + " but actual entries: " + r.keySet().size();
+      }
+    };
+    DistributedTestCase.waitForCriterion(wc, 120000, 500, true);
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
new file mode 100644
index 0000000..afb3555
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
@@ -0,0 +1,509 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+/**
+ * 
+ */
+package com.gemstone.gemfire.internal.cache.wan.concurrent;
+
+import java.util.Set;
+
+import com.gemstone.gemfire.cache.wan.GatewaySender;
+import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
+import dunit.AsyncInvocation;
+
+/**
+ * @author skumar
+ *
+ */
+public class ConcurrentSerialGatewaySenderOperationsDUnitTest  extends WANTestBase {
+
+  private static final long serialVersionUID = 1L;
+
+  public ConcurrentSerialGatewaySenderOperationsDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+    addExpectedException("Broken pipe");
+    addExpectedException("Connection reset");
+    addExpectedException("Unexpected IOException");
+  }
+
+  public void testSerialGatewaySenderOperationsWithoutStarting() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true, 5, OrderPolicy.KEY });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true, 5, OrderPolicy.KEY });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        10000 });
+
+    vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
+        "verifyGatewaySenderOperations", new Object[] { "ln" });
+    vm5.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
+        "verifyGatewaySenderOperations", new Object[] { "ln" });
+
+  }
+
+  
+  public void testStartPauseResumeSerialGatewaySender() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true, 5 , OrderPolicy.KEY});
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true, 5 , OrderPolicy.KEY});
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        10000 });
+
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+
+    vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
+        "verifySenderPausedState", new Object[] { "ln" });
+    vm5.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
+        "verifySenderPausedState", new Object[] { "ln" });
+
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
+        new Object[] { testName + "_RR", 1000 });
+
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+
+    vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
+        "verifySenderResumedState", new Object[] { "ln" });
+    vm5.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
+        "verifySenderResumedState", new Object[] { "ln" });
+
+    try {
+      inv1.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail("Interrupted the async invocation.");
+    }
+
+    getLogWriter().info("Completed puts in the region");
+
+    vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
+        "validateQueueContentsForConcurrentSerialGatewaySender", new Object[] { "ln", 0 });
+    vm5.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
+        "validateQueueContentsForConcurrentSerialGatewaySender", new Object[] { "ln", 0 });
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 10000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 10000 });
+
+  }
+
+  public void testStopSerialGatewaySender() throws Throwable {
+    addExpectedException("Broken pipe");
+    addExpectedException("Connection reset");
+    addExpectedException("RegionDestroyedException");
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true, 3, OrderPolicy.KEY});
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true, 3, OrderPolicy.KEY });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        200 });
+    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+
+    vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
+        "verifySenderStoppedState", new Object[] { "ln" });
+    vm5.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
+        "verifySenderStoppedState", new Object[] { "ln" });
+    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+    vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+
+    /**
+     * Should have no effect on GatewaySenderState
+     */
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+
+    vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
+        "verifySenderStoppedState", new Object[] { "ln" });
+    vm5.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
+        "verifySenderStoppedState", new Object[] { "ln" });
+
+    AsyncInvocation vm4async = vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    AsyncInvocation vm5async = vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    int START_WAIT_TIME = 30000;
+    vm4async.getResult(START_WAIT_TIME);
+    vm5async.getResult(START_WAIT_TIME);
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+      10000 });
+
+    vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
+        "verifySenderResumedState", new Object[] { "ln" });
+    vm5.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
+        "verifySenderResumedState", new Object[] { "ln" });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", 10000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", 10000 });
+  }
+
+  public void testStopOneSerialGatewaySenderBothPrimary() {
+    addExpectedException("Broken pipe");
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true, 4, OrderPolicy.KEY });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true, 4, OrderPolicy.KEY });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+
+    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+
+    vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
+        "verifySenderStoppedState", new Object[] { "ln" });
+    
+    vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        10000 });
+    
+    getLogWriter().info("Completed puts in the region");
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 10000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 10000 });
+  }
+
+  public void Bug46921_testStopOneSerialGatewaySender_PrimarySecondary() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true, 4, OrderPolicy.PARTITION });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true, 4, OrderPolicy.PARTITION });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+
+    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+
+    vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
+        "verifySenderStoppedState", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        10000 });
+    
+    getLogWriter().info("Completed puts in the region");
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 10000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 10000 });
+  }
+  
+  public void testStopOneSender_StartAnotherSender() {
+    addExpectedException("Broken pipe");
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true, 4, OrderPolicy.PARTITION });
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
+        "verifySenderStoppedState", new Object[] { "ln" });
+
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+      false, 100, 10, false, true, null, true, 4, OrderPolicy.PARTITION });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        10000 });
+    getLogWriter().info("Completed puts in the region");
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 10000 });
+  }
+
+  public void test_Bug44153_StopOneSender_StartAnotherSender_CheckQueueSize() {
+    addExpectedException("Broken pipe");
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true, 3, OrderPolicy.PARTITION });
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+    vm4.invoke(WANTestBase.class, "validateQueueContentsForConcurrentSerialGatewaySender", new Object[] { "ln", 1000});
+
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+      false, 100, 10, false, true, null, true, 3, OrderPolicy.PARTITION });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "validateQueueContentsForConcurrentSerialGatewaySender", new Object[] { "ln", 1000});
+
+    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm4.invoke(ConcurrentSerialGatewaySenderOperationsDUnitTest.class,
+        "verifySenderStoppedState", new Object[] { "ln" });
+    vm4.invoke(WANTestBase.class, "validateQueueClosedForConcurrentSerialGatewaySender", new Object[] { "ln"});
+
+
+    vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        10000 });
+
+    vm5.invoke(WANTestBase.class, "validateQueueContentsForConcurrentSerialGatewaySender", new Object[] { "ln",
+        11000 });
+    vm4.invoke(WANTestBase.class, "validateQueueClosedForConcurrentSerialGatewaySender", new Object[] { "ln"});
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    getLogWriter().info("Completed puts in the region");
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 10000 });
+  }
+  
+  public static void verifySenderPausedState(String senderId) {
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    AbstractGatewaySender sender = null;
+    for (GatewaySender s : senders) {
+      if (s.getId().equals(senderId)) {
+        sender = (AbstractGatewaySender)s;
+        break;
+      }
+    }
+    assertTrue(sender.isPaused());
+  }
+
+  public static void verifySenderResumedState(String senderId) {
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    AbstractGatewaySender sender = null;
+    for (GatewaySender s : senders) {
+      if (s.getId().equals(senderId)) {
+        sender = (AbstractGatewaySender)s;
+        break;
+      }
+    }
+    assertFalse(sender.isPaused());
+    assertTrue(sender.isRunning());
+  }
+
+  public static void verifySenderStoppedState(String senderId) {
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    AbstractGatewaySender sender = null;
+    for (GatewaySender s : senders) {
+      if (s.getId().equals(senderId)) {
+        sender = (AbstractGatewaySender)s;
+        break;
+      }
+    }
+    assertFalse(sender.isRunning());
+    assertFalse(sender.isPaused());
+  }
+
+  public static void verifyGatewaySenderOperations(String senderId) {
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    GatewaySender sender = null;
+    for (GatewaySender s : senders) {
+      if (s.getId().equals(senderId)) {
+        sender = s;
+        break;
+      }
+    }
+    assertFalse(sender.isPaused());
+    assertFalse(((AbstractGatewaySender)sender).isRunning());
+    sender.pause();
+    sender.resume();
+    sender.stop();
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest.java
new file mode 100644
index 0000000..5d135d5
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest.java
@@ -0,0 +1,16 @@
+package com.gemstone.gemfire.internal.cache.wan.concurrent;
+
+@SuppressWarnings("serial")
+public class ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest extends
+    ConcurrentSerialGatewaySenderOperationsDUnitTest {
+
+  public ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest(String name) {
+    super(name);
+  }
+
+  @Override
+  public boolean isOffHeap() {
+    return true;
+  }
+
+}


[28/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
new file mode 100644
index 0000000..28139ed
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
@@ -0,0 +1,564 @@
+/*
+ *  =========================================================================
+ *  Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ *  ========================================================================
+ */
+package com.gemstone.gemfire.management;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Collections;
+import java.util.Properties;
+
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanServer;
+import javax.management.Notification;
+import javax.management.NotificationListener;
+import javax.management.ObjectName;
+
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.client.internal.LocatorTestBase;
+import com.gemstone.gemfire.cache.query.IndexExistsException;
+import com.gemstone.gemfire.cache.query.IndexInvalidException;
+import com.gemstone.gemfire.cache.query.IndexNameConflictException;
+import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.cache.query.RegionNotFoundException;
+import com.gemstone.gemfire.cache.query.cq.dunit.CqQueryDUnitTest;
+import com.gemstone.gemfire.cache.query.internal.cq.CqService;
+import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.distributed.DistributedMember;
+import com.gemstone.gemfire.distributed.Locator;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.internal.AvailablePort;
+import com.gemstone.gemfire.internal.AvailablePortHelper;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.management.internal.JmxManagerLocatorRequest;
+import com.gemstone.gemfire.management.internal.JmxManagerLocatorResponse;
+import com.gemstone.gemfire.management.internal.MBeanJMXAdapter;
+import com.gemstone.gemfire.management.internal.SystemManagementService;
+
+import dunit.DistributedTestCase;
+import dunit.Host;
+import dunit.SerializableRunnable;
+import dunit.VM;
+
+/**
+ * Cache Server related management test cases
+ * 
+ * @author rishim
+ * 
+ */
+public class CacheServerManagementDUnitTest extends LocatorTestBase {
+
+  private static final long serialVersionUID = 1L;
+  
+  private static int CONNECT_LOCATOR_TIMEOUT_MS = 30000; 
+
+  private ManagementTestBase helper;
+
+  private static final String queryName = "testClientWithFeederAndCQ_0";
+
+  private static final String indexName = "testIndex";
+  
+  private static MBeanServer mbeanServer = MBeanJMXAdapter.mbeanServer;
+  
+
+  protected CqQueryDUnitTest cqDUnitTest = new CqQueryDUnitTest(
+      "CqDataDUnitTest");
+
+  public CacheServerManagementDUnitTest(String name) {
+    super(name);
+    this.helper = new ManagementTestBase(name);
+    
+  }
+
+  public void setUp() throws Exception {
+    disconnectAllFromDS();
+    super.setUp();
+  }
+
+  public void tearDown2() throws Exception {
+    super.tearDown2();
+    disconnectAllFromDS();
+  }
+
+  /**
+   * 
+   * @throws Exception
+   */
+  public void testCacheServerMBean() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    VM managingNode = host.getVM(2);
+
+    // Managing Node is created first
+    helper.createManagementCache(managingNode);
+    helper.startManagingNode(managingNode);
+    //helper.createCache(server);
+    int serverPort = AvailablePortHelper.getRandomAvailableTCPPort();
+    cqDUnitTest.createServer(server,serverPort);
+    
+   
+    DistributedMember member = helper.getMember(server);
+    
+    verifyCacheServer(server,serverPort);
+
+    final int port = server.invokeInt(CqQueryDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+
+    // Create client.
+    cqDUnitTest.createClient(client, port, host0);
+
+    cqDUnitTest.createCQ(client, queryName, cqDUnitTest.cqs[0]);
+    cqDUnitTest.executeCQ(client, queryName, false, null);
+
+    final int size = 10;
+    cqDUnitTest.createValues(client, cqDUnitTest.regions[0], size);
+    cqDUnitTest.waitForCreated(client, queryName, CqQueryDUnitTest.KEY + size);
+
+    cqDUnitTest.validateCQ(client, queryName,
+    /* resultSize: */CqQueryDUnitTest.noTest,
+    /* creates: */size,
+    /* updates: */0,
+    /* deletes; */0,
+    /* queryInserts: */size,
+    /* queryUpdates: */0,
+    /* queryDeletes: */0,
+    /* totalEvents: */size);
+
+    // Close.
+
+    pause(2000);
+    checkNavigation(managingNode,member,serverPort);
+    verifyIndex(server,serverPort);
+    // This will test all CQs and will close the cq in its final step
+    verifyCacheServerRemote(managingNode, member,serverPort);
+
+    verifyClosedCQ(server);
+
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server);
+    helper.stopManagingNode(managingNode);
+    helper.closeCache(client);
+    helper.closeCache(server);
+    helper.closeCache(managingNode);
+  }
+
+  /**
+   * Test for client server connection related management artifacts
+   * like notifications 
+   * @throws Exception
+   */
+  
+  public void testCacheClient() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM locator = host.getVM(0);
+    VM server = host.getVM(1);
+    VM client = host.getVM(2);
+    
+    int locatorPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    startLocatorInVM(locator, locatorPort, "");
+    
+    String locators = getServerHostName(locator.getHost())+ "[" + locatorPort + "]";
+    
+   
+    int serverPort = startBridgeServerInVM(server, null, locators);
+    
+    addClientNotifListener(server,serverPort);
+
+    // Start a client and make sure that proper notification is received
+    startBridgeClientInVM(client, null, getServerHostName(locator.getHost()), locatorPort);
+    
+    //stop the client and make sure the bridge server notifies
+    stopBridgeMemberVM(client);
+    helper.closeCache(locator);
+    helper.closeCache(server);
+    helper.closeCache(client);
+
+  }
+  
+  /**
+   * Intention of this test is to check if a node becomes manager after all the nodes are alive
+   * it should have all the information of all  the members.
+   * 
+   * Thats why used  service.getLocalManager().runManagementTaskAdhoc() to make node
+   * ready for federation when manager node comes up
+   * @throws Exception
+   */
+
+  // renable when bug 46138
+  public void DISABLEDtestBug46049() throws Exception {
+    final Host host = Host.getHost(0);
+    VM locator = host.getVM(0);
+    VM server = host.getVM(1);
+    
+    //Step 1:
+    final int locatorPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    startLocator(locator, locatorPort, "");
+
+    String locators = getServerHostName(locator.getHost())+ "[" + locatorPort + "]";
+    
+    //Step 2:
+    int serverPort = startBridgeServerInVM(server, null, locators);
+    
+    //Step 3:
+    server.invoke(new SerializableRunnable("Check Server") {
+
+      public void run() {
+        Cache cache = GemFireCacheImpl.getInstance();
+        assertNotNull(cache);
+        SystemManagementService service = (SystemManagementService)ManagementService
+            .getExistingManagementService(cache);
+        assertNotNull(service);
+        assertFalse(service.isManager());
+        assertNotNull(service.getMemberMXBean());
+        service.getLocalManager().runManagementTaskAdhoc();
+
+
+      }
+    });
+    
+  //Step 4:
+    JmxManagerLocatorResponse locRes = JmxManagerLocatorRequest.send(locator
+        .getHost().getHostName(), locatorPort, CONNECT_LOCATOR_TIMEOUT_MS, Collections.<String, String> emptyMap());
+    
+  //Step 5:
+    locator.invoke(new SerializableRunnable("Check locator") {
+
+      public void run() {
+        Cache cache = GemFireCacheImpl.getInstance();
+        assertNotNull(cache);
+        ManagementService service = ManagementService
+            .getExistingManagementService(cache);
+        assertNotNull(service);
+        assertTrue(service.isManager());
+        LocatorMXBean bean = service.getLocalLocatorMXBean();
+        assertEquals(locatorPort, bean.getPort());
+        DistributedSystemMXBean dsBean = service.getDistributedSystemMXBean();
+        ObjectName[] names = dsBean.listMemberObjectNames();
+       
+        assertEquals(2,dsBean.listMemberObjectNames().length);
+
+      }
+    });
+    
+
+
+    helper.closeCache(locator);
+    helper.closeCache(server);
+    
+ 
+  }
+  
+  
+  protected void startLocator(final VM vm, final int locatorPort, final String otherLocators) {
+    vm.invoke(new SerializableRunnable("Create Locator") {
+
+      final String testName= getUniqueName();
+      public void run() {
+        disconnectFromDS();
+        Properties props = new Properties();
+        props.setProperty(DistributionConfig.MCAST_PORT_NAME, String.valueOf(0));
+        props.setProperty(DistributionConfig.LOCATORS_NAME, otherLocators);
+        props.setProperty(DistributionConfig.LOG_LEVEL_NAME, getDUnitLogLevel());
+        props.setProperty(DistributionConfig.JMX_MANAGER_HTTP_PORT_NAME, "0");
+        props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+        try {
+          File logFile = new File(testName + "-locator" + locatorPort
+              + ".log");
+          InetAddress bindAddr = null;
+          try {
+            bindAddr = InetAddress.getByName(getServerHostName(vm.getHost()));
+          } catch (UnknownHostException uhe) {
+            fail("While resolving bind address ", uhe);
+          }
+          Locator locator = Locator.startLocatorAndDS(locatorPort, logFile, bindAddr, props);
+          remoteObjects.put(LOCATOR_KEY, locator);
+        } catch (IOException ex) {
+          fail("While starting locator on port " + locatorPort, ex);
+        }
+      }
+    });
+  }
+  
+  protected void checkNavigation(final VM vm,
+      final DistributedMember cacheServerMember, final int serverPort) {
+    SerializableRunnable checkNavigation = new SerializableRunnable(
+        "Check Navigation") {
+      public void run() {
+
+        final ManagementService service = helper.getManagementService();
+
+        DistributedSystemMXBean disMBean = service.getDistributedSystemMXBean();
+        try {
+          ObjectName expected = MBeanJMXAdapter.getClientServiceMBeanName(
+              serverPort, cacheServerMember.getId());
+          ObjectName actual = disMBean.fetchCacheServerObjectName(
+              cacheServerMember.getId(), serverPort);
+          assertEquals(expected, actual);
+        } catch (Exception e) {
+          fail("Cache Server Navigation Failed " + e);
+        }
+
+        try {
+          assertEquals(1, disMBean.listCacheServerObjectNames().length);
+        } catch (Exception e) {
+          fail("Cache Server Navigation Failed " + e);
+        }
+
+      }
+    };
+    vm.invoke(checkNavigation);
+  }
+  
+  /**
+   * Verify the Cache Server details
+   * 
+   * @param vm
+   */
+  @SuppressWarnings("serial")
+  protected void addClientNotifListener(final VM vm , final int serverPort) throws Exception {
+    SerializableRunnable addClientNotifListener = new SerializableRunnable(
+        "Add Client Notif Listener") {
+      public void run() {
+        GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+        ManagementService service = ManagementService
+            .getManagementService(cache);
+        final CacheServerMXBean bean = service.getLocalCacheServerMXBean(serverPort);
+        assertNotNull(bean);
+        WaitCriterion ev = new WaitCriterion() {
+          public boolean done() {
+            if (bean.isRunning())
+              return true;
+            return false;
+          }
+
+          public String description() {
+            return null;
+          }
+        };
+        DistributedTestCase.waitForCriterion(ev, 10 * 1000, 200, true);
+        assertTrue(bean.isRunning());
+        TestCacheServerNotif nt = new TestCacheServerNotif();
+        try {
+          mbeanServer.addNotificationListener(MBeanJMXAdapter
+              .getClientServiceMBeanName(serverPort,cache.getDistributedSystem().getMemberId()), nt, null, null);
+        } catch (InstanceNotFoundException e) {
+          fail("Failed With Exception " + e);
+        }
+        
+      }
+    };
+    vm.invoke(addClientNotifListener);
+  }
+  /**
+   * Verify the closed CQ which is closed from Managing Node
+   * 
+   * @param vm
+   */
+  @SuppressWarnings("serial")
+  protected void verifyIndex(final VM vm, final int serverPort) throws Exception {
+    SerializableRunnable verifyIndex = new SerializableRunnable("Verify Index ") {
+      public void run() {
+        GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+        ManagementService service = ManagementService
+            .getManagementService(cache);
+        QueryService qs = cache.getQueryService();
+        try {
+          qs.createIndex(indexName, "p.ID", "/root/" + cqDUnitTest.regions[0]);
+        } catch (RegionNotFoundException e) {
+          fail("Failed With Exception " + e);
+        } catch (IndexInvalidException e) {
+          fail("Failed With Exception " + e);
+        } catch (IndexNameConflictException e) {
+          fail("Failed With Exception " + e);
+        } catch (IndexExistsException e) {
+          fail("Failed With Exception " + e);
+        } catch (UnsupportedOperationException e) {
+          fail("Failed With Exception " + e);
+        }
+
+        CacheServerMXBean bean = service
+            .getLocalCacheServerMXBean(serverPort);
+        assertEquals(bean.getIndexCount(), 1);
+        getLogWriter().info(
+            "<ExpectedString> Index is   " + bean.getIndexList()[0]
+                + "</ExpectedString> ");
+        try {
+          bean.removeIndex(indexName);
+        } catch (Exception e) {
+          fail("Failed With Exception " + e);
+        
+        }
+        assertEquals(bean.getIndexCount(), 0);
+
+      }
+    };
+    vm.invoke(verifyIndex);
+  }
+
+  /**
+   * Verify the closed CQ which is closed from Managing Node
+   * 
+   * @param vm
+   */
+  @SuppressWarnings("serial")
+  protected void verifyClosedCQ(final VM vm) throws Exception {
+    SerializableRunnable verifyClosedCQ = new SerializableRunnable(
+        "Verify Closed CQ") {
+      public void run() {
+        CqService cqService = GemFireCacheImpl.getInstance().getCqService();
+        if (cqService != null) {
+          assertNull(cqService.getCq(queryName));
+        }
+
+      }
+    };
+    vm.invoke(verifyClosedCQ);
+  }
+
+ 
+
+  /**
+   * Verify the Cache Server details
+   * 
+   * @param vm
+   */
+  @SuppressWarnings("serial")
+  protected void verifyCacheServer(final VM vm, final int serverPort) throws Exception {
+    SerializableRunnable verifyCacheServer = new SerializableRunnable(
+        "Verify Cache Server") {
+      public void run() {
+        GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+        ManagementService service = ManagementService
+            .getManagementService(cache);
+        final CacheServerMXBean bean = service
+            .getLocalCacheServerMXBean(serverPort);
+        assertNotNull(bean);
+        WaitCriterion ev = new WaitCriterion() {
+          public boolean done() {
+            if (bean.isRunning())
+              return true;
+            return false;
+          }
+
+          public String description() {
+            return null;
+          }
+        };
+        DistributedTestCase.waitForCriterion(ev, 10 * 1000, 200, true);
+        assertTrue(bean.isRunning());
+        assertCacheServerConfig(bean);
+
+      }
+    };
+    vm.invoke(verifyCacheServer);
+  }
+
+  protected void assertCacheServerConfig(CacheServerMXBean bean) {
+    // assertEquals(ServerInfo.getInstance().getServerPort(), bean.getPort());
+    assertEquals(CacheServer.DEFAULT_BIND_ADDRESS, bean.getBindAddress());
+    assertEquals(CacheServer.DEFAULT_HOSTNAME_FOR_CLIENTS, bean
+        .getHostNameForClients());
+    assertEquals(CacheServer.DEFAULT_SOCKET_BUFFER_SIZE, bean
+        .getSocketBufferSize());
+    assertEquals(CacheServer.DEFAULT_MAXIMUM_TIME_BETWEEN_PINGS, bean
+        .getMaximumTimeBetweenPings());
+    assertEquals(CacheServer.DEFAULT_MAX_CONNECTIONS, bean.getMaxConnections());
+    assertEquals(CacheServer.DEFAULT_MAX_THREADS, bean.getMaxThreads());
+    assertEquals(CacheServer.DEFAULT_MAXIMUM_MESSAGE_COUNT, bean
+        .getMaximumMessageCount());
+    assertEquals(CacheServer.DEFAULT_MESSAGE_TIME_TO_LIVE, bean
+        .getMessageTimeToLive());
+    assertEquals(CacheServer.DEFAULT_LOAD_POLL_INTERVAL, bean
+        .getLoadPollInterval());
+    getLogWriter().info(
+        "<ExpectedString> LoadProbe of the Server is  "
+            + bean.fetchLoadProbe().toString() + "</ExpectedString> ");
+  }
+
+  /**
+   * Verify the Cache Server details
+   * 
+   * @param vm
+   */
+  @SuppressWarnings("serial")
+  protected void verifyCacheServerRemote(final VM vm,
+      final DistributedMember serverMember, final int serverPort) {
+    SerializableRunnable verifyCacheServerRemote = new SerializableRunnable(
+        "Verify Cache Server Remote") {
+      public void run() {
+        GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+        try {
+
+          CacheServerMXBean bean = MBeanUtil.getCacheServerMbeanProxy(
+              serverMember, serverPort);
+
+          // Check for bean configuration
+          assertCacheServerConfig(bean);
+
+          String clientId = bean.getClientIds()[0];
+          assertNotNull(clientId);
+          getLogWriter().info(
+              "<ExpectedString> ClientId of the Server is  " + clientId
+                  + "</ExpectedString> ");
+          getLogWriter().info(
+              "<ExpectedString> Active Query Count  "
+                  + bean.getActiveCQCount() + "</ExpectedString> ");
+          
+          getLogWriter().info(
+              "<ExpectedString> Registered Query Count  "
+                  + bean.getRegisteredCQCount() + "</ExpectedString> ");
+
+          assertTrue(bean.showAllClientStats()[0].getClientCQCount() == 1); 
+          int numQueues = bean.getNumSubscriptions(); 
+          assertEquals(numQueues, 1); 
+          // test for client connection Count
+          
+          /* @TODO */
+          //assertTrue(bean.getClientConnectionCount() > 0);
+
+          bean.getContinuousQueryList();
+          // Only temporarily stops the query
+          bean.stopContinuousQuery("testClientWithFeederAndCQ_0");
+
+          // Start a stopped query
+          bean.executeContinuousQuery("testClientWithFeederAndCQ_0");
+
+          // Close the continuous query
+          bean.closeContinuousQuery("testClientWithFeederAndCQ_0");
+        } catch (Exception e) {
+          fail("Error while verifying cache server from remote member " + e);
+        }
+
+      }
+    };
+    vm.invoke(verifyCacheServerRemote);
+  }
+  
+  /**
+   * Notification handler
+   * 
+   * @author rishim
+   * 
+   */
+  private static class TestCacheServerNotif implements
+      NotificationListener {
+
+    @Override
+    public void handleNotification(Notification notification, Object handback) {
+      assertNotNull(notification);
+      getLogWriter().info("Expected String :" + notification.toString());
+    }
+
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
new file mode 100644
index 0000000..54d634e
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
@@ -0,0 +1,1435 @@
+/*
+ * =========================================================================
+ *  Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
+ *  This product is protected by U.S. and international copyright
+ *  and intellectual property laws. Pivotal products are covered by
+ *  more patents listed at http://www.pivotal.io/patents.
+ * ========================================================================
+ */
+package com.gemstone.gemfire.management.internal.cli.commands;
+
+import hydra.Log;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Map.Entry;
+
+import javax.management.ObjectName;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.PartitionAttributesFactory;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.client.ClientCache;
+import com.gemstone.gemfire.cache.client.ClientCacheFactory;
+import com.gemstone.gemfire.cache.client.ClientRegionFactory;
+import com.gemstone.gemfire.cache.client.ClientRegionShortcut;
+import com.gemstone.gemfire.cache.client.PoolManager;
+import com.gemstone.gemfire.cache.client.internal.PoolImpl;
+import com.gemstone.gemfire.cache.query.CqAttributesFactory;
+import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.distributed.DistributedMember;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.internal.AvailablePortHelper;
+import com.gemstone.gemfire.internal.OSProcess;
+import com.gemstone.gemfire.internal.cache.DistributedRegion;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.cache.PartitionedRegion;
+import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
+import com.gemstone.gemfire.management.CacheServerMXBean;
+import com.gemstone.gemfire.management.ClientHealthStatus;
+import com.gemstone.gemfire.management.ManagementService;
+import com.gemstone.gemfire.management.cli.Result.Status;
+import com.gemstone.gemfire.management.internal.SystemManagementService;
+import com.gemstone.gemfire.management.internal.cli.CliUtil;
+import com.gemstone.gemfire.management.internal.cli.LogWrapper;
+import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
+import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
+import com.gemstone.gemfire.management.internal.cli.result.CompositeResultData;
+import com.gemstone.gemfire.management.internal.cli.result.CompositeResultData.SectionResultData;
+import com.gemstone.gemfire.management.internal.cli.result.TabularResultData;
+import dunit.DistributedTestCase;
+import dunit.Host;
+import dunit.SerializableCallable;
+import dunit.SerializableRunnable;
+import dunit.VM;
+
+
+/**
+ * Dunit class for testing gemfire Client commands : list client , describe client 
+ * @author ajayp
+ * @since 8.0
+ */
+
+
+public class ClientCommandsDUnitTest extends CliCommandTestBase {
+
+  private static final long serialVersionUID = 1L;
+  final String regionName = "stocks";
+  final String cq1 = "cq1";
+  final String cq2 = "cq2";
+  final String cq3 = "cq3";
+  final String clientName = "dc1";
+  String clientId = "";
+  int port0 = 0;
+  int port1= 0;
+  
+  
+  
+  public ClientCommandsDUnitTest(String name) {
+    super(name);
+    
+  }
+
+  
+public void waitForListClientMbean(){
+    
+    final VM manager = Host.getHost(0).getVM(0);
+    final VM server1 = Host.getHost(0).getVM(1);
+    
+    final DistributedMember serverMember = getMember(server1);
+    
+    assertNotNull(serverMember);   
+    
+    manager.invoke(new SerializableRunnable() {
+      @Override
+      public void run() {
+        final WaitCriterion waitForMaangerMBean = new WaitCriterion() {
+          @Override
+          public boolean done() {
+            final SystemManagementService service = (SystemManagementService) ManagementService.getManagementService(getCache());
+            if (service == null) {
+              Log.getLogWriter().info("waitForListClientMbean Still probing for service");
+              return false;
+            } else {      
+              final ObjectName cacheServerMBeanName = service.getCacheServerMBeanName(port0,serverMember);                            
+              CacheServerMXBean bean = service.getMBeanProxy(cacheServerMBeanName, CacheServerMXBean.class);              
+              try {
+                if(bean != null){                  
+                  if( bean.getClientIds().length > 1){
+                    return true;
+                  }
+                }
+                return false; 
+                
+              } catch (Exception e) {
+                LogWrapper.getInstance().warning("waitForListClientMbean Exception in waitForListClientMbean ::: " + CliUtil.stackTraceAsString(e));
+              }
+              return false;
+            }
+          }
+
+          @Override
+          public String description() {
+            return "waitForListClientMbean Probing ...";
+          }
+        };
+        DistributedTestCase.waitForCriterion(waitForMaangerMBean, 2 * 60 * 1000, 2000, true);
+      }
+    }); 
+    
+  }
+
+
+public void waitForListClientMbean2(){
+  
+  final VM manager = Host.getHost(0).getVM(0);
+  final VM server1 = Host.getHost(0).getVM(1);
+  
+  final DistributedMember serverMember = getMember(server1);
+  
+  assertNotNull(serverMember);   
+  
+  manager.invoke(new SerializableRunnable() {
+    @Override
+    public void run() {
+      final WaitCriterion waitForMaangerMBean = new WaitCriterion() {
+        @Override
+        public boolean done() {
+          final SystemManagementService service = (SystemManagementService) ManagementService.getManagementService(getCache());
+          if (service == null) {
+            Log.getLogWriter().info("waitForListClientMbean2 Still probing for service");
+            return false;
+          } else {      
+            final ObjectName cacheServerMBeanName = service.getCacheServerMBeanName(port0,serverMember);                            
+            CacheServerMXBean bean = service.getMBeanProxy(cacheServerMBeanName, CacheServerMXBean.class);              
+            try {
+              if(bean != null){                
+                if( bean.getClientIds().length > 0){
+                  return true;
+                }
+              }
+              return false; 
+              
+            } catch (Exception e) {
+              LogWrapper.getInstance().warning("waitForListClientMbean2 Exception in waitForListClientMbean ::: " + CliUtil.stackTraceAsString(e));
+            }
+            return false;
+          }
+        }
+
+        @Override
+        public String description() {
+          return "waitForListClientMbean2 Probing ...";
+        }
+      };
+      DistributedTestCase.waitForCriterion(waitForMaangerMBean, 2 * 60 * 1000, 2000, true);
+    }
+  }); 
+  
+}
+  
+  public void waitForMbean(){
+    
+    final VM manager = Host.getHost(0).getVM(0);
+    final VM server1 = Host.getHost(0).getVM(1);
+    
+    
+    
+    final DistributedMember serverMember = getMember(server1);
+    
+    assertNotNull(serverMember);   
+    
+    manager.invoke(new SerializableRunnable() {
+      @Override
+      public void run() {
+        final WaitCriterion waitForMaangerMBean = new WaitCriterion() {
+          @Override
+          public boolean done() {
+            final SystemManagementService service = (SystemManagementService) ManagementService.getManagementService(getCache());
+            if (service == null) {
+              Log.getLogWriter().info("waitForMbean Still probing for service");
+              return false;
+            } else {      
+              final ObjectName cacheServerMBeanName = service.getCacheServerMBeanName(port0,serverMember);                            
+              CacheServerMXBean bean = service.getMBeanProxy(cacheServerMBeanName, CacheServerMXBean.class);              
+              try {              
+                ClientHealthStatus stats = bean.showClientStats(bean.getClientIds()[0]);
+                Map<String,String> poolStats = stats.getPoolStats();
+                if(poolStats.size() > 0){       
+                  Iterator<Entry<String, String>> it = poolStats.entrySet().iterator();
+                  while(it.hasNext()){
+                    Entry<String, String> entry = it.next();
+                    String poolStatsStr = entry.getValue();
+                    String str[] = poolStatsStr.split(";");                   
+                    int numCqs = Integer.parseInt(str[3].substring(str[3].indexOf("=")+1 ));
+                    if(numCqs == 3){
+                      return true;
+                    }
+                  }
+                }
+                return false;
+                
+              } catch (Exception e) {
+                LogWrapper.getInstance().warning("waitForMbean Exception in waitForMbean ::: " + CliUtil.stackTraceAsString(e));
+              }
+              return false;
+              
+            }
+          }
+
+          @Override
+          public String description() {
+            return "waitForMbean Probing for ";
+          }
+        };
+        DistributedTestCase.waitForCriterion(waitForMaangerMBean, 2 * 60 * 1000, 2000, true);
+      }
+    }); 
+    
+  }
+  
+  public void waitForListClientMbean3(){
+    
+    final VM manager = Host.getHost(0).getVM(0);
+    final VM server1 = Host.getHost(0).getVM(1);
+    final VM server2 = Host.getHost(0).getVM(3);
+    
+    final DistributedMember serverMember1 = getMember(server1);
+    final DistributedMember serverMember2 = getMember(server2);
+    
+    assertNotNull(serverMember1);   
+    
+    manager.invoke(new SerializableRunnable() {
+      @Override
+      public void run() {
+        final WaitCriterion waitForMaangerMBean = new WaitCriterion() {
+          @Override
+          public boolean done() {
+            final SystemManagementService service = (SystemManagementService) ManagementService.getManagementService(getCache());
+            if (service == null) {
+              Log.getLogWriter().info("waitForListClientMbean3 Still probing for service");
+              return false;
+            } else {      
+              final ObjectName cacheServerMBeanName1 = service.getCacheServerMBeanName(port0,serverMember1);                            
+              final ObjectName cacheServerMBeanName2 = service.getCacheServerMBeanName(port1,serverMember2);
+              CacheServerMXBean bean1 = service.getMBeanProxy(cacheServerMBeanName1, CacheServerMXBean.class);
+              CacheServerMXBean bean2 = service.getMBeanProxy(cacheServerMBeanName2, CacheServerMXBean.class);
+              try {
+                if(bean1 != null && bean2 != null){                
+                  if( bean1.getClientIds().length > 0 && bean2.getClientIds().length > 0){
+                    return true;
+                  }
+                }
+                return false; 
+                
+              } catch (Exception e) {
+                LogWrapper.getInstance().warning("waitForListClientMbean3 Exception in waitForListClientMbean ::: " + CliUtil.stackTraceAsString(e));
+              }
+              return false;
+            }
+          }
+
+          @Override
+          public String description() {
+            return "waitForListClientMbean3 Probing ...";
+          }
+        };
+        DistributedTestCase.waitForCriterion(waitForMaangerMBean, 2 * 60 * 1000, 2000, true);
+      }
+    }); 
+    
+  }
+  
+ /*public void testDescribeClientWithServers3() throws Exception {
+    setupSystem3();    
+    String commandString = CliStrings.DESCRIBE_CLIENT + " --" + CliStrings.DESCRIBE_CLIENT__ID + "=\""+ clientId + "\"" ;
+    final VM server1 = Host.getHost(0).getVM(1);
+    final VM server2 = Host.getHost(0).getVM(3);
+    final VM manager = Host.getHost(0).getVM(0);
+    String serverName1 = (String) server1.invoke(new SerializableCallable(){
+      @Override
+      public Object call() throws Exception {
+        return GemFireCacheImpl.getInstance().getDistributedSystem().getDistributedMember().getId();
+          
+      }
+    });
+    
+    String serverName2 = (String) server2.invoke(new SerializableCallable(){
+      @Override
+      public Object call() throws Exception {
+        return GemFireCacheImpl.getInstance().getDistributedSystem().getDistributedMember().getId();
+          
+      }
+    });
+    
+    final DistributedMember serverMember1 = getMember(server1);
+    
+    String[] clientIds = (String[]) manager.invoke(new SerializableCallable(){
+      @Override
+      public Object call() throws Exception {
+        final SystemManagementService service = (SystemManagementService) ManagementService.getManagementService(getCache());
+      
+          final ObjectName cacheServerMBeanName = service.getCacheServerMBeanName(port0,serverMember1);                            
+          CacheServerMXBean bean = service.getMBeanProxy(cacheServerMBeanName, CacheServerMXBean.class);              
+          
+          return bean.getClientIds();
+          
+      }
+    });
+     
+    String clientId1 = "";
+    
+    for(String str : clientIds){
+      clientId1 = str;
+      Log.getLogWriter().info("testDescribeClientWithServers clientIds for server1 ="+str);
+    }
+    
+    final DistributedMember serverMember2 = getMember(server2);
+    
+    
+    String[] clientIds2 = (String[]) manager.invoke(new SerializableCallable(){
+      @Override
+      public Object call() throws Exception {
+        final SystemManagementService service = (SystemManagementService) ManagementService.getManagementService(getCache());
+      
+          final ObjectName cacheServerMBeanName = service.getCacheServerMBeanName(port1,serverMember2);                            
+          CacheServerMXBean bean = service.getMBeanProxy(cacheServerMBeanName, CacheServerMXBean.class);              
+          
+          return bean.getClientIds();
+          
+      }
+    });
+    
+    String clientId2 = "";
+    
+    for(String str : clientIds2){
+      clientId2 = str;
+      Log.getLogWriter().info("testDescribeClientWithServers clientIds for server2 ="+str);
+    }
+    
+    
+    commandString = CliStrings.DESCRIBE_CLIENT + " --" + CliStrings.DESCRIBE_CLIENT__ID + "=\""+ clientId1 + "\"" ;
+    
+    Log.getLogWriter().info("testDescribeClientWithServers commandStr clientId1 ="+commandString);    
+    
+    
+    CommandResult commandResultForClient1 = executeCommand(commandString);
+    Log.getLogWriter().info("testDescribeClientWithServers commandStr clientId1="+commandResultForClient1);    
+    
+    
+    String resultAsString = commandResultToString(commandResultForClient1);
+    Log.getLogWriter().info("testDescribeClientWithServers commandStr clientId1 ="+resultAsString);   
+    assertTrue(Status.OK.equals(commandResultForClient1.getStatus()));
+    
+    verifyClientStats(commandResultForClient1, serverName1);
+    
+    
+    
+    commandString = CliStrings.DESCRIBE_CLIENT + " --" + CliStrings.DESCRIBE_CLIENT__ID + "=\""+ clientId2 + "\"" ;
+    
+    Log.getLogWriter().info("testDescribeClientWithServers commandStr1="+commandString);    
+    
+    
+    CommandResult commandResultForClient2 = executeCommand(commandString);
+    Log.getLogWriter().info("testDescribeClientWithServers commandResult1="+commandResultForClient2);    
+    
+    
+    resultAsString = commandResultToString(commandResultForClient2);
+    Log.getLogWriter().info("testDescribeClientWithServers resultAsString1="+resultAsString);   
+    assertTrue(Status.OK.equals(commandResultForClient2.getStatus()));
+    
+    verifyClientStats(commandResultForClient2, serverName2);
+    
+    
+    closeNonDurableClient(Host.getHost(0).getVM(2));
+    closeCacheServer(Host.getHost(0).getVM(3));
+    closeCacheServer(Host.getHost(0).getVM(1));
+  
+  } */
+ 
+public void verifyClientStats(CommandResult commandResultForClient, String serverName){
+   CompositeResultData resultData = (CompositeResultData) commandResultForClient.getResultData();
+   SectionResultData section =resultData.retrieveSection("InfoSection");
+   assertNotNull(section);    
+   for(int i = 0 ; i < 1 ; i++){
+     TabularResultData tableRsultData = section.retrieveTableByIndex(i);
+     Log.getLogWriter().info("testDescribeClientWithServers getHeader="+tableRsultData.getHeader());
+     assertNotNull(tableRsultData);
+     
+     List<String> minConn = tableRsultData.retrieveAllValues(CliStrings.DESCRIBE_CLIENT_MIN_CONN);
+     List<String> maxConn = tableRsultData.retrieveAllValues(CliStrings.DESCRIBE_CLIENT_MAX_CONN);
+     List<String> redudancy = tableRsultData.retrieveAllValues(CliStrings.DESCRIBE_CLIENT_REDUDANCY);
+     List<String> numCqs = tableRsultData.retrieveAllValues(CliStrings.DESCRIBE_CLIENT_CQs);
+     
+     
+     Log.getLogWriter().info("testDescribeClientWithServers getHeader numCqs ="+ numCqs);
+     
+     assertTrue(minConn.contains("1"));
+     assertTrue(maxConn.contains("-1"));
+     assertTrue(redudancy.contains("1"));
+     assertTrue(numCqs.contains("3"));   
+     String puts = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_PUTS);
+     assertTrue(puts.equals("2"));    
+     String queue = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_QUEUE_SIZE);
+     assertTrue(queue.equals("1"));    
+     String calls = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_LISTNER_CALLS);
+     assertTrue(calls.equals("1"));
+     String primServer = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_PRIMARY_SERVERS);
+     assertTrue(primServer.equals(serverName));
+     String durable = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_DURABLE);
+     assertTrue(durable.equals("No"));   
+     String threads = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_THREADS);
+     assertTrue(Integer.parseInt(threads) > 0);
+     String cpu = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_CPU);
+     assertTrue(Integer.parseInt(cpu) > 0);   
+     String upTime = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_UP_TIME);
+     assertTrue(Integer.parseInt(upTime) >= 0);   
+     String prcTime = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_PROCESS_CPU_TIME);
+     assertTrue(Long.parseLong(prcTime) > 0); 
+     
+   }
+ }
+  
+  public void disabled_testDescribeClient() throws Exception {
+    setupSystem();
+    
+    Log.getLogWriter().info("testDescribeClient clientId="+clientId);    
+    assertNotNull(clientId);
+    
+    String commandString = CliStrings.DESCRIBE_CLIENT + " --" + CliStrings.DESCRIBE_CLIENT__ID + "=\""+ clientId + "\"" ;
+    Log.getLogWriter().info("testDescribeClient commandStr="+commandString);
+    
+    final VM server1 = Host.getHost(0).getVM(1);
+    String serverName = (String) server1.invoke(new SerializableCallable(){
+      @Override
+      public Object call() throws Exception {
+        return GemFireCacheImpl.getInstance().getDistributedSystem().getDistributedMember().getId();
+          
+      }
+    });
+    
+    
+    
+    CommandResult commandResult = executeCommand(commandString);
+    Log.getLogWriter().info("testDescribeClient commandResult="+commandResult);    
+    
+    
+    String resultAsString = commandResultToString(commandResult);
+    Log.getLogWriter().info("testDescribeClient resultAsString="+resultAsString);   
+    assertTrue(Status.OK.equals(commandResult.getStatus()));
+    
+    CompositeResultData resultData = (CompositeResultData) commandResult.getResultData();
+    SectionResultData section =resultData.retrieveSection("InfoSection");
+    assertNotNull(section);    
+    TabularResultData tableRsultData = section.retrieveTable("Pool Stats For Pool Name = DEFAULT");
+    assertNotNull(tableRsultData);
+    
+    List<String> minConn = tableRsultData.retrieveAllValues(CliStrings.DESCRIBE_CLIENT_MIN_CONN);
+    List<String> maxConn = tableRsultData.retrieveAllValues(CliStrings.DESCRIBE_CLIENT_MAX_CONN);
+    List<String> redudancy = tableRsultData.retrieveAllValues(CliStrings.DESCRIBE_CLIENT_REDUDANCY);
+    List<String> numCqs = tableRsultData.retrieveAllValues(CliStrings.DESCRIBE_CLIENT_CQs);
+    
+    assertTrue(minConn.contains("1"));
+    assertTrue(maxConn.contains("-1"));
+    assertTrue(redudancy.contains("1"));
+    assertTrue(numCqs.contains("3"));   
+    String puts = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_PUTS);
+    assertTrue(puts.equals("2"));    
+    String queue = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_QUEUE_SIZE);
+    assertTrue(queue.equals("1"));    
+    String calls = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_LISTNER_CALLS);
+    assertTrue(calls.equals("1"));
+    String primServer = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_PRIMARY_SERVERS);
+    assertTrue(primServer.equals(serverName));
+    String durable = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_DURABLE);
+    assertTrue(durable.equals("No"));   
+    String threads = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_THREADS);
+    assertTrue(Integer.parseInt(threads) > 0);
+    String cpu = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_CPU);
+    assertTrue(Integer.parseInt(cpu) > 0);   
+    String upTime = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_UP_TIME);
+    assertTrue(Integer.parseInt(upTime) >= 0);   
+    String prcTime = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_PROCESS_CPU_TIME);
+    assertTrue(Long.parseLong(prcTime) > 0);
+    
+    
+    closeNonDurableClient(Host.getHost(0).getVM(2));
+    closeCacheServer(Host.getHost(0).getVM(1));
+    closeCacheServer(Host.getHost(0).getVM(3));
+    
+    
+  } 
+  
+  public void testDescribeClientWithServers() throws Exception {
+    setupSystem2();
+    
+    String commandString = CliStrings.DESCRIBE_CLIENT + " --" + CliStrings.DESCRIBE_CLIENT__ID + "=\""+ clientId + "\"" ;
+    Log.getLogWriter().info("testDescribeClientWithServers commandStr="+commandString);    
+    
+    
+    final VM server1 = Host.getHost(0).getVM(1);
+    String serverName = (String) server1.invoke(new SerializableCallable(){
+      @Override
+      public Object call() throws Exception {
+        return GemFireCacheImpl.getInstance().getDistributedSystem().getDistributedMember().getId();
+          
+      }
+    });
+    
+    
+    CommandResult commandResult = executeCommand(commandString);
+    Log.getLogWriter().info("testDescribeClientWithServers commandResult="+commandResult);    
+    
+    
+    String resultAsString = commandResultToString(commandResult);
+    Log.getLogWriter().info("testDescribeClientWithServers resultAsString="+resultAsString);   
+    assertTrue(Status.OK.equals(commandResult.getStatus()));
+    
+    CompositeResultData resultData = (CompositeResultData) commandResult.getResultData();
+    SectionResultData section =resultData.retrieveSection("InfoSection");
+    assertNotNull(section);    
+    TabularResultData tableRsultData = section.retrieveTable("Pool Stats For Pool Name = DEFAULT");
+    assertNotNull(tableRsultData);
+    
+    List<String> minConn = tableRsultData.retrieveAllValues(CliStrings.DESCRIBE_CLIENT_MIN_CONN);
+    List<String> maxConn = tableRsultData.retrieveAllValues(CliStrings.DESCRIBE_CLIENT_MAX_CONN);
+    List<String> redudancy = tableRsultData.retrieveAllValues(CliStrings.DESCRIBE_CLIENT_REDUDANCY);
+    List<String> numCqs = tableRsultData.retrieveAllValues(CliStrings.DESCRIBE_CLIENT_CQs);
+    
+    assertTrue(minConn.contains("1"));
+    assertTrue(maxConn.contains("-1"));
+    assertTrue(redudancy.contains("1"));
+    assertTrue(numCqs.contains("3"));   
+    String puts = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_PUTS);
+    assertTrue(puts.equals("2"));    
+    String queue = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_QUEUE_SIZE);
+    assertTrue(queue.equals("1"));    
+    String calls = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_LISTNER_CALLS);
+    assertTrue(calls.equals("1"));
+    String primServer = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_PRIMARY_SERVERS);
+    assertTrue(primServer.equals(serverName));
+    String durable = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_DURABLE);
+    assertTrue(durable.equals("No"));   
+    String threads = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_THREADS);
+    assertTrue(Integer.parseInt(threads) > 0);
+    String cpu = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_CPU);
+    assertTrue(Integer.parseInt(cpu) > 0);   
+    String upTime = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_UP_TIME);
+    assertTrue(Integer.parseInt(upTime) >= 0);   
+    String prcTime = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_PROCESS_CPU_TIME);
+    assertTrue(Long.parseLong(prcTime) > 0);
+    
+    closeNonDurableClient(Host.getHost(0).getVM(2));
+    closeNonDurableClient(Host.getHost(0).getVM(3));
+    closeCacheServer(Host.getHost(0).getVM(1));
+  
+  } 
+  
+  
+  public void testListClient() throws Exception {
+    setupSystemForListClient();
+
+    
+    final VM manager = Host.getHost(0).getVM(0);   
+    
+    String commandString = CliStrings.LIST_CLIENTS ;
+    Log.getLogWriter().info("testListClient commandStr="+commandString);
+    
+    waitForListClientMbean();  
+    
+    final VM server1 = Host.getHost(0).getVM(1);
+    
+    final DistributedMember serverMember = getMember(server1);
+    
+    String[] clientIds = (String[]) manager.invoke(new SerializableCallable(){
+      @Override
+      public Object call() throws Exception {
+        final SystemManagementService service = (SystemManagementService) ManagementService.getManagementService(getCache());
+      
+          final ObjectName cacheServerMBeanName = service.getCacheServerMBeanName(port0,serverMember);                            
+          CacheServerMXBean bean = service.getMBeanProxy(cacheServerMBeanName, CacheServerMXBean.class);              
+          
+          return bean.getClientIds();
+          
+      }
+    });
+    
+    String serverName = (String) server1.invoke(new SerializableCallable(){
+      @Override
+      public Object call() throws Exception {
+        return GemFireCacheImpl.getInstance().getDistributedSystem().getDistributedMember().getId();
+          
+      }
+    });
+    
+    CommandResult commandResult = executeCommand(commandString);
+    Log.getLogWriter().info("testListClient commandResult="+commandResult);    
+    
+    
+    String resultAsString = commandResultToString(commandResult);
+    Log.getLogWriter().info("testListClient resultAsString="+resultAsString);   
+    assertTrue(Status.OK.equals(commandResult.getStatus()));
+    
+    
+    CompositeResultData resultData = (CompositeResultData) commandResult.getResultData();
+    SectionResultData section =resultData.retrieveSection("section1");
+    assertNotNull(section);    
+    TabularResultData tableRsultData = section.retrieveTable("TableForClientList");
+    assertNotNull(tableRsultData);
+    
+    List<String> serverNames = tableRsultData.retrieveAllValues(CliStrings.LIST_CLIENT_COLUMN_SERVERS);
+    List<String> clientNames = tableRsultData.retrieveAllValues(CliStrings.LIST_CLIENT_COLUMN_Clients);
+    
+    
+    Log.getLogWriter().info("testListClients serverNames : " + serverNames);    
+    Log.getLogWriter().info("testListClients clientNames : " + clientNames);  
+    assertEquals(2, serverNames.size());
+    assertEquals(2, clientNames.size());    
+    assertTrue(clientNames.contains(clientIds[0]));
+    assertTrue(clientNames.contains(clientIds[1]));
+    serverName = serverName.replace(":", "-");
+    Log.getLogWriter().info("testListClients serverName : " + serverName);
+    for(String str : serverNames){
+      assertTrue(str.contains(serverName));
+    }    
+    closeNonDurableClient(Host.getHost(0).getVM(2));
+    closeCacheServer(Host.getHost(0).getVM(1));
+    closeCacheServer(Host.getHost(0).getVM(3));
+    
+    
+  } 
+  
+  
+ public void testListClientForServers() throws Exception {
+    setupSystem3();
+
+    
+    final VM manager = Host.getHost(0).getVM(0);   
+    
+    String commandString = CliStrings.LIST_CLIENTS ;
+    Log.getLogWriter().info("testListClientForServers commandStr="+commandString);
+    
+    
+    
+    final VM server1 = Host.getHost(0).getVM(1);
+    final VM server2 = Host.getHost(0).getVM(3);
+    
+    final DistributedMember serverMember = getMember(server1);
+    
+    String[] clientIds = (String[]) manager.invoke(new SerializableCallable(){
+      @Override
+      public Object call() throws Exception {
+        final SystemManagementService service = (SystemManagementService) ManagementService.getManagementService(getCache());
+      
+          final ObjectName cacheServerMBeanName = service.getCacheServerMBeanName(port0,serverMember);                            
+          CacheServerMXBean bean = service.getMBeanProxy(cacheServerMBeanName, CacheServerMXBean.class);      
+          return bean.getClientIds();
+          
+      }
+    });
+    
+
+    
+    String serverName1 = (String) server1.invoke(new SerializableCallable(){
+      @Override
+      public Object call() throws Exception {
+        return GemFireCacheImpl.getInstance().getDistributedSystem().getDistributedMember().getId();
+          
+      }
+    });
+    
+    String serverName2 = (String) server2.invoke(new SerializableCallable(){
+      @Override
+      public Object call() throws Exception {
+        return GemFireCacheImpl.getInstance().getDistributedSystem().getDistributedMember().getId();
+          
+      }
+    });
+    
+    CommandResult commandResult = executeCommand(commandString);
+    Log.getLogWriter().info("testListClientForServers commandResult="+commandResult);    
+    
+    
+    String resultAsString = commandResultToString(commandResult);
+    Log.getLogWriter().info("testListClientForServers resultAsString="+resultAsString);   
+    assertTrue(Status.OK.equals(commandResult.getStatus()));
+    
+    
+    CompositeResultData resultData = (CompositeResultData) commandResult.getResultData();
+    SectionResultData section =resultData.retrieveSection("section1");
+    assertNotNull(section);       
+    TabularResultData tableRsultData = section.retrieveTable("TableForClientList");
+    assertNotNull(tableRsultData);   
+    
+    List<String> serverNames = tableRsultData.retrieveAllValues(CliStrings.LIST_CLIENT_COLUMN_SERVERS);
+    List<String> clientNames = tableRsultData.retrieveAllValues(CliStrings.LIST_CLIENT_COLUMN_Clients);
+    
+    serverName1 = serverName1.replace(":", "-");
+    serverName2 = serverName2.replace(":", "-");
+    
+    
+    Log.getLogWriter().info("testListClientForServers serverNames : " + serverNames);
+    Log.getLogWriter().info("testListClientForServers serverName1 : " + serverName1);
+    Log.getLogWriter().info("testListClientForServers serverName2 : " + serverName2);
+    Log.getLogWriter().info("testListClientForServers clientNames : " + clientNames);
+    
+    for(String client : clientIds){
+      assertTrue(clientNames.contains(client));
+    }
+    
+    for(String server : serverNames){
+      assertTrue(server.contains(serverName1) || server.contains(serverName2));
+    }
+    
+    closeNonDurableClient(Host.getHost(0).getVM(2));
+    closeCacheServer(Host.getHost(0).getVM(1));
+    closeCacheServer(Host.getHost(0).getVM(3));
+    
+    
+  } 
+
+  
+  public DistributedMember getMember(final VM vm) {
+    SerializableCallable getMember = new SerializableCallable("Get Member") {
+      public Object call() {
+        GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+        return cache.getDistributedSystem().getDistributedMember();
+
+      }
+    };
+    return (DistributedMember) vm.invoke(getMember);
+  }
+  
+  private void setupSystemForListClient() throws Exception {
+    disconnectAllFromDS();
+    final int[] port = AvailablePortHelper.getRandomAvailableTCPPorts(3);
+    createDefaultSetup(getServerProperties());
+    
+    final VM server1 = Host.getHost(0).getVM(1);
+    final VM client1 = Host.getHost(0).getVM(2);
+    final VM client2 = Host.getHost(0).getVM(3);
+    
+    startCacheServer(server1, port[0], false, regionName);
+    port0 = port[0];   
+    startNonDurableClient(client1, server1, port[0]);   
+    startNonDurableClient(client2, server1, port[0]);    
+     
+    
+  }
+  
+  
+  
+  private void setupSystem() throws Exception {
+    disconnectAllFromDS();
+    final int[] port = AvailablePortHelper.getRandomAvailableTCPPorts(2);
+    createDefaultSetup(getServerProperties());
+    
+    final VM manager = Host.getHost(0).getVM(0);
+    final VM server1 = Host.getHost(0).getVM(1);
+    final VM client1 = Host.getHost(0).getVM(2);
+    final VM server2 = Host.getHost(0).getVM(3);
+    
+    port0 = port[0];
+    
+    startCacheServer(server1, port[0], false, regionName);
+    startCacheServer(server2, port[1], false, regionName);    
+    
+    startNonDurableClient(client1, server1, port[0]);
+    setupCqsOnVM(client1);
+    waitForMbean();
+    
+    
+    
+    clientId =  (String) manager.invoke(new SerializableCallable(){
+      @Override
+      public Object call() throws Exception {
+        Cache cache = GemFireCacheImpl.getInstance();       
+        SystemManagementService service = (SystemManagementService) ManagementService.getExistingManagementService(cache);
+        DistributedMember serverMember = getMember(server1);
+        final ObjectName cacheServerMBeanName = service.getCacheServerMBeanName(port[0],serverMember);
+        CacheServerMXBean bean = service.getMBeanProxy(cacheServerMBeanName, CacheServerMXBean.class);
+        return bean.getClientIds()[0]; 
+      }
+    });
+  }
+  
+  
+  private void setupSystem2() throws Exception {
+    disconnectAllFromDS();
+    final int[] port = AvailablePortHelper.getRandomAvailableTCPPorts(3);
+    createDefaultSetup(getServerProperties());
+    
+    final VM manager = Host.getHost(0).getVM(0);
+    final VM server1 = Host.getHost(0).getVM(1);
+    final VM client1 = Host.getHost(0).getVM(2);
+    final VM client2 = Host.getHost(0).getVM(3);
+    
+    startCacheServer(server1, port[0], false, regionName);    
+    port0 = port[0];
+    startNonDurableClient(client1, server1, port[0]);
+    startNonDurableClient(client2, server1, port[0]);    
+    
+    setupCqsOnVM(client1);
+    setupCqsOnVM(client2);
+    
+    waitForMbean();
+    
+    clientId =  (String) manager.invoke(new SerializableCallable(){
+      @Override
+      public Object call() throws Exception {
+        Cache cache = GemFireCacheImpl.getInstance();       
+        SystemManagementService service = (SystemManagementService) ManagementService.getExistingManagementService(cache);
+        DistributedMember serverMember = getMember(server1);
+        final ObjectName cacheServerMBeanName = service.getCacheServerMBeanName(port[0],serverMember);     
+        CacheServerMXBean bean = service.getMBeanProxy(cacheServerMBeanName, CacheServerMXBean.class);
+        return bean.getClientIds()[0]; 
+      }
+    });
+    
+    
+  }
+   private void setupSystem3() throws Exception {
+    disconnectAllFromDS();
+    final int[] port = AvailablePortHelper.getRandomAvailableTCPPorts(3);
+    createDefaultSetup(getServerProperties());
+    
+    final VM manager = Host.getHost(0).getVM(0);
+    final VM server1 = Host.getHost(0).getVM(1);
+    final VM client1 = Host.getHost(0).getVM(2);
+    final VM server2 = Host.getHost(0).getVM(3);
+    
+    port0 = port[0];
+    port1 = port[1];
+    
+    String cacheserverport1 = (String) startCacheServer(server1, port[0], false, regionName);   
+    String cacheserverport2 = (String) startCacheServer(server2, port[1], false, regionName);
+    startNonDurableClient(client1, server1, Integer.parseInt(cacheserverport1));
+    startNonDurableClient(client1, server2, Integer.parseInt(cacheserverport2));
+    
+    setupCqsOnVM(client1);
+    
+    waitForListClientMbean3();
+    
+    
+    clientId =  (String) manager.invoke(new SerializableCallable(){
+      @Override
+      public Object call() throws Exception {
+        Cache cache = GemFireCacheImpl.getInstance();       
+        SystemManagementService service = (SystemManagementService) ManagementService.getExistingManagementService(cache);
+        DistributedMember serverMember = getMember(server1);
+        final ObjectName cacheServerMBeanName = service.getCacheServerMBeanName(port[0],serverMember);
+        CacheServerMXBean bean = service.getMBeanProxy(cacheServerMBeanName, CacheServerMXBean.class);
+        return bean.getClientIds()[0]; 
+      }
+    });
+    
+    
+  }
+
+  
+  private void setupCqs() {
+    final VM vm2 = Host.getHost(0).getVM(2);
+    vm2.invoke(new SerializableCallable() {
+      public Object call() {        
+        Cache cache = GemFireCacheImpl.getInstance();
+        QueryService qs = cache.getQueryService();
+        CqAttributesFactory cqAf = new CqAttributesFactory();
+        try {
+          qs.newCq(cq1, "select * from /" + regionName, cqAf.create(), true).execute();
+          qs.newCq(cq2, "select * from /" + regionName + " where id = 1", cqAf.create(), true).execute();
+          qs.newCq(cq3, "select * from /" + regionName + " where id > 2", cqAf.create(), true).execute();        
+          cache.getLogger().info("setupCqs created cqs = " +cache.getQueryService().getCqs().length);
+        } catch(Exception e){
+          cache.getLogger().info("setupCqs Exception " + CliUtil.stackTraceAsString(e));
+        }
+        return true;
+      }
+    });
+  }
+  
+  private void setupCqsOnVM(VM vm) {    
+    vm.invoke(new SerializableCallable() {
+      public Object call() {        
+        Cache cache = GemFireCacheImpl.getInstance();
+        QueryService qs = cache.getQueryService();
+        CqAttributesFactory cqAf = new CqAttributesFactory();
+        try {
+          qs.newCq(cq1, "select * from /" + regionName, cqAf.create(), true).execute();
+          qs.newCq(cq2, "select * from /" + regionName + " where id = 1", cqAf.create(), true).execute();
+          qs.newCq(cq3, "select * from /" + regionName + " where id > 2", cqAf.create(), true).execute();          
+          cache.getLogger().info("setupCqs on vm created cqs = " +cache.getQueryService().getCqs().length);
+        } catch(Exception e){
+          cache.getLogger().info("setupCqs on vm Exception " + CliUtil.stackTraceAsString(e));
+        }
+        return true;
+      }
+    });
+  }
+  
+  private String startCacheServer(VM server, final int port, 
+      final boolean createPR, final String regionName) throws Exception {
+
+    String cacheserverport = (String) server.invoke(new SerializableCallable() {
+      public Object call() throws Exception {
+        getSystem(getServerProperties());
+        
+        GemFireCacheImpl cache = (GemFireCacheImpl)getCache();
+        AttributesFactory factory = new AttributesFactory();
+        if (createPR) {
+          PartitionAttributesFactory paf = new PartitionAttributesFactory();
+          paf.setRedundantCopies(1);
+          paf.setTotalNumBuckets(11);
+          factory.setPartitionAttributes(paf.create());
+        } else {
+          factory.setScope(Scope.DISTRIBUTED_ACK);
+          factory.setDataPolicy(DataPolicy.REPLICATE);
+        }
+        Region region = createRootRegion(regionName, factory.create());
+        if (createPR) {
+          assertTrue(region instanceof PartitionedRegion);
+        } else {
+          assertTrue(region instanceof DistributedRegion);
+        }
+        CacheServer cacheServer = cache.addCacheServer();
+        cacheServer.setPort(port);
+        cacheServer.start();       
+        return ""+cacheServer.getPort();
+      }
+    });
+    return cacheserverport;
+  } 
+  
+  private void startNonDurableClient(VM client, final VM server, final int port) {
+    client.invoke(new CacheSerializableRunnable("Start client") {
+      public void run2() throws CacheException {        
+        Cache cache = GemFireCacheImpl.getInstance();
+        if(cache == null ){
+          
+          Properties props = getNonDurableClientProps();
+          props.setProperty("log-file", "client_" + OSProcess.getId() + ".log");
+          props.setProperty("log-level", "fine");
+          props.setProperty("statistic-archive-file", "client_" + OSProcess.getId() + ".gfs");
+          props.setProperty("statistic-sampling-enabled", "true");
+          
+          getSystem(props);
+          
+          final ClientCacheFactory ccf = new ClientCacheFactory(props);
+          ccf.addPoolServer(getServerHostName(server.getHost()), port);
+          ccf.setPoolSubscriptionEnabled(true);
+          ccf.setPoolPingInterval(1);
+          ccf.setPoolStatisticInterval(1);
+          ccf.setPoolSubscriptionRedundancy(1);
+          ccf.setPoolMinConnections(1);
+          
+          ClientCache clientCache = (ClientCache)getClientCache(ccf);
+          //Create region
+          if( clientCache.getRegion(Region.SEPARATOR + regionName) == null && clientCache.getRegion( regionName) == null){     
+            ClientRegionFactory regionFactory = clientCache.createClientRegionFactory(ClientRegionShortcut.LOCAL).setPoolName(clientCache.getDefaultPool().getName()) ;
+            Region dataRegion = regionFactory.create(regionName);       
+            assertNotNull(dataRegion);           
+            dataRegion.put("k1", "v1");
+            dataRegion.put("k2", "v2");
+            
+          }
+        }else{
+          String poolName = "new_pool_" + System.currentTimeMillis();
+          try{                      
+            PoolImpl p = (PoolImpl) PoolManager.createFactory().addServer(getServerHostName(server.getHost()), port)
+              .setThreadLocalConnections(true)
+              .setMinConnections(1)
+              .setSubscriptionEnabled(true)
+              .setPingInterval(1)
+              .setStatisticInterval(1)   
+              .setMinConnections(1)
+              .setSubscriptionRedundancy(1)
+              .create(poolName);
+            cache.getLogger().info("Created new pool pool " + poolName  );            
+            assertNotNull(p);
+          }catch(Exception eee){
+            cache.getLogger().info("Exception in creating pool " + poolName + "    Exception ==" + CliUtil.stackTraceAsString(eee));
+          }
+        }        
+      }
+    });
+  }
+  
+  
+  //Closes the non-durable-client from the client side.
+  private void closeNonDurableClient(VM vm) {
+    final VM client = vm ;
+      client.invoke(new CacheSerializableRunnable("Stop client") {
+        public void run2() throws CacheException {
+          ClientCacheFactory.getAnyInstance().close(true);
+        }
+      });
+  }
+  
+  private void closeCacheServer(VM vm) {
+    final VM client = vm ;
+      client.invoke(new CacheSerializableRunnable("Stop client") {
+        public void run2() throws CacheException {
+          
+          Iterator<CacheServer> it = CacheFactory.getAnyInstance().getCacheServers().iterator();
+          while(it.hasNext()){
+            CacheServer cacheServer = it.next();
+            cacheServer.stop();
+          }
+        }
+      });
+  }  
+  
+  protected Properties getNonDurableClientProps() {
+    Properties p = new Properties();
+    p.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    p.setProperty(DistributionConfig.LOCATORS_NAME, "");    
+    return p;
+  }
+
+  protected Properties getServerProperties() {
+    Properties p = new Properties();
+    p.setProperty(DistributionConfig.LOCATORS_NAME, "localhost["+getDUnitLocatorPort()+"]");
+    return p;
+  }
+  
+  
+  
+public void waitForNonSubCliMBean(){    
+    final VM manager = Host.getHost(0).getVM(0);
+    final VM server1 = Host.getHost(0).getVM(1);    
+    final DistributedMember serverMember = getMember(server1);    
+    assertNotNull(serverMember);   
+    
+    manager.invoke(new SerializableRunnable() {
+      @Override
+      public void run() {
+        final WaitCriterion waitForMaangerMBean = new WaitCriterion() {
+          @Override
+          public boolean done() {
+            try {         
+              final SystemManagementService service = (SystemManagementService) ManagementService.getManagementService(getCache());
+              if (service == null) {
+                Log.getLogWriter().info("waitForNonSubScribedClientMBean Still probing for service");
+                return false;
+              } else {      
+                Log.getLogWriter().info("waitForNonSubScribedClientMBean 1");
+                final ObjectName cacheServerMBeanName = service.getCacheServerMBeanName(port0,serverMember);
+                Log.getLogWriter().info("waitForNonSubScribedClientMBean 2 cacheServerMBeanName " + cacheServerMBeanName);
+                CacheServerMXBean bean = service.getMBeanProxy(cacheServerMBeanName, CacheServerMXBean.class);
+                Log.getLogWriter().info("waitForNonSubScribedClientMBean 2 bean " + bean);
+                if(bean.getClientIds().length > 0){
+                  return true;
+                }               
+              }
+            } catch (Exception e) {
+              LogWrapper.getInstance().warning("waitForNonSubScribedClientMBean Exception in waitForMbean ::: " + CliUtil.stackTraceAsString(e));
+            }
+            return false;
+          }
+
+          @Override
+          public String description() {
+            return "waitForNonSubScribedClientMBean Probing for ";
+          }
+        };
+        DistributedTestCase.waitForCriterion(waitForMaangerMBean, 5* 60 * 1000, 2000, true);
+      }
+    }); 
+    
+  }
+  
+  
+public void waitForMixedClients(){
+    
+    final VM manager = Host.getHost(0).getVM(0);
+    final VM server1 = Host.getHost(0).getVM(1);   
+    
+    final DistributedMember serverMember = getMember(server1);
+    
+    assertNotNull(serverMember);   
+    
+    manager.invoke(new SerializableRunnable() {
+      @Override
+      public void run() {
+        final WaitCriterion waitForMaangerMBean = new WaitCriterion() {
+          @Override
+          public boolean done() {
+            try {         
+              final SystemManagementService service = (SystemManagementService) ManagementService.getManagementService(getCache());
+              if (service == null) {
+                Log.getLogWriter().info("waitForMixedClients Still probing for service");
+                return false;
+              } else {      
+                Log.getLogWriter().info("waitForMixedClients 1");
+                final ObjectName cacheServerMBeanName = service.getCacheServerMBeanName(port0,serverMember);
+                Log.getLogWriter().info("waitForMixedClients 2 cacheServerMBeanName " + cacheServerMBeanName);
+                CacheServerMXBean bean = service.getMBeanProxy(cacheServerMBeanName, CacheServerMXBean.class);
+                Log.getLogWriter().info("waitForMixedClients 2 bean " + bean);
+                if(bean.getClientIds().length > 1){
+                  return true;
+                }                
+              }
+            } catch (Exception e) {
+              LogWrapper.getInstance().warning("waitForMixedClients Exception in waitForMbean ::: " + CliUtil.stackTraceAsString(e));
+            }
+            return false;
+          }
+
+          @Override
+          public String description() {
+            return "waitForMixedClients Probing for ";
+          }
+        };
+        DistributedTestCase.waitForCriterion(waitForMaangerMBean, 5* 60 * 1000, 2000, true);
+      }
+    }); 
+    
+  }
+  
+  
+  
+  public void testDescribeClientForNonSubscribedClient() throws Exception {
+    setUpNonSubscribedClient();
+    
+    Log.getLogWriter().info("testDescribeClientForNonSubscribedClient clientId="+clientId);    
+    assertNotNull(clientId);
+    
+    String commandString = CliStrings.DESCRIBE_CLIENT + " --" + CliStrings.DESCRIBE_CLIENT__ID + "=\""+ clientId + "\"" ;
+    Log.getLogWriter().info("testDescribeClientForNonSubscribedClient commandStr="+commandString);
+    
+    final VM server1 = Host.getHost(0).getVM(1);
+    String serverName = (String) server1.invoke(new SerializableCallable(){
+      @Override
+      public Object call() throws Exception {
+        return GemFireCacheImpl.getInstance().getDistributedSystem().getDistributedMember().getId();
+          
+      }
+    });
+    
+    
+    CommandResult commandResult = executeCommand(commandString);
+    Log.getLogWriter().info("testDescribeClientForNonSubscribedClient commandResult="+commandResult);    
+    
+    
+    String resultAsString = commandResultToString(commandResult);
+    Log.getLogWriter().info("testDescribeClientForNonSubscribedClient resultAsString="+resultAsString);   
+    assertTrue(Status.OK.equals(commandResult.getStatus()));
+    
+    CompositeResultData resultData = (CompositeResultData) commandResult.getResultData();
+    SectionResultData section =resultData.retrieveSection("InfoSection");
+    assertNotNull(section);    
+    TabularResultData tableRsultData = section.retrieveTable("Pool Stats For Pool Name = DEFAULT");
+    assertNotNull(tableRsultData);
+    
+    List<String> minConn = tableRsultData.retrieveAllValues(CliStrings.DESCRIBE_CLIENT_MIN_CONN);
+    List<String> maxConn = tableRsultData.retrieveAllValues(CliStrings.DESCRIBE_CLIENT_MAX_CONN);
+    List<String> redudancy = tableRsultData.retrieveAllValues(CliStrings.DESCRIBE_CLIENT_REDUDANCY);
+    
+    
+    assertTrue(minConn.contains("1"));
+    assertTrue(maxConn.contains("-1"));
+    assertTrue(redudancy.contains("1"));
+    
+    String puts = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_PUTS);
+    assertTrue(puts.equals("2"));   
+    
+    String calls = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_LISTNER_CALLS);
+    assertTrue(calls.equals("1"));
+    
+    String primServer = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_PRIMARY_SERVERS);
+    assertTrue(primServer.equals("N.A."));
+    
+    String durable = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_DURABLE);
+    assertTrue(durable.equals("No"));   
+    
+    String threads = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_THREADS);
+    assertTrue(Integer.parseInt(threads) > 0);
+    
+    String cpu = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_CPU);
+    assertTrue(Integer.parseInt(cpu) > 0);   
+    
+    String upTime = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_UP_TIME);
+    assertTrue(Integer.parseInt(upTime) == 0);  
+    
+    String prcTime = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_PROCESS_CPU_TIME);
+    assertTrue(Long.parseLong(prcTime) > 0);
+    
+    
+    closeNonDurableClient(Host.getHost(0).getVM(2));
+    closeCacheServer(Host.getHost(0).getVM(1));
+    closeCacheServer(Host.getHost(0).getVM(3));
+    
+    
+  }  
+  
+  public void testDescribeMixClientWithServers() throws Exception {
+    String[] clientIds = setupSystemWithSubAndNonSubClient();    
+    
+    final VM server1 = Host.getHost(0).getVM(1);
+    String serverName = (String) server1.invoke(new SerializableCallable(){
+      @Override
+      public Object call() throws Exception {
+        return GemFireCacheImpl.getInstance().getDistributedSystem().getDistributedMember().getId();
+          
+      }
+    });
+    
+    String commandString = CliStrings.DESCRIBE_CLIENT + " --" + CliStrings.DESCRIBE_CLIENT__ID + "=\""+ clientIds[0] + "\"" ;
+    Log.getLogWriter().info("testDescribeMixClientWithServers commandStr="+commandString);
+    
+    
+    executeAndVerifyResultsForMixedClients(commandString, serverName );    
+    
+    String commandString2 = CliStrings.DESCRIBE_CLIENT + " --" + CliStrings.DESCRIBE_CLIENT__ID + "=\""+ clientIds[1] + "\"" ;
+    Log.getLogWriter().info("testDescribeMixClientWithServers commandString2="+commandString2);   
+    
+    
+    executeAndVerifyResultsForMixedClients(commandString2,serverName );
+    
+    closeNonDurableClient(Host.getHost(0).getVM(2));
+    closeNonDurableClient(Host.getHost(0).getVM(3));
+    closeCacheServer(Host.getHost(0).getVM(1));
+  
+  }
+  
+void executeAndVerifyResultsForMixedClients(String commandString, String serverName){
+  CommandResult commandResult = executeCommand(commandString);
+  Log.getLogWriter().info("testDescribeMixClientWithServers commandResult="+commandResult);    
+  
+  
+  String resultAsString = commandResultToString(commandResult);
+  Log.getLogWriter().info("testDescribeMixClientWithServers resultAsString="+resultAsString);
+  
+  
+  assertTrue(Status.OK.equals(commandResult.getStatus()));
+  
+  CompositeResultData resultData = (CompositeResultData) commandResult.getResultData();
+  SectionResultData section =resultData.retrieveSection("InfoSection");
+  assertNotNull(section);    
+  TabularResultData tableRsultData = section.retrieveTable("Pool Stats For Pool Name = DEFAULT");
+  assertNotNull(tableRsultData);
+  
+  List<String> minConn = tableRsultData.retrieveAllValues(CliStrings.DESCRIBE_CLIENT_MIN_CONN);
+  List<String> maxConn = tableRsultData.retrieveAllValues(CliStrings.DESCRIBE_CLIENT_MAX_CONN);
+  List<String> redudancy = tableRsultData.retrieveAllValues(CliStrings.DESCRIBE_CLIENT_REDUDANCY);
+  
+  
+  assertTrue(minConn.contains("1"));
+  assertTrue(maxConn.contains("-1"));
+  assertTrue(redudancy.contains("1"));
+  
+  String puts = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_PUTS);
+  assertTrue(puts.equals("2"));    
+  
+  String calls = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_LISTNER_CALLS);
+  assertTrue(calls.equals("1"));
+  
+  String primServer = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_PRIMARY_SERVERS);
+  assertTrue(primServer.equals(serverName) || primServer.equals("N.A."));
+  
+  String durable = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_DURABLE);
+  assertTrue(durable.equals("No"));   
+  
+  String threads = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_THREADS);
+  assertTrue(Integer.parseInt(threads) > 0);
+  
+  String cpu = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_CPU);
+  assertTrue(Integer.parseInt(cpu) > 0);   
+  
+  String upTime = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_UP_TIME);
+  assertTrue(Integer.parseInt(upTime) >= 0);   
+  
+  String prcTime = section.retrieveString(CliStrings.DESCRIBE_CLIENT_COLUMN_PROCESS_CPU_TIME);
+  assertTrue(Long.parseLong(prcTime) > 0);
+  
+}
+
+private void setUpNonSubscribedClient() throws Exception {
+  disconnectAllFromDS();
+  final int[] port = AvailablePortHelper.getRandomAvailableTCPPorts(2);
+  createDefaultSetup(getServerProperties());
+  
+  final VM manager = Host.getHost(0).getVM(0);
+  final VM server1 = Host.getHost(0).getVM(1);
+  final VM client1 = Host.getHost(0).getVM(2);
+  final VM server2 = Host.getHost(0).getVM(3);
+  
+  port0 = port[0];
+  
+  startCacheServer(server1, port[0], false, regionName);
+  startCacheServer(server2, port[1], false, regionName);    
+  
+  startNonSubscribedClient(client1, server1, port[0]);
+  setupCqsOnVM(client1);
+  waitForNonSubCliMBean();
+  
+  
+  
+  clientId =  (String) manager.invoke(new SerializableCallable(){
+    @Override
+    public Object call() throws Exception {
+      Cache cache = GemFireCacheImpl.getInstance();       
+      SystemManagementService service = (SystemManagementService) ManagementService.getExistingManagementService(cache);
+      DistributedMember serverMember = getMember(server1);
+      final ObjectName cacheServerMBeanName = service.getCacheServerMBeanName(port[0],serverMember);
+      CacheServerMXBean bean = service.getMBeanProxy(cacheServerMBeanName, CacheServerMXBean.class);
+      return bean.getClientIds()[0]; 
+    }
+  });
+}
+
+
+
+  private String[] setupSystemWithSubAndNonSubClient() throws Exception {
+    String[] cliendIds = new String[2];
+    disconnectAllFromDS();
+    final int[] port = AvailablePortHelper.getRandomAvailableTCPPorts(3);
+    createDefaultSetup(getServerProperties());
+    
+    final VM manager = Host.getHost(0).getVM(0);
+    final VM server1 = Host.getHost(0).getVM(1);
+    final VM client1 = Host.getHost(0).getVM(2);
+    final VM client2 = Host.getHost(0).getVM(3);
+    
+    startCacheServer(server1, port[0], false, regionName);    
+    port0 = port[0];
+    startNonDurableClient(client1, server1, port[0]);
+    startNonSubscribedClient(client2, server1, port[0]);
+    
+    waitForMixedClients();
+    
+    cliendIds =  (String[]) manager.invoke(new SerializableCallable(){
+      @Override
+      public Object call() throws Exception {
+        Cache cache = GemFireCacheImpl.getInstance();       
+        SystemManagementService service = (SystemManagementService) ManagementService.getExistingManagementService(cache);
+        DistributedMember serverMember = getMember(server1);
+        final ObjectName cacheServerMBeanName = service.getCacheServerMBeanName(port[0],serverMember);     
+        CacheServerMXBean bean = service.getMBeanProxy(cacheServerMBeanName, CacheServerMXBean.class);
+        return bean.getClientIds(); 
+      }
+    });   
+    
+    return cliendIds;
+    
+  }
+  private void startNonSubscribedClient  (VM client, final VM server, final int port) {
+    client.invoke(new CacheSerializableRunnable("Start client") {
+      public void run2() throws CacheException {        
+        Cache cache = GemFireCacheImpl.getInstance();
+        if(cache == null ){
+          
+          Properties props = getNonDurableClientProps();
+          props.setProperty("log-file", "client_" + OSProcess.getId() + ".log");
+          props.setProperty("log-level", "fine");
+          props.setProperty("statistic-archive-file", "client_" + OSProcess.getId() + ".gfs");
+          props.setProperty("statistic-sampling-enabled", "true");
+          
+          getSystem(props);
+          
+          final ClientCacheFactory ccf = new ClientCacheFactory(props);
+          ccf.addPoolServer(getServerHostName(server.getHost()), port);
+          ccf.setPoolSubscriptionEnabled(false);
+          ccf.setPoolPingInterval(1);
+          ccf.setPoolStatisticInterval(1);
+          ccf.setPoolSubscriptionRedundancy(1);
+          ccf.setPoolMinConnections(1);
+          
+          ClientCache clientCache = (ClientCache)getClientCache(ccf);
+          //Create region
+          if( clientCache.getRegion(Region.SEPARATOR + regionName) == null && clientCache.getRegion( regionName) == null){     
+            ClientRegionFactory regionFactory = clientCache.createClientRegionFactory(ClientRegionShortcut.LOCAL).setPoolName(clientCache.getDefaultPool().getName()) ;
+            Region dataRegion = regionFactory.create(regionName);       
+            assertNotNull(dataRegion);           
+            dataRegion.put("k1", "v1");
+            dataRegion.put("k2", "v2");
+            
+          }
+        }else{
+          String poolName = "new_pool_" + System.currentTimeMillis();
+          try{                      
+            PoolImpl p = (PoolImpl) PoolManager.createFactory().addServer(getServerHostName(server.getHost()), port)
+              .setThreadLocalConnections(true)
+              .setMinConnections(1)
+              .setSubscriptionEnabled(false)
+              .setPingInterval(1)
+              .setStatisticInterval(1)   
+              .setMinConnections(1)
+              .setSubscriptionRedundancy(1)
+              .create(poolName);
+            cache.getLogger().info("Created new pool pool " + poolName  );            
+            assertNotNull(p);
+          }catch(Exception eee){
+            cache.getLogger().info("Exception in creating pool " + poolName + "    Exception ==" + CliUtil.stackTraceAsString(eee));
+          }
+        }        
+      }
+    });
+  }
+  
+  public void tearDown2() throws Exception {
+    super.tearDown2();
+    Host.getHost(0).getVM(0).invoke(CacheServerTestUtil.class, "closeCache");
+    Host.getHost(0).getVM(1).invoke(CacheServerTestUtil.class, "closeCache");
+    Host.getHost(0).getVM(2).invoke(CacheServerTestUtil.class, "closeCache");
+    Host.getHost(0).getVM(3).invoke(CacheServerTestUtil.class, "closeCache");
+  }
+}


[29/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
new file mode 100755
index 0000000..583ef81
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
@@ -0,0 +1,2010 @@
+/*=========================================================================
+ * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.tier.sockets;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Ignore;
+
+import junit.framework.Assert;
+import util.TestException;
+
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.InterestResultPolicy;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.client.Pool;
+import com.gemstone.gemfire.cache.client.PoolFactory;
+import com.gemstone.gemfire.cache.client.PoolManager;
+import com.gemstone.gemfire.cache.client.internal.PoolImpl;
+import com.gemstone.gemfire.cache.query.CqAttributes;
+import com.gemstone.gemfire.cache.query.CqAttributesFactory;
+import com.gemstone.gemfire.cache.query.CqException;
+import com.gemstone.gemfire.cache.query.CqExistsException;
+import com.gemstone.gemfire.cache.query.CqListener;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.cache.query.RegionNotFoundException;
+import com.gemstone.gemfire.cache.query.data.Portfolio;
+import com.gemstone.gemfire.cache.query.internal.cq.CqQueryImpl;
+import com.gemstone.gemfire.cache.query.internal.cq.CqService;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.distributed.internal.ServerLocation;
+import com.gemstone.gemfire.internal.cache.ClientServerObserver;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
+import com.gemstone.gemfire.internal.cache.CacheServerImpl;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.cache.InternalCache;
+import com.gemstone.gemfire.internal.cache.PoolFactoryImpl;
+import com.gemstone.gemfire.internal.cache.ha.HARegionQueue;
+
+import dunit.DistributedTestCase;
+import dunit.Host;
+import dunit.VM;
+
+/**
+ * Class <code>DurableClientTestCase</code> tests durable client
+ * functionality.
+ * 
+ * @author Barry Oglesby
+ * 
+ * @since 5.2
+ */ 
+public class DurableClientTestCase extends DistributedTestCase {
+
+  protected VM server1VM;
+  protected VM server2VM;
+  protected VM durableClientVM;
+  protected VM publisherClientVM;
+  protected String regionName;
+  
+  protected static volatile boolean isPrimaryRecovered = false;
+
+  public DurableClientTestCase(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    Host host = Host.getHost(0);
+    this.server1VM = host.getVM(0);
+    this.server2VM = host.getVM(1);
+    this.durableClientVM = host.getVM(2);
+    this.publisherClientVM = host.getVM(3);
+    this.regionName = getName() + "_region";
+    //Clients see this when the servers disconnect
+    addExpectedException("Could not find any server");
+  }
+  
+  public void tearDown2() throws Exception {
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server2VM.invoke(CacheServerTestUtil.class, "closeCache");
+  }
+
+  /**
+   * Test that starting a durable client is correctly processed by the server.
+   */
+  public void testSimpleDurableClient() {    
+    // Start a server
+    int serverPort = ((Integer) this.server1VM.invoke(CacheServerTestUtil.class,
+        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+        .intValue();
+
+    // Start a durable client that is not kept alive on the server when it
+    // stops normally
+    final String durableClientId = getName() + "_client";
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId)});
+
+    // Send clientReady message
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
+      public void run2() throws CacheException {
+        CacheServerTestUtil.getCache().readyForEvents();
+      }
+    });
+
+    // Verify durable client on server
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        checkNumberOfClientProxies(1);
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+        
+        // Verify that it is durable and its properties are correct
+        assertTrue(proxy.isDurable());
+        assertEquals(durableClientId, proxy.getDurableId());
+        assertEquals(DistributionConfig.DEFAULT_DURABLE_CLIENT_TIMEOUT, proxy.getDurableTimeout());
+        //assertEquals(DistributionConfig.DEFAULT_DURABLE_CLIENT_KEEP_ALIVE, proxy.getDurableKeepAlive());
+      }
+    });
+    
+    // Stop the durable client
+    this.disconnectDurableClient();
+    
+    // Verify the durable client is present on the server for closeCache=false case.
+    this.verifySimpleDurableClient();
+    
+    // Stop the server
+    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+
+    this.closeDurableClient();
+    
+  }
+  
+  /**
+   * Test that starting a durable client is correctly processed by the server.
+   * In this test we will set gemfire.SPECIAL_DURABLE property to true and will
+   * see durableID appended by poolname or not
+   */
+  public void testSimpleDurableClient2() {    
+    // Start a server
+    int serverPort = ((Integer) this.server1VM.invoke(CacheServerTestUtil.class,
+        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+        .intValue();
+
+    // Start a durable client that is not kept alive on the server when it
+    // stops normally
+    final String durableClientId = getName() + "_client";
+    final Properties jp = new Properties();
+    jp.setProperty("gemfire.SPECIAL_DURABLE", "true");
+    
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(durableClientVM.getHost()), serverPort, true)
+    									, regionName
+    									, getClientDistributedSystemProperties(durableClientId)
+    									, new Boolean(false)
+    									, jp});
+
+    // Send clientReady message
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
+      public void run2() throws CacheException {
+        CacheServerTestUtil.getCache().readyForEvents();
+      }
+    });
+
+    // Verify durable client on server
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        checkNumberOfClientProxies(1);
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+        
+        // Verify that it is durable and its properties are correct
+        assertTrue(proxy.isDurable());
+        assertNotSame(durableClientId, proxy.getDurableId());
+        
+        /* new durable id will be like this
+         * durableClientId
+         * _gem_ //separartor
+         * client pool name
+         */
+        String dId = durableClientId + "_gem_" + "CacheServerTestUtil";
+        
+        assertEquals(dId, proxy.getDurableId());
+        assertEquals(DistributionConfig.DEFAULT_DURABLE_CLIENT_TIMEOUT, proxy.getDurableTimeout());
+        //assertEquals(DistributionConfig.DEFAULT_DURABLE_CLIENT_KEEP_ALIVE, proxy.getDurableKeepAlive());
+      }
+    });
+    
+    // Stop the durable client
+    this.disconnectDurableClient();
+    
+    // Verify the durable client is present on the server for closeCache=false case.
+    this.verifySimpleDurableClient();
+    
+    // Stop the server
+    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+
+    this.closeDurableClient();
+    
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "unsetJavaSystemProperties", 
+        new Object[] {jp});
+    
+  }
+  
+  public void closeDurableClient()
+  {
+  }
+  
+  public void disconnectDurableClient()
+  {
+    this.disconnectDurableClient(false);    
+  }
+
+  public void disconnectDurableClient(boolean keepAlive)
+  {
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache",new Object[] {new Boolean(keepAlive)});    
+  }
+
+  public void verifySimpleDurableClient()
+  {
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        checkNumberOfClientProxies(0);
+        CacheClientProxy proxy = getClientProxy();
+        assertNull(proxy);
+      }
+    });
+  }
+  
+  /**
+   * Test that starting, stopping then restarting a durable client is correctly
+   * processed by the server.
+   */
+  public void testStartStopStartDurableClient() {
+    // Start a server
+    int serverPort = ((Integer) this.server1VM.invoke(CacheServerTestUtil.class,
+        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+        .intValue();
+
+    // Start a durable client that is kept alive on the server when it stops
+    // normally
+    final String durableClientId = getName() + "_client";
+    final int durableClientTimeout = 60; // keep the client alive for 60 seconds
+    //final boolean durableClientKeepAlive = true; // keep the client alive when it stops normally
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout)});
+
+    // Send clientReady message
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
+      public void run2() throws CacheException {
+        CacheServerTestUtil.getCache().readyForEvents();
+      }
+    });
+
+    // Verify durable client on server
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        checkNumberOfClientProxies(1);
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+        
+        // Verify that it is durable and its properties are correct
+        assertTrue(proxy.isDurable());
+        assertEquals(durableClientId, proxy.getDurableId());
+        assertEquals(durableClientTimeout, proxy.getDurableTimeout());
+        //assertEquals(durableClientKeepAlive, proxy.getDurableKeepAlive());
+      }
+    });
+    
+    // Stop the durable client
+    this.disconnectDurableClient(true);
+    
+    // Verify the durable client still exists on the server
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+      }
+    });
+
+    // Re-start the durable client
+    this.restartDurableClient(new Object[] {
+        getClientPool(getServerHostName(durableClientVM.getHost()),serverPort, true),
+        regionName,
+        getClientDistributedSystemProperties(durableClientId,
+            durableClientTimeout) });
+    
+    // Verify durable client on server
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        checkNumberOfClientProxies(1);
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+        
+        // Verify that it is durable and its properties are correct
+        assertTrue(proxy.isDurable());
+        assertEquals(durableClientId, proxy.getDurableId());
+        assertEquals(durableClientTimeout, proxy.getDurableTimeout());
+      }
+    });
+        
+    // Stop the durable client
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    
+    // Stop the server
+    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+  }
+
+  /**
+   * Test that starting, stopping then restarting a durable client is correctly
+   * processed by the server.
+   * This is a test of bug 39630
+   */
+  public void test39630() {
+    // Start a server
+    int serverPort = ((Integer) this.server1VM.invoke(CacheServerTestUtil.class,
+        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+        .intValue();
+
+    // Start a durable client that is kept alive on the server when it stops
+    // normally
+    final String durableClientId = getName() + "_client";
+    final int durableClientTimeout = 60; // keep the client alive for 60 seconds
+    //final boolean durableClientKeepAlive = true; // keep the client alive when it stops normally
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout)});
+
+//    // Send clientReady message
+//    this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
+//      public void run2() throws CacheException {
+//        CacheServerTestUtil.getCache().readyForEvents();
+//      }
+//    });
+
+    // Verify durable client on server
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        checkNumberOfClientProxies(1);
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+        
+        // Verify that it is durable and its properties are correct
+        assertTrue(proxy.isDurable());
+        assertEquals(durableClientId, proxy.getDurableId());
+        assertEquals(durableClientTimeout, proxy.getDurableTimeout());
+        //assertEquals(durableClientKeepAlive, proxy.getDurableKeepAlive());
+      }
+    });
+    
+    // Stop the durable client
+    this.disconnectDurableClient(true);
+    
+    // Verify the durable client still exists on the server, and the socket is closed
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+        Assert.assertNotNull(proxy._socket);
+        long end = System.currentTimeMillis() + 60000;
+        
+        while(!proxy._socket.isClosed()) {
+          if(System.currentTimeMillis() > end) {
+            break;
+          }
+        }
+        Assert.assertTrue(proxy._socket.isClosed());
+      }
+    });
+    
+    // Re-start the durable client (this is necessary so the
+    //netDown test will set the appropriate system properties.
+    this.restartDurableClient(new Object[] {
+        getClientPool(getServerHostName(durableClientVM.getHost()), serverPort, true),
+        regionName,
+        getClientDistributedSystemProperties(durableClientId,
+            durableClientTimeout) });
+
+    // Stop the durable client
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    
+    // Stop the server
+    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+  }
+  
+  public void restartDurableClient(Object[] args)
+  {
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", args);
+
+    // Send clientReady message
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
+      public void run2() throws CacheException {
+        CacheServerTestUtil.getCache().readyForEvents();
+      }
+    });
+  }
+  
+  /**
+   * Test that disconnecting a durable client for longer than the timeout
+   * period is correctly processed by the server.
+   */
+  public void testStartStopTimeoutDurableClient() {
+    // Start a server
+    int serverPort = ((Integer) this.server1VM.invoke(CacheServerTestUtil.class,
+        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+        .intValue();
+
+    // Start a durable client that is kept alive on the server when it stops
+    // normally
+    final String durableClientId = getName() + "_client";
+    final int durableClientTimeout = 5; // keep the client alive for 5 seconds
+    //final boolean durableClientKeepAlive = true; // keep the client alive when it stops normally
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout)});
+
+    // Send clientReady message
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
+      public void run2() throws CacheException {
+        CacheServerTestUtil.getCache().readyForEvents();
+      }
+    });
+
+    // Verify durable client on server
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        checkNumberOfClientProxies(1);
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+        
+        // Verify that it is durable and its properties are correct
+        assertTrue(proxy.isDurable());
+        assertEquals(durableClientId, proxy.getDurableId());
+        assertEquals(durableClientTimeout, proxy.getDurableTimeout());
+      }
+    });
+    
+    // Stop the durable client
+    this.disconnectDurableClient(true);
+    
+    // Verify the durable client still exists on the server
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        checkNumberOfClientProxies(1);
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+      }
+    });
+    
+    // Pause to let the client timeout. This time is 2.5 seconds longer than
+    // the durableClientTimeout set above. It should be long enough for the 
+    // client to timeout and get cleaned up. There could be a race here,
+    // though.
+    // no need for the explicit pause since checkNumberOfClientProxies
+    // will wait up to 15 seconds
+    //pause(7500);
+    
+    // Verify it no longer exists on the server
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        checkNumberOfClientProxies(0);
+        CacheClientProxy proxy = getClientProxy();
+        assertNull(proxy);
+      }
+    });
+    
+    this.restartDurableClient(new Object[] {
+        getClientPool(getServerHostName(Host.getHost(0)), serverPort, true),
+        regionName,
+        getClientDistributedSystemProperties(durableClientId,
+            durableClientTimeout) });
+
+    // Stop the durable client
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    
+    // Stop the server
+    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+  }
+
+  /**
+   * Test that a durable client correctly receives updates after it reconnects.
+   */
+  public void testDurableClientPrimaryUpdate() {
+    // Start a server
+    int serverPort = ((Integer) this.server1VM.invoke(CacheServerTestUtil.class,
+        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+        .intValue();
+
+    // Start a durable client that is kept alive on the server when it stops
+    // normally
+    final String durableClientId = getName() + "_client";
+    final int durableClientTimeout = 120; // keep the client alive for 60 seconds
+    //final boolean durableClientKeepAlive = true; // keep the client alive when it stops normally
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE});
+
+    // Send clientReady message
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
+      public void run2() throws CacheException {
+        CacheServerTestUtil.getCache().readyForEvents();
+      }
+    });
+
+    // Have the durable client register interest in all keys
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Register interest") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Register interest in all keys
+        region.registerInterestRegex(".*", InterestResultPolicy.NONE, true);
+      }
+    });
+
+    // Start normal publisher client
+    this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName});
+
+    // Publish some entries
+    final int numberOfEntries = 1;
+    this.publisherClientVM.invoke(new CacheSerializableRunnable("Publish entries") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Publish some entries
+        for (int i=0; i<numberOfEntries; i++) {
+          String keyAndValue = String.valueOf(i);
+          region.put(keyAndValue, keyAndValue);
+        }
+      }
+    });
+    
+    // Verify the durable client received the updates
+    this.verifyListenerUpdates(numberOfEntries);
+
+    try {
+      Thread.sleep(1000);
+    } catch (InterruptedException ex) {
+      fail("interrupted");
+    }
+    
+    // Stop the durable client
+    this.disconnectDurableClient(true);
+    
+    //Make sure the proxy is actually paused, not dispatching
+    this.server1VM.invoke(new CacheSerializableRunnable("Wait for paused") {
+      public void run2() throws CacheException {
+        WaitCriterion  wc = new WaitCriterion() {
+          public boolean done() {
+            CacheClientProxy proxy = getClientProxy();
+            return proxy != null && proxy.isPaused();
+          }
+          public String description() {
+            return "Proxy was not paused: " + getClientProxy();
+          }
+        };
+        //If we wait too long, the durable queue will be gone, because
+        //the timeout is 120 seconds.
+        DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+      }
+    });
+
+    // Publish some more entries
+    this.publisherClientVM.invoke(new CacheSerializableRunnable("Register interest") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Publish some entries
+        for (int i=0; i<numberOfEntries; i++) {
+          String keyAndValue = String.valueOf(i);
+          region.put(keyAndValue, keyAndValue);
+        }
+      }
+    });
+    
+    try {
+      Thread.sleep(1000);
+    } catch (InterruptedException ex) {
+      fail("interrupted");
+    }
+        
+    // Verify the durable client's queue contains the entries
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        WaitCriterion  wc = new WaitCriterion() {
+          String excuse;
+          public boolean done() {
+            CacheClientProxy proxy = getClientProxy();
+            if (proxy == null) {
+              excuse = "No CacheClientProxy";
+              return false;
+            }
+            // Verify the queue size
+            int sz = proxy.getQueueSize();
+            if (numberOfEntries != sz) {
+              excuse = "expected = " + numberOfEntries + ", actual = " + sz;
+              return false;
+            }
+            return true;
+          }
+          public String description() {
+            return excuse;
+          }
+        };
+        //If we wait too long, the durable queue will be gone, because
+        //the timeout is 120 seconds.
+        DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+      }
+    });
+
+    // Verify that disconnected client does not receive any events.
+    this.verifyListenerUpdatesDisconnected(numberOfEntries);
+    
+    // Re-start the durable client
+    this.restartDurableClient(new Object[] {
+        getClientPool(getServerHostName(durableClientVM.getHost()), serverPort, true), regionName,
+        getClientDistributedSystemProperties(durableClientId), Boolean.TRUE });
+
+    // Verify durable client on server
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        checkNumberOfClientProxies(1);
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+        
+        // Verify that it is durable and its properties are correct
+        assertTrue(proxy.isDurable());
+        assertEquals(durableClientId, proxy.getDurableId());
+      }
+    });
+        
+    // Verify the durable client received the updates held for it on the server
+    this.verifyListenerUpdates(numberOfEntries, numberOfEntries);
+    
+    // Stop the publisher client
+    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    
+    // Stop the durable client VM
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+
+    // Stop the server
+    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+  }
+  
+  /**
+   * Test that a durable client correctly receives updates after it reconnects.
+   */
+  public void testStartStopStartDurableClientUpdate() {
+    // Start a server
+    int serverPort = ((Integer) this.server1VM.invoke(CacheServerTestUtil.class,
+        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+        .intValue();
+
+    // Start a durable client that is kept alive on the server when it stops
+    // normally
+    final String durableClientId = getName() + "_client";
+    final int durableClientTimeout = 60; // keep the client alive for 60 seconds
+    //final boolean durableClientKeepAlive = true; // keep the client alive when it stops normally
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE});
+
+    // Send clientReady message
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
+      public void run2() throws CacheException {
+        CacheServerTestUtil.getCache().readyForEvents();
+      }
+    });
+
+    // Have the durable client register interest in all keys
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Register interest") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Register interest in all keys
+        region.registerInterestRegex(".*", InterestResultPolicy.NONE, true);
+      }
+    });
+
+    // Start normal publisher client
+    this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName});
+
+    // Publish some entries
+    final int numberOfEntries = 1;
+    this.publisherClientVM.invoke(new CacheSerializableRunnable("Publish entries") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Publish some entries
+        for (int i=0; i<numberOfEntries; i++) {
+          String keyAndValue = String.valueOf(i);
+          region.put(keyAndValue, keyAndValue);
+        }
+      }
+    });
+    
+    // Verify the durable client received the updates
+    this.verifyListenerUpdates(numberOfEntries);
+    
+    // ARB: Wait for queue ack to arrive at server.
+    try {
+      Thread.sleep(1000);
+    } catch (InterruptedException ex) {
+      fail("interrupted");
+    }
+    
+    // Stop the durable client
+    this.disconnectDurableClient(true);
+    
+    // Verify the durable client still exists on the server
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        final CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+        WaitCriterion ev = new WaitCriterion() {
+          public boolean done() {
+            return proxy.isPaused();
+          }
+          public String description() {
+            return null;
+          }
+        };
+        DistributedTestCase.waitForCriterion(ev, 1000, 200, true);
+        assertTrue(proxy.isPaused());
+      }
+    });
+
+    // Publish some more entries
+    this.publisherClientVM.invoke(new CacheSerializableRunnable("Publish more entries") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Publish some entries
+        for (int i=0; i<numberOfEntries; i++) {
+          String keyAndValue = String.valueOf(i);
+          region.put(keyAndValue, keyAndValue);
+        }
+      }
+    });
+    
+    try {
+      Thread.sleep(1000);
+    } catch (InterruptedException ex) {
+      fail("interrupted");
+    }
+    
+    // Verify the durable client's queue contains the entries
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+        
+        // Verify the queue size
+        assertEquals(numberOfEntries, proxy.getQueueSize());
+      }
+    });
+
+    // Verify that disconnected client does not receive any events.
+    this.verifyListenerUpdatesDisconnected(numberOfEntries);
+    
+    // Re-start the durable client
+    this.restartDurableClient(new Object[] {
+        getClientPool(getServerHostName(durableClientVM.getHost()), serverPort, true), regionName,
+        getClientDistributedSystemProperties(durableClientId), Boolean.TRUE });
+
+    // Verify durable client on server
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        checkNumberOfClientProxies(1);
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+        
+        // Verify that it is durable and its properties are correct
+        assertTrue(proxy.isDurable());
+        assertEquals(durableClientId, proxy.getDurableId());
+      }
+    });
+        
+    // Verify the durable client received the updates held for it on the server
+    this.verifyListenerUpdates(numberOfEntries, numberOfEntries);
+    
+    // Stop the publisher client
+    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    
+    // Stop the durable client VM
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+
+    // Stop the server
+    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+  }
+
+  public void verifyListenerUpdates(int numEntries)
+  {
+    this.verifyListenerUpdatesEntries(numEntries, 0);
+  }
+  
+  public void verifyListenerUpdates(int numEntries, int numEntriesBeforeDisconnect)
+  {
+    this.verifyListenerUpdatesEntries(numEntries, 0);
+  }
+      
+  public void verifyListenerUpdatesEntries(final int numEntries, final int numEntriesBeforeDisconnect)
+  {
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Verify updates") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Get the listener and wait for the appropriate number of events
+        CacheServerTestUtil.ControlListener listener = (CacheServerTestUtil.ControlListener) region
+                .getAttributes().getCacheListeners()[0];
+        listener.waitWhileNotEnoughEvents(60 * 1000, numEntries+numEntriesBeforeDisconnect);
+        assertEquals(numEntries+numEntriesBeforeDisconnect, listener.events.size());
+        //CacheServerTestUtil.getCache().getLogger().info("ARB: verify updates(): numEntries = " + numEntries);
+        //CacheServerTestUtil.getCache().getLogger().info("ARB: verify updates(): listener.events.size() = " + listener.events.size());
+      }
+    });
+  }
+  
+  public void verifyListenerUpdatesDisconnected(int numberOfEntries)
+  {
+    // ARB: do nothing.
+  }
+  
+  public void verifySimpleDurableClientMultipleServers()
+  {
+    // Verify the durable client is no longer on server1
+    this.server1VM
+        .invoke(new CacheSerializableRunnable("Verify durable client") {
+          public void run2() throws CacheException {
+            // Find the proxy
+            checkNumberOfClientProxies(0);
+            CacheClientProxy proxy = getClientProxy();
+            assertNull(proxy);
+          }
+        });
+
+    // Verify the durable client is no longer on server2
+    this.server2VM
+        .invoke(new CacheSerializableRunnable("Verify durable client") {
+          public void run2() throws CacheException {
+            // Find the proxy
+            checkNumberOfClientProxies(0);
+            CacheClientProxy proxy = getClientProxy();
+            assertNull(proxy);
+          }
+        });
+  }
+  
+  /**
+   * Test whether a durable client reconnects properly to a server that is
+   * stopped and restarted.
+   */
+  public void testDurableClientConnectServerStopStart() {
+    // Start a server
+    // Start server 1
+    Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
+        "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+    final int serverPort = ports[0].intValue();
+
+    // Start a durable client that is not kept alive on the server when it
+    // stops normally
+    final String durableClientId = getName() + "_client";
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE});
+
+    // Send clientReady message
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
+      public void run2() throws CacheException {
+        CacheServerTestUtil.getCache().readyForEvents();
+      }
+    });
+    
+    // Have the durable client register interest in all keys
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Register interest") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Register interest in all keys
+        region.registerInterestRegex(".*", InterestResultPolicy.NONE, true);
+      }
+    });
+
+    // Verify durable client on server
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        checkNumberOfClientProxies(1);
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+        
+        // Verify that it is durable and its properties are correct
+        assertTrue(proxy.isDurable());
+        assertEquals(durableClientId, proxy.getDurableId());
+        assertEquals(DistributionConfig.DEFAULT_DURABLE_CLIENT_TIMEOUT, proxy.getDurableTimeout());
+      }
+    });
+    
+    // Stop the server
+    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    
+    // Re-start the server
+    this.server1VM.invoke(CacheServerTestUtil.class, "createCacheServer",
+        new Object[] {regionName, new Boolean(true),
+            new Integer(serverPort)});
+    
+    // Pause 10 seconds to allow client to reconnect to server
+    // no need for the explicit pause since checkNumberOfClientProxies
+    // will wait up to 15 seconds
+    //pause(10000);
+    
+    // Verify durable client on server
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        checkNumberOfClientProxies(1);
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+        
+        // Verify that it is durable and its properties are correct
+        assertTrue(proxy.isDurable());
+        assertEquals(durableClientId, proxy.getDurableId());
+        assertEquals(DistributionConfig.DEFAULT_DURABLE_CLIENT_TIMEOUT, proxy.getDurableTimeout());
+      }
+    });
+    
+    // Start a publisher
+    this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName});
+
+    // Publish some messages
+    // Publish some entries
+    final int numberOfEntries = 10;
+    this.publisherClientVM.invoke(new CacheSerializableRunnable("Register interest") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Publish some entries
+        for (int i=0; i<numberOfEntries; i++) {
+          String keyAndValue = String.valueOf(i);
+          region.put(keyAndValue, keyAndValue);
+        }
+      }
+    });
+    
+    // Verify the durable client received the updates
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Verify updates") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Get the listener and wait for the appropriate number of events
+        CacheServerTestUtil.ControlListener listener = (CacheServerTestUtil.ControlListener) region
+                .getAttributes().getCacheListeners()[0];
+        listener.waitWhileNotEnoughEvents(30000, numberOfEntries);
+        assertEquals(numberOfEntries, listener.events.size());
+      }
+    });
+
+    // Stop the durable client
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+
+    // Stop the publisher client
+    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    
+    // Stop the server
+    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+  }
+
+  @Ignore("This test is failing inconsistently, see bug 51258")
+  public void DISABLED_testDurableNonHAFailover() throws InterruptedException
+  {
+      durableFailover(0);
+      durableFailoverAfterReconnect(0);   
+  }
+
+  @Ignore("This test is failing inconsistently, see bug 51258")
+  public void DISABLED_testDurableHAFailover() throws InterruptedException
+  {
+    //Clients see this when the servers disconnect
+    addExpectedException("Could not find any server");
+    durableFailover(1);
+    durableFailoverAfterReconnect(1);
+  }
+  
+  /**
+   * Test a durable client with 2 servers where the client fails over from one to another server
+   * with a publisher/feeder performing operations and the client verifying updates received.
+   * Redundancy level is set to 1 for this test case.
+   */
+  public void durableFailover(int redundancyLevel) throws InterruptedException {
+    
+    // Start server 1
+    Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
+        "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+    final int server1Port = ports[0].intValue();
+    
+    // Start server 2 using the same mcast port as server 1
+    final int server2Port = ((Integer) this.server2VM.invoke(CacheServerTestUtil.class,
+        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+        .intValue();
+        
+    // Stop server 2
+    this.server2VM.invoke(CacheServerTestUtil.class, "closeCache");
+
+    // Start a durable client
+    final String durableClientId = getName() + "_client";
+    final int durableClientTimeout = 60; // keep the client alive for 60 seconds
+    Pool clientPool;
+    if (redundancyLevel == 1) {
+      clientPool = getClientPool(getServerHostName(Host.getHost(0)), server1Port, server2Port, true); 
+    }
+    else {
+      clientPool = getClientPool(getServerHostName(Host.getHost(0)), server1Port, server2Port, true, 0);
+    }
+    
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "disableShufflingOfEndpoints");
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {clientPool, regionName,
+        getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE});
+
+    // Send clientReady message
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
+      public void run2() throws CacheException {
+        CacheServerTestUtil.getCache().readyForEvents();
+      }
+    });
+
+    // Have the durable client register interest in all keys
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Register interest") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Register interest in all keys
+        region.registerInterestRegex(".*", InterestResultPolicy.NONE, true);
+      }
+    });
+    
+    // Re-start server2
+    this.server2VM.invoke(CacheServerTestUtil.class, "createCacheServer",
+        new Object[] { regionName, new Boolean(true),
+            new Integer(server2Port)});
+        
+    // Start normal publisher client
+    this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(publisherClientVM.getHost()), server1Port, server2Port, false), regionName});
+
+    // Publish some entries
+    final int numberOfEntries = 1;
+    this.publisherClientVM.invoke(new CacheSerializableRunnable("Publish entries") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Publish some entries
+        for (int i=0; i<numberOfEntries; i++) {
+          String keyAndValue = String.valueOf(i);
+          region.put(keyAndValue, keyAndValue);
+        }
+      }
+    });
+
+    // Verify the durable client received the updates
+    this.verifyListenerUpdates(numberOfEntries);
+
+    try {
+      java.lang.Thread.sleep(5000);
+    }
+    catch (java.lang.InterruptedException ex) {
+      fail("interrupted");
+    }
+    
+    
+    // Stop the durable client
+    this.disconnectDurableClient(true);
+    
+    // Publish updates during client downtime
+    this.publisherClientVM.invoke(new CacheSerializableRunnable("Publish entries") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Publish some entries
+        for (int i=0; i<numberOfEntries; i++) {
+          String keyAndValue = String.valueOf(i);
+          region.put(keyAndValue, keyAndValue);
+        }
+      }
+    });
+
+    
+    // Re-start the durable client that is kept alive on the server
+    this.restartDurableClient(new Object[] {
+        clientPool,
+        regionName,
+        getClientDistributedSystemProperties(durableClientId,
+            durableClientTimeout), Boolean.TRUE });
+    
+    // Have the durable client register interest in all keys
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Register interest") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Register interest in all keys
+        region.registerInterestRegex(".*", InterestResultPolicy.NONE, true);
+      }
+    });
+    
+    // Publish second round of updates
+    this.publisherClientVM.invoke(new CacheSerializableRunnable("Publish entries before failover") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Publish some entries
+        for (int i=1; i<numberOfEntries+1; i++) {
+          String keyAndValue = String.valueOf(i);
+          region.put(keyAndValue, keyAndValue);
+        }
+      }
+    });
+    
+    // Verify the durable client received the updates before failover
+    this.verifyListenerUpdates(numberOfEntries+1, numberOfEntries);
+
+    try {
+      java.lang.Thread.sleep(1000);
+    }
+    catch (java.lang.InterruptedException ex) {
+      fail("interrupted");
+    }
+
+    setPrimaryRecoveryCheck();
+    
+    // Stop server 1 - publisher will put 10 entries during shutdown/primary identification
+    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Get") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        assertNull(region.getEntry("0"));
+      }
+    });
+    
+    checkPrimaryRecovery();
+    // Publish second round of updates after failover
+    this.publisherClientVM.invoke(new CacheSerializableRunnable("Publish entries after failover") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Publish some entries
+        for (int i=2; i<numberOfEntries+2; i++) {
+          String keyAndValue = String.valueOf(i);
+          region.put(keyAndValue, keyAndValue);
+        }
+      }
+    });
+    
+    // Verify the durable client received the updates after failover
+    this.verifyListenerUpdates(numberOfEntries+2, numberOfEntries);
+    
+    // Stop the durable client
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+
+    // Stop the publisher client
+    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+
+    // Stop server 2
+    this.server2VM.invoke(CacheServerTestUtil.class, "closeCache");
+  }
+  
+
+  public void durableFailoverAfterReconnect(int redundancyLevel)
+  {
+
+    
+    // Start server 1
+    Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
+        "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+    final int server1Port = ports[0].intValue();
+    final int mcastPort = ports[1].intValue();
+    
+    // Start server 2 using the same mcast port as server 1
+    final int server2Port = ((Integer) this.server2VM.invoke(CacheServerTestUtil.class,
+        "createCacheServer", new Object[] {regionName, new Boolean(true), new Integer(mcastPort)}))
+        .intValue();
+    
+    // Start a durable client
+    final String durableClientId = getName() + "_client";
+    final int durableClientTimeout = 60; // keep the client alive for 60 seconds
+    Pool clientPool;
+    if (redundancyLevel == 1) {
+      clientPool = getClientPool(getServerHostName(Host.getHost(0)), server1Port, server2Port, true); 
+    }
+    else {
+      clientPool = getClientPool(getServerHostName(Host.getHost(0)), server1Port, server2Port, true, 0);
+    }
+    
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "disableShufflingOfEndpoints");
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {clientPool, regionName,
+        getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE});
+
+    // Send clientReady message
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
+      public void run2() throws CacheException {
+        CacheServerTestUtil.getCache().readyForEvents();
+      }
+    });
+
+    // Have the durable client register interest in all keys
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Register interest") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Register interest in all keys
+        region.registerInterestRegex(".*", InterestResultPolicy.NONE, true);
+      }
+    });
+    
+    // Start normal publisher client
+    this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(publisherClientVM.getHost()), server1Port, server2Port, false), regionName});
+
+    // Publish some entries
+    final int numberOfEntries = 1;
+    this.publisherClientVM.invoke(new CacheSerializableRunnable("Publish entries") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Publish some entries
+        for (int i=0; i<numberOfEntries; i++) {
+          String keyAndValue = String.valueOf(i);
+          region.put(keyAndValue, keyAndValue);
+        }
+      }
+    });
+
+    try {
+      java.lang.Thread.sleep(10000);
+    }
+    catch (java.lang.InterruptedException ex) {
+      fail("interrupted");
+    }
+    
+    // Verify the durable client received the updates
+    this.verifyListenerUpdates(numberOfEntries);
+    
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        checkNumberOfClientProxies(1);
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+        
+        // Verify that it is durable and its properties are correct
+        assertTrue(proxy.isDurable());
+      }
+    });
+
+    // Stop the durable client
+    this.disconnectDurableClient(true);
+
+    // Stop server 1 - publisher will put 10 entries during shutdown/primary identification
+    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+
+    // Publish updates during client downtime
+    this.publisherClientVM.invoke(new CacheSerializableRunnable("Publish entries") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Publish some entries
+        for (int i=0; i<numberOfEntries; i++) {
+          String keyAndValue = String.valueOf(i);
+          region.put(keyAndValue, keyAndValue);
+        }
+      }
+    });
+
+    // Re-start the durable client that is kept alive on the server
+    this.restartDurableClient(new Object[] {
+        clientPool,
+        regionName,
+        getClientDistributedSystemProperties(durableClientId,
+            durableClientTimeout), Boolean.TRUE });
+
+    // Have the durable client register interest in all keys
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Register interest") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Register interest in all keys
+        region.registerInterestRegex(".*", InterestResultPolicy.NONE, true);
+      }
+    });
+    
+    // Publish second round of updates
+    this.publisherClientVM.invoke(new CacheSerializableRunnable("Publish entries before failover") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Publish some entries
+        for (int i=1; i<numberOfEntries+1; i++) {
+          String keyAndValue = String.valueOf(i);
+          region.put(keyAndValue, keyAndValue);
+        }
+      }
+    });
+    
+    // Verify the durable client received the updates before failover
+    if (redundancyLevel == 1) {
+      this.verifyListenerUpdates(numberOfEntries+1, numberOfEntries);
+    }
+    else {
+      this.verifyListenerUpdates(numberOfEntries, numberOfEntries);
+    }
+    
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Get") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Register interest in all keys
+        assertNull(region.getEntry("0"));
+      }
+    });
+    
+    // Publish second round of updates after failover
+    this.publisherClientVM.invoke(new CacheSerializableRunnable("Publish entries after failover") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Publish some entries
+        for (int i=2; i<numberOfEntries+2; i++) {
+          String keyAndValue = String.valueOf(i);
+          region.put(keyAndValue, keyAndValue);
+        }
+      }
+    });
+    
+    // Verify the durable client received the updates after failover
+    if (redundancyLevel == 1) {
+      this.verifyListenerUpdates(numberOfEntries+2, numberOfEntries);
+    }
+    else {
+      this.verifyListenerUpdates(numberOfEntries+1, numberOfEntries);
+    }
+    
+    // Stop the durable client
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+
+    // Stop the publisher client
+    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+
+    // Stop server 2
+    this.server2VM.invoke(CacheServerTestUtil.class, "closeCache");
+  }
+  
+  
+  //First we will have the client wait before trying to reconnect
+  //Then the drain will lock and begins to drain
+  //The client will then be able to continue, and get rejected
+  //Then we proceed to drain and release all locks
+  //The client will then reconnect
+  public class RejectClientReconnectTestHook implements CacheClientProxy.TestHook {
+      CountDownLatch reconnectLatch = new CountDownLatch(1);
+      CountDownLatch continueDrain = new CountDownLatch(1);
+      boolean clientWasRejected = false;
+      CountDownLatch clientConnected = new CountDownLatch(1);
+      
+      public void doTestHook(String spot) {
+        System.out.println("JASON " + spot);
+        try {
+          if (spot.equals("CLIENT_PRE_RECONNECT")) {
+            if (!reconnectLatch.await(60, TimeUnit.SECONDS)) {
+              throw new TestException("reonnect latch was never released.");
+            }
+          }
+          else if (spot.equals("DRAIN_IN_PROGRESS_BEFORE_DRAIN_LOCK_CHECK")) {
+            //let client try to reconnect
+            reconnectLatch.countDown();
+            //we wait until the client is rejected
+            if (!continueDrain.await(120, TimeUnit.SECONDS)) {
+              throw new TestException("Latch was never released.");
+            }
+          }
+          else if (spot.equals("CLIENT_REJECTED_DUE_TO_CQ_BEING_DRAINED")) {
+            clientWasRejected = true;
+            continueDrain.countDown();
+          }
+          else if (spot.equals("DRAIN_COMPLETE")) {
+            
+          }
+        }
+        catch (InterruptedException e) {
+          e.printStackTrace();
+          Thread.currentThread().interrupt();
+        }
+      }
+      
+      public boolean wasClientRejected() {
+        return clientWasRejected;
+      }
+  }  
+
+  /*
+   * This hook will cause the close cq to throw an exception due to a client in the middle of activating
+   * sequence -
+   * server will pause before draining
+   * client will begin to reconnect and then wait to continue
+   * server will be unblocked, and rejected
+   * client will the be unlocked after server is rejected and continue
+   */
+  public class CqExceptionDueToActivatingClientTestHook implements CacheClientProxy.TestHook {
+      CountDownLatch unblockDrain = new CountDownLatch(1);
+      CountDownLatch unblockClient = new CountDownLatch(1);
+      CountDownLatch finish = new CountDownLatch(1);
+      public void doTestHook(String spot) {
+        if (spot.equals("PRE_DRAIN_IN_PROGRESS")) {
+          try {
+            //Unblock any client waiting to reconnect
+            unblockClient.countDown();
+            //Wait until client is reconnecting
+            if (!unblockDrain.await(120, TimeUnit.SECONDS)) {
+              throw new TestException("client never got far enough reconnected to unlatch lock.");
+            }
+          }
+          catch (InterruptedException e) {
+            e.printStackTrace();
+            Thread.currentThread().interrupt();
+          }
+        }
+        if (spot.equals("PRE_RELEASE_DRAIN_LOCK")) {
+          //Client is reconnecting but still holds the drain lock
+          //let the test continue to try to close a cq
+          unblockDrain.countDown();
+          //wait until the server has finished attempting to close the cq
+          try {
+            if (!finish.await(30, TimeUnit.SECONDS) ) {
+              throw new TestException("Test did not complete, server never finished attempting to close cq");
+            }
+          }
+          catch (InterruptedException e) {
+            e.printStackTrace();
+            Thread.currentThread().interrupt();
+          }
+        }
+        if (spot.equals("DRAIN_COMPLETE")) {
+          finish.countDown();
+        }
+      }
+  }
+
+  
+  protected CqQuery createCq(String cqName, String cqQuery, boolean durable) throws CqException, CqExistsException {
+    QueryService qs = CacheServerTestUtil.getCache().getQueryService();
+    CqAttributesFactory cqf = new CqAttributesFactory();
+    CqListener[] cqListeners = { new CacheServerTestUtil.ControlCqListener() };
+    cqf.initCqListeners(cqListeners);
+    CqAttributes cqa = cqf.create();
+    return qs.newCq(cqName, cqQuery, cqa, durable);
+   
+  }
+
+  protected Pool getClientPool(String host, int serverPort, boolean establishCallbackConnection){
+    PoolFactory pf = PoolManager.createFactory();
+    pf.addServer(host, serverPort)
+      .setSubscriptionEnabled(establishCallbackConnection)
+      .setSubscriptionAckInterval(1);
+    return ((PoolFactoryImpl)pf).getPoolAttributes();
+  }
+  
+  
+  protected Pool getClientPool(String host, int server1Port, int server2Port, boolean establishCallbackConnection){
+    return getClientPool(host, server1Port, server2Port, establishCallbackConnection, 1);
+  }
+  
+  
+  protected Properties getClientDistributedSystemProperties(String durableClientId) {
+    return getClientDistributedSystemProperties(durableClientId,
+        DistributionConfig.DEFAULT_DURABLE_CLIENT_TIMEOUT);
+  }
+  
+  protected Properties getClientDistributedSystemPropertiesNonDurable(String durableClientId) {
+    Properties properties = new Properties();
+    properties.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    properties.setProperty(DistributionConfig.LOCATORS_NAME, "");
+    return properties;
+  }
+  
+  
+  protected Properties getClientDistributedSystemProperties(
+      String durableClientId, int durableClientTimeout) {
+    Properties properties = new Properties();
+    properties.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    properties.setProperty(DistributionConfig.LOCATORS_NAME, "");
+    properties.setProperty(DistributionConfig.DURABLE_CLIENT_ID_NAME, durableClientId);
+    properties.setProperty(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, String.valueOf(durableClientTimeout));
+    return properties;
+  }
+  
+  protected static CacheClientProxy getClientProxy() {
+    // Get the CacheClientNotifier
+    CacheClientNotifier notifier = getBridgeServer().getAcceptor()
+        .getCacheClientNotifier();
+    
+    // Get the CacheClientProxy or not (if proxy set is empty)
+    CacheClientProxy proxy = null;
+    Iterator i = notifier.getClientProxies().iterator();
+    if (i.hasNext()) {
+      proxy = (CacheClientProxy) i.next();
+    }
+    return proxy;
+  }
+  
+  protected static void checkNumberOfClientProxies(final int expected) {
+    WaitCriterion ev = new WaitCriterion() {
+      public boolean done() {
+        return expected == getNumberOfClientProxies();
+      }
+      public String description() {
+        return null;
+      }
+    };
+    DistributedTestCase.waitForCriterion(ev, 50 * 1000, 200, true);
+  }
+  
+  protected static void checkProxyIsAlive(final CacheClientProxy proxy) {
+    WaitCriterion ev = new WaitCriterion() {
+      public boolean done() {
+        return proxy.isAlive();
+      }
+      public String description() {
+        return null;
+      }
+    };
+    DistributedTestCase.waitForCriterion(ev, 15 * 1000, 200, true);
+  }
+  
+  protected static int getNumberOfClientProxies() {
+    return getBridgeServer().getAcceptor().getCacheClientNotifier()
+        .getClientProxies().size();
+  }
+  
+  protected static CacheServerImpl getBridgeServer() {
+    CacheServerImpl bridgeServer = (CacheServerImpl) CacheServerTestUtil
+        .getCache().getCacheServers().iterator().next();
+    assertNotNull(bridgeServer);
+    return bridgeServer;
+  }
+  
+
+  protected Pool getClientPool(String host, int server1Port, int server2Port, boolean establishCallbackConnection, int redundancyLevel){
+    PoolFactory pf = PoolManager.createFactory();
+    pf.addServer(host, server1Port)
+      .addServer(host, server2Port)
+      .setSubscriptionEnabled(establishCallbackConnection)
+      .setSubscriptionRedundancy(redundancyLevel)
+      .setSubscriptionAckInterval(1);
+    return ((PoolFactoryImpl)pf).getPoolAttributes();
+  }
+  
+  /**
+   * Returns the durable client proxy's HARegionQueue region name. This method
+   * is accessed via reflection on a server VM.
+   * @return the durable client proxy's HARegionQueue region name
+   */
+  protected static String getHARegionQueueName() {
+    checkNumberOfClientProxies(1);
+    CacheClientProxy proxy = getClientProxy();
+    assertNotNull(proxy);
+    return proxy.getHARegionName();
+  }
+  
+  public static void verifyReceivedMarkerAck(final CacheClientProxy proxy) {
+    WaitCriterion ev = new WaitCriterion() {
+      public boolean done() {
+        GemFireCacheImpl.getInstance().getLoggerI18n().fine(
+            "DurableClientDUnitTest->WaitCriterion :: done called");
+        return checkForAck(proxy);
+      }
+      public String description() {
+        return "never received marker ack";
+      }
+    };
+    DistributedTestCase.waitForCriterion(ev, 3 * 60 * 1000, 200/*0*/, true);
+  }
+
+  /**
+   * This is an incredibly ugly test to see if we got an ack from the client.
+   * the dispatched messages map is <b> static<b> map, which has
+   * region queue names for keys and MapWrappers (an protected class)
+   * as values.  All this is testing is to see that this queue has an entry in the dispatchedMessages
+   * map, which means it got at least one periodic ack.
+   * @return true if there was an ack
+   */
+  protected static boolean checkForAck(CacheClientProxy proxy) {
+      //pause(5000);
+      return HARegionQueue.isTestMarkerMessageRecieved();
+  }
+  
+  protected static void setTestFlagToVerifyActForMarker(Boolean flag){
+    HARegionQueue.setUsedByTest(flag.booleanValue());
+  }
+  
+  public static void setBridgeObeserverForAfterPrimaryRecovered() {
+    DurableClientTestCase.isPrimaryRecovered = false;
+    PoolImpl.AFTER_PRIMARY_RECOVERED_CALLBACK_FLAG = true;
+    ClientServerObserver bo = ClientServerObserverHolder
+        .setInstance(new ClientServerObserverAdapter() {
+          public void afterPrimaryRecovered(ServerLocation location) {
+            DurableClientTestCase.isPrimaryRecovered = true;
+            PoolImpl.AFTER_PRIMARY_RECOVERED_CALLBACK_FLAG = false;
+          }
+        });
+  }
+  
+  public void setPrimaryRecoveryCheck() {
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Set observer") {
+      public void run2() {
+        setBridgeObeserverForAfterPrimaryRecovered();
+      }
+    });
+  }
+  
+  public void checkPrimaryRecovery() {
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Check observer") {
+      public void run2() {
+        WaitCriterion waitForPrimaryRecovery = new WaitCriterion() {
+          public boolean done() {
+            return DurableClientTestCase.isPrimaryRecovered;
+          }
+
+          public String description() {
+            return "Did not detect primary recovery event during wait period";
+          }
+        };
+        
+        // wait for primary (and interest) recovery
+        // recovery satisfier task currently uses ping interval value
+        DistributedTestCase.waitForCriterion(waitForPrimaryRecovery, 30000, 1000, true);
+      }
+    });
+  }
+  
+  
+
+  protected void sendClientReady(VM vm) {
+   // Send clientReady message
+    vm.invoke(new CacheSerializableRunnable(
+        "Send clientReady") {
+      public void run2() throws CacheException {
+        CacheServerTestUtil.getCache().readyForEvents();
+      }
+    });
+  }
+  
+  protected void registerInterest(VM vm, final String regionName, final boolean durable) {
+    vm.invoke(new CacheSerializableRunnable("Register interest on region : " + regionName) {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Register interest in all keys
+        region.registerInterestRegex(".*", InterestResultPolicy.NONE, durable);
+      }
+    });
+  }
+  
+  protected void createCq(VM vm, final String cqName, final String cqQuery, final boolean durable) {
+    vm.invoke(new CacheSerializableRunnable(
+        "Register cq " + cqName) {
+      public void run2() throws CacheException {
+        
+        try {
+          createCq(cqName, cqQuery, durable).execute();
+        }
+        catch (CqExistsException e) {
+          throw new CacheException(e) {};
+        }
+        catch (CqException e) {
+          throw new CacheException(e) {};
+        }        
+        catch (RegionNotFoundException e) {
+          throw new CacheException(e) {};
+        }
+        
+      }
+    });
+  }
+  
+  protected void publishEntries(VM vm, final String regionName, final int numEntries) {
+    vm.invoke(new CacheSerializableRunnable(
+        "publish " + numEntries + " entries") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Publish some entries
+        for (int i = 0; i < numEntries; i++) {
+          String keyAndValue = String.valueOf(i);
+          region.put(keyAndValue, new Portfolio(i));
+        }
+      }
+    });
+  }
+  
+  /*
+   * Due to the way removal from ha region queue is implemented
+   * a dummy cq or interest needs to be created and a dummy value used so that
+   * none of the actual cqs will be triggered and yet an event will
+   * flush the queue
+   */
+  protected void flushEntries(VM server, VM client, final String regionName) {
+    //This wait is to make sure that all acks have been responded to...
+    //We can add a stat later on the cache client proxy stats that checks 
+    //ack counts
+    try {
+      Thread.sleep(2000);
+    }
+    catch (InterruptedException e) {
+      Thread.currentThread().interrupt();
+    }
+
+    registerInterest(client, regionName, false);
+    server.invoke(new CacheSerializableRunnable("flush entries") {
+      public void run2() throws CacheException {
+        CqService service = ((InternalCache) CacheServerTestUtil.getCache()).getCqService();
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+        region.put("LAST", "ENTRY");
+      }
+    });
+  }
+  
+  
+  protected void checkCqStatOnServer(VM server, final String durableClientId, final String cqName, final int expectedNumber) {
+    server.invoke(new CacheSerializableRunnable(
+        "Check ha queued cq stats for durable client " + durableClientId + " cq: " + cqName) {
+      public void run2() throws CacheException {
+
+        final CacheClientNotifier ccnInstance = CacheClientNotifier
+            .getInstance();
+        final CacheClientProxy clientProxy = ccnInstance
+            .getClientProxy(durableClientId);
+        ClientProxyMembershipID proxyId = clientProxy.getProxyID();
+        CqService cqService = ((InternalCache)CacheServerTestUtil.getCache()).getCqService();
+        cqService.start();
+        final CqQueryImpl cqQuery = (CqQueryImpl)cqService.getClientCqFromServer(proxyId, cqName);
+       
+        //Wait until we get the expected number of events or until 10 seconds are up
+        WaitCriterion ev = new WaitCriterion() {
+          public boolean done() {
+            return cqQuery.getVsdStats().getNumHAQueuedEvents() == expectedNumber;
+          }
+          public String description() {
+            return "cq numHAQueuedEvents stat was expected to be " + expectedNumber + " but was instead " + cqQuery.getVsdStats().getNumHAQueuedEvents();
+          }
+        };
+        DistributedTestCase.waitForCriterion(ev, 10 * 1000, 200, true);
+        
+        assertEquals(expectedNumber, cqQuery.getVsdStats().getNumHAQueuedEvents());
+      }
+    });
+  }
+  
+  /*
+   * Remaining is the number of events that could still be in the queue due to timing issues with acks
+   * and receiving them after remove from ha queue region has been called.
+   */
+  protected void checkHAQueueSize(VM server, final String durableClientId, final int expectedNumber, final int remaining) {
+    server.invoke(new CacheSerializableRunnable(
+        "Check ha queued size for durable client " + durableClientId) {
+      public void run2() throws CacheException {
+
+        final CacheClientNotifier ccnInstance = CacheClientNotifier
+            .getInstance();
+        final CacheClientProxy clientProxy = ccnInstance
+            .getClientProxy(durableClientId);
+        ClientProxyMembershipID proxyId = clientProxy.getProxyID();
+        
+        //Wait until we get the expected number of events or until 10 seconds are up
+        WaitCriterion ev = new WaitCriterion() {
+          public boolean done() {
+            return clientProxy.getQueueSizeStat() == expectedNumber || clientProxy.getQueueSizeStat() == remaining;
+          }
+          public String description() {
+            return "queue size stat was expected to be " + expectedNumber + " but was instead " + clientProxy.getQueueSizeStat();
+          }
+        };
+        DistributedTestCase.waitForCriterion(ev, 10 * 1000, 200, true);
+        
+        assertTrue(clientProxy.getQueueSizeStat() == expectedNumber || clientProxy.getQueueSizeStat() == remaining);
+      }
+    });
+  }
+  
+  protected void checkNumDurableCqs(VM server, final String durableClientId, final int expectedNumber) {
+    server.invoke(new CacheSerializableRunnable(
+        "check number of durable cqs on server for durable client: " + durableClientId){
+        public void run2() throws CacheException {
+          try {
+            final CacheClientNotifier ccnInstance = CacheClientNotifier
+                .getInstance();
+            final CacheClientProxy clientProxy = ccnInstance
+                .getClientProxy(durableClientId);
+            ClientProxyMembershipID proxyId = clientProxy.getProxyID();
+            CqService cqService = ((InternalCache)CacheServerTestUtil.getCache()).getCqService();
+            cqService.start();
+            List<String> cqNames = cqService.getAllDurableClientCqs(proxyId);
+            assertEquals(expectedNumber, cqNames.size());
+          }
+          catch (Exception e) {
+            throw new CacheException(e){};
+          }
+        }
+    });
+  }
+  
+  /*
+   * @param vm
+   * @param cqName
+   * @param numEvents
+   * @param numEventsToWaitFor most times will be the same as numEvents,
+            but there are times where we want to wait for an event we know is 
+            not coming just to be sure an event actually isnt received
+   * @param secondsToWait
+   */
+  protected void checkCqListenerEvents(VM vm, final String cqName, final int numEvents, final int numEventsToWaitFor, final int secondsToWait) {
+    vm.invoke(new CacheSerializableRunnable("Verify events for cq: " + cqName) {
+      public void run2() throws CacheException {
+        QueryService qs = CacheServerTestUtil.getCache().getQueryService();
+        CqQuery cq = qs.getCq(cqName);
+        // Get the listener and wait for the appropriate number of events
+        CacheServerTestUtil.ControlCqListener listener = (CacheServerTestUtil.ControlCqListener) cq.getCqAttributes().getCqListener();
+        listener.waitWhileNotEnoughEvents(secondsToWait * 1000, numEventsToWaitFor);
+        assertEquals(numEvents, listener.events.size());
+      }
+    });
+  }
+  
+  protected void checkInterestEvents(VM vm, final String regionName, final int numEvents) {
+    vm.invoke(new CacheSerializableRunnable("Verify interest events") {
+      public void run2() throws CacheException {
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+
+        CacheServerTestUtil.ControlListener clistener = (CacheServerTestUtil.ControlListener) region
+            .getAttributes().getCacheListeners()[0];
+        clistener.waitWhileNotEnoughEvents(30000, numEvents);
+        assertEquals(numEvents, clistener.events.size());      
+        }
+    });
+  }
+  
+  protected void startDurableClient(VM vm, String durableClientId, int serverPort1, String regionName, int durableTimeoutInSeconds) {
+    vm.invoke(
+        CacheServerTestUtil.class,
+        "createCacheClient",
+        new Object[] {
+            getClientPool(getServerHostName(durableClientVM.getHost()),
+                serverPort1, true), regionName,
+            getClientDistributedSystemProperties(durableClientId, durableTimeoutInSeconds),
+            Boolean.TRUE });
+  }
+  
+  protected void startDurableClient(VM vm, String durableClientId, int serverPort1, String regionName) {
+    vm.invoke(
+        CacheServerTestUtil.class,
+        "createCacheClient",
+        new Object[] {
+            getClientPool(getServerHostName(durableClientVM.getHost()),
+                serverPort1, true), regionName,
+            getClientDistributedSystemProperties(durableClientId),
+            Boolean.TRUE });
+  }
+  
+  protected void startDurableClient(VM vm, String durableClientId, int serverPort1, int serverPort2, String regionName) {
+    vm.invoke(
+        CacheServerTestUtil.class,
+        "createCacheClient",
+        new Object[] {
+            getClientPool(getServerHostName(vm.getHost()),
+                serverPort1, serverPort2, true), regionName,
+            getClientDistributedSystemProperties(durableClientId),
+            Boolean.TRUE });
+  }
+  
+  protected void startClient(VM vm, int serverPort1, String regionName) {
+    vm.invoke(
+        CacheServerTestUtil.class,
+        "createCacheClient",
+        new Object[] {
+            getClientPool(getServerHostName(vm.getHost()),
+                serverPort1, false), regionName });
+  }
+  
+  protected void startClient(VM vm, int serverPort1, int serverPort2, String regionName) {
+    vm.invoke(
+        CacheServerTestUtil.class,
+        "createCacheClient",
+        new Object[] {
+            getClientPool(getServerHostName(vm.getHost()),
+                serverPort1, serverPort2, false), regionName });
+  }
+  
+  protected void verifyDurableClientOnServer(VM server, final String durableClientId) {
+    server.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        checkNumberOfClientProxies(1);
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+
+        // Verify that it is durable and its properties are correct
+        assertTrue(proxy.isDurable());
+        assertEquals(durableClientId, proxy.getDurableId());
+      }
+    });
+  }
+  
+  protected void checkPrimaryUpdater(VM vm) {
+    vm.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        WaitCriterion  wc = new WaitCriterion() {
+          public boolean done() {
+            return CacheServerTestUtil.getPool().isPrimaryUpdaterAlive();
+          }
+          public String description() {
+            return "No primary updater";
+          }
+        };
+        DistributedTestCase.waitForCriterion(wc, 60 * 1000, 1000, true);
+        assertTrue(CacheServerTestUtil.getPool().isPrimaryUpdaterAlive());
+      }
+    });
+  }
+  
+  protected void closeCache(VM vm) {
+    vm.invoke(CacheServerTestUtil.class, "closeCache");
+  }
+}


[51/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
WAN and CQ code drop under the Pivotal SGA


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/6df75241
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/6df75241
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/6df75241

Branch: refs/heads/develop
Commit: 6df752411f57454df10753c50651ebd9154b8b2b
Parents: 731c668
Author: Roman Shaposhnik <rv...@apache.org>
Authored: Tue Jan 19 18:21:09 2016 -0800
Committer: Roman Shaposhnik <rv...@apache.org>
Committed: Tue Jan 19 18:21:09 2016 -0800

----------------------------------------------------------------------
 gemfire-cq/build.gradle                         |    6 +
 .../cache/client/internal/CloseCQOp.java        |   63 +
 .../cache/client/internal/CreateCQOp.java       |  154 +
 .../cache/client/internal/CreateCQWithIROp.java |   83 +
 .../cache/client/internal/GetDurableCQsOp.java  |  126 +
 .../client/internal/ServerCQProxyImpl.java      |  102 +
 .../gemfire/cache/client/internal/StopCQOp.java |   63 +
 .../cache/query/internal/cq/ClientCQImpl.java   |  599 ++
 .../internal/cq/CqAttributesMutatorImpl.java    |   60 +
 .../cache/query/internal/cq/CqConflatable.java  |  214 +
 .../cache/query/internal/cq/CqEventImpl.java    |  154 +
 .../cache/query/internal/cq/CqListenerImpl.java |   48 +
 .../cache/query/internal/cq/CqQueryImpl.java    |  375 ++
 .../query/internal/cq/CqServiceFactoryImpl.java |   53 +
 .../cache/query/internal/cq/CqServiceImpl.java  | 2079 +++++++
 .../internal/cq/CqServiceStatisticsImpl.java    |   92 +
 .../query/internal/cq/CqServiceVsdStats.java    |  402 ++
 .../query/internal/cq/CqStatisticsImpl.java     |   67 +
 .../cache/query/internal/cq/ServerCQImpl.java   |  639 +++
 .../tier/sockets/command/BaseCQCommand.java     |   43 +
 .../cache/tier/sockets/command/CloseCQ.java     |  125 +
 .../cache/tier/sockets/command/ExecuteCQ.java   |  162 +
 .../cache/tier/sockets/command/ExecuteCQ61.java |  214 +
 .../cache/tier/sockets/command/GetCQStats.java  |   94 +
 .../tier/sockets/command/GetDurableCQs.java     |  137 +
 .../cache/tier/sockets/command/MonitorCQ.java   |   94 +
 .../cache/tier/sockets/command/StopCQ.java      |  129 +
 ...cache.query.internal.cq.spi.CqServiceFactory |    1 +
 .../gemfire/cache/query/cq/CQJUnitTest.java     |  147 +
 .../cache/query/cq/dunit/CqDataDUnitTest.java   | 1154 ++++
 .../dunit/CqDataOptimizedExecuteDUnitTest.java  |   46 +
 .../cq/dunit/CqDataUsingPoolDUnitTest.java      | 1559 ++++++
 ...qDataUsingPoolOptimizedExecuteDUnitTest.java |   45 +
 .../cache/query/cq/dunit/CqPerfDUnitTest.java   | 1036 ++++
 .../cq/dunit/CqPerfUsingPoolDUnitTest.java      |  996 ++++
 .../cache/query/cq/dunit/CqQueryDUnitTest.java  | 3996 ++++++++++++++
 .../dunit/CqQueryOptimizedExecuteDUnitTest.java |  303 ++
 .../cq/dunit/CqQueryUsingPoolDUnitTest.java     | 3315 +++++++++++
 ...QueryUsingPoolOptimizedExecuteDUnitTest.java |   42 +
 .../cq/dunit/CqResultSetUsingPoolDUnitTest.java | 1131 ++++
 ...ltSetUsingPoolOptimizedExecuteDUnitTest.java |  223 +
 .../cache/query/cq/dunit/CqStateDUnitTest.java  |  119 +
 .../cache/query/cq/dunit/CqStatsDUnitTest.java  |  433 ++
 .../dunit/CqStatsOptimizedExecuteDUnitTest.java |   43 +
 .../cq/dunit/CqStatsUsingPoolDUnitTest.java     |  444 ++
 ...StatsUsingPoolOptimizedExecuteDUnitTest.java |   43 +
 .../query/cq/dunit/CqTimeTestListener.java      |  258 +
 .../PartitionedRegionCqQueryDUnitTest.java      | 1780 ++++++
 ...dRegionCqQueryOptimizedExecuteDUnitTest.java |  238 +
 .../query/cq/dunit/PrCqUsingPoolDUnitTest.java  | 2021 +++++++
 .../PrCqUsingPoolOptimizedExecuteDUnitTest.java |   42 +
 .../cache/query/dunit/PdxQueryCQDUnitTest.java  |  686 +++
 .../cache/query/dunit/PdxQueryCQTestBase.java   |  500 ++
 .../dunit/QueryIndexUpdateRIDUnitTest.java      |  814 +++
 .../query/dunit/QueryMonitorDUnitTest.java      | 1292 +++++
 .../cache/snapshot/ClientSnapshotDUnitTest.java |  276 +
 .../AnalyzeCQSerializablesJUnitTest.java        |   70 +
 .../cache/PRDeltaPropagationDUnitTest.java      | 1204 ++++
 .../internal/cache/PutAllCSDUnitTest.java       | 4408 +++++++++++++++
 .../cache/RemoteCQTransactionDUnitTest.java     | 1106 ++++
 .../internal/cache/ha/CQListGIIDUnitTest.java   |  814 +++
 .../cache/ha/HADispatcherDUnitTest.java         |  687 +++
 .../sockets/ClientToServerDeltaDUnitTest.java   | 1029 ++++
 .../DeltaPropagationWithCQDUnitTest.java        |  336 ++
 ...ToRegionRelationCQRegistrationDUnitTest.java |  778 +++
 .../sockets/DurableClientCrashDUnitTest.java    |   90 +
 .../sockets/DurableClientNetDownDUnitTest.java  |   71 +
 .../sockets/DurableClientSimpleDUnitTest.java   | 3356 ++++++++++++
 .../tier/sockets/DurableClientTestCase.java     | 2010 +++++++
 .../CacheServerManagementDUnitTest.java         |  564 ++
 .../cli/commands/ClientCommandsDUnitTest.java   | 1435 +++++
 .../DurableClientCommandsDUnitTest.java         |  404 ++
 .../internal/pulse/TestCQDUnitTest.java         |  139 +
 .../internal/pulse/TestClientsDUnitTest.java    |  101 +
 .../internal/pulse/TestServerDUnitTest.java     |   91 +
 .../ClientAuthorizationTwoDUnitTest.java        |  237 +
 .../security/ClientAuthzObjectModDUnitTest.java |  408 ++
 .../ClientCQPostAuthorizationDUnitTest.java     |  514 ++
 .../ClientPostAuthorizationDUnitTest.java       |  390 ++
 .../gemfire/security/MultiuserAPIDUnitTest.java |  382 ++
 .../MultiuserDurableCQAuthzDUnitTest.java       |  484 ++
 gemfire-cq/src/test/resources/.keepme           |    0
 .../gemfire/codeAnalysis/excludedClasses.txt    |    2 +
 .../gemstone/gemfire/codeAnalysis/openBugs.txt  |   21 +
 .../sanctionedDataSerializables.txt             |    4 +
 .../codeAnalysis/sanctionedSerializables.txt    |    1 +
 .../tier/sockets/durablecq-client-cache.xml     |   21 +
 .../tier/sockets/durablecq-server-cache.xml     |   16 +
 .../src/test/resources/cq/statistics/cqStats.bt |    3 +
 .../resources/cq/statistics/cqStatsHCT.conf     |  100 +
 gemfire-wan/build.gradle                        |    5 +
 gemfire-wan/src/main/java/.keepme               |    0
 .../client/internal/GatewaySenderBatchOp.java   |  304 ++
 .../cache/client/internal/SenderProxy.java      |   34 +
 .../internal/locator/wan/LocatorDiscovery.java  |  218 +
 .../internal/locator/wan/LocatorHelper.java     |  134 +
 .../locator/wan/LocatorJoinMessage.java         |   96 +
 .../wan/LocatorMembershipListenerImpl.java      |  221 +
 .../locator/wan/RemoteLocatorJoinRequest.java   |   78 +
 .../locator/wan/RemoteLocatorJoinResponse.java  |   80 +
 .../locator/wan/RemoteLocatorPingRequest.java   |   47 +
 .../locator/wan/RemoteLocatorPingResponse.java  |   46 +
 .../locator/wan/RemoteLocatorRequest.java       |   57 +
 .../locator/wan/RemoteLocatorResponse.java      |   65 +
 .../internal/locator/wan/WANFactoryImpl.java    |   58 +
 .../locator/wan/WanLocatorDiscovererImpl.java   |  129 +
 .../cache/wan/AbstractRemoteGatewaySender.java  |  153 +
 .../cache/wan/GatewayReceiverFactoryImpl.java   |  140 +
 .../internal/cache/wan/GatewayReceiverImpl.java |  245 +
 .../wan/GatewaySenderEventRemoteDispatcher.java |  758 +++
 .../cache/wan/GatewaySenderFactoryImpl.java     |  381 ++
 .../wan/parallel/ParallelGatewaySenderImpl.java |  261 +
 ...rentParallelGatewaySenderEventProcessor.java |   51 +
 ...moteParallelGatewaySenderEventProcessor.java |  106 +
 ...urrentSerialGatewaySenderEventProcessor.java |   29 +
 ...RemoteSerialGatewaySenderEventProcessor.java |   34 +
 .../wan/serial/SerialGatewaySenderImpl.java     |  253 +
 gemfire-wan/src/main/resources/.keepme          |    0
 ...ternal.locator.wan.LocatorMembershipListener |    1 +
 ...ne.gemfire.internal.cache.wan.spi.WANFactory |    1 +
 .../cache/CacheXml70GatewayDUnitTest.java       |  227 +
 .../cache/CacheXml80GatewayDUnitTest.java       |   61 +
 .../AnalyzeWANSerializablesJUnitTest.java       |   82 +
 .../internal/cache/UpdateVersionDUnitTest.java  |  955 ++++
 .../gemfire/internal/cache/wan/WANTestBase.java | 5143 ++++++++++++++++++
 ...oncurrentParallelGatewaySenderDUnitTest.java |  855 +++
 ...ntParallelGatewaySenderOffHeapDUnitTest.java |   16 +
 ...allelGatewaySenderOperation_1_DUnitTest.java |  846 +++
 ...allelGatewaySenderOperation_2_DUnitTest.java |  967 ++++
 ...tSerialGatewaySenderOperationsDUnitTest.java |  509 ++
 ...GatewaySenderOperationsOffHeapDUnitTest.java |   16 +
 .../ConcurrentWANPropogation_1_DUnitTest.java   |  603 ++
 .../ConcurrentWANPropogation_2_DUnitTest.java   |  480 ++
 .../cache/wan/disttx/DistTXWANDUnitTest.java    |  194 +
 .../CommonParallelGatewaySenderDUnitTest.java   |  476 ++
 ...onParallelGatewaySenderOffHeapDUnitTest.java |   16 +
 ...wWANConcurrencyCheckForDestroyDUnitTest.java |  521 ++
 .../cache/wan/misc/PDXNewWanDUnitTest.java      |  779 +++
 ...dRegion_ParallelWANPersistenceDUnitTest.java |  744 +++
 ...dRegion_ParallelWANPropogationDUnitTest.java | 1124 ++++
 .../SenderWithTransportFilterDUnitTest.java     |  266 +
 ...downAllPersistentGatewaySenderDUnitTest.java |  197 +
 .../wan/misc/WANConfigurationJUnitTest.java     |  608 +++
 .../wan/misc/WANLocatorServerDUnitTest.java     |  185 +
 .../cache/wan/misc/WANSSLDUnitTest.java         |  136 +
 .../wan/misc/WanAutoDiscoveryDUnitTest.java     |  549 ++
 .../cache/wan/misc/WanValidationsDUnitTest.java | 1669 ++++++
 ...GatewaySenderOperationsOffHeapDUnitTest.java |   18 +
 ...ewaySenderQueueOverflowOffHeapDUnitTest.java |   18 +
 .../ParallelWANConflationOffHeapDUnitTest.java  |   18 +
 ...nceEnabledGatewaySenderOffHeapDUnitTest.java |   18 +
 ...ropogationConcurrentOpsOffHeapDUnitTest.java |   18 +
 .../ParallelWANPropogationOffHeapDUnitTest.java |   18 +
 ...erialGatewaySenderQueueOffHeapDUnitTest.java |   18 +
 ...nceEnabledGatewaySenderOffHeapDUnitTest.java |   18 +
 .../SerialWANPropogationOffHeapDUnitTest.java   |   18 +
 ...ation_PartitionedRegionOffHeapDUnitTest.java |   18 +
 ...arallelGatewaySenderOperationsDUnitTest.java | 1981 +++++++
 ...llelGatewaySenderQueueOverflowDUnitTest.java |  523 ++
 .../ParallelWANConflationDUnitTest.java         |  791 +++
 ...ersistenceEnabledGatewaySenderDUnitTest.java | 1815 ++++++
 ...llelWANPropagationClientServerDUnitTest.java |  109 +
 ...lelWANPropagationConcurrentOpsDUnitTest.java |  282 +
 .../ParallelWANPropagationDUnitTest.java        | 1440 +++++
 ...ParallelWANPropagationLoopBackDUnitTest.java |  416 ++
 .../wan/parallel/ParallelWANStatsDUnitTest.java |  621 +++
 ...tewaySenderDistributedDeadlockDUnitTest.java |  391 ++
 ...rialGatewaySenderEventListenerDUnitTest.java |  382 ++
 .../SerialGatewaySenderOperationsDUnitTest.java |  688 +++
 .../SerialGatewaySenderQueueDUnitTest.java      |  329 ++
 ...ersistenceEnabledGatewaySenderDUnitTest.java |  597 ++
 .../SerialWANPropagationLoopBackDUnitTest.java  |  529 ++
 .../serial/SerialWANPropogationDUnitTest.java   | 1594 ++++++
 ...NPropogation_PartitionedRegionDUnitTest.java |  431 ++
 .../SerialWANPropogationsFeatureDUnitTest.java  |  364 ++
 .../wan/serial/SerialWANStatsDUnitTest.java     |  588 ++
 .../wan/wancommand/WANCommandTestBase.java      |  505 ++
 ...anCommandCreateGatewayReceiverDUnitTest.java |  691 +++
 .../WanCommandCreateGatewaySenderDUnitTest.java |  754 +++
 ...WanCommandGatewayReceiverStartDUnitTest.java |  319 ++
 .../WanCommandGatewayReceiverStopDUnitTest.java |  324 ++
 .../WanCommandGatewaySenderStartDUnitTest.java  |  407 ++
 .../WanCommandGatewaySenderStopDUnitTest.java   |  358 ++
 .../wan/wancommand/WanCommandListDUnitTest.java |  394 ++
 .../WanCommandPauseResumeDUnitTest.java         |  707 +++
 .../wancommand/WanCommandStatusDUnitTest.java   |  573 ++
 .../management/WANManagementDUnitTest.java      |  519 ++
 .../ClusterConfigurationDUnitTest.java          | 1038 ++++
 .../pulse/TestRemoteClusterDUnitTest.java       |  267 +
 gemfire-wan/src/test/resources/.keepme          |    0
 .../gemfire/codeAnalysis/excludedClasses.txt    |    2 +
 .../gemstone/gemfire/codeAnalysis/openBugs.txt  |   21 +
 .../sanctionedDataSerializables.txt             |   28 +
 .../codeAnalysis/sanctionedSerializables.txt    |    0
 194 files changed, 93803 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/build.gradle
----------------------------------------------------------------------
diff --git a/gemfire-cq/build.gradle b/gemfire-cq/build.gradle
new file mode 100644
index 0000000..ed92c42
--- /dev/null
+++ b/gemfire-cq/build.gradle
@@ -0,0 +1,6 @@
+dependencies {
+  provided project(':gemfire-core')
+  provided project(':gemfire-test')
+  provided project(path: ':gemfire-core', configuration: 'testOutput')
+  provided project(path: ':gemfire-junit', configuration: 'testOutput')
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CloseCQOp.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CloseCQOp.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CloseCQOp.java
new file mode 100644
index 0000000..f1c608f
--- /dev/null
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CloseCQOp.java
@@ -0,0 +1,63 @@
+/*=========================================================================
+ * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.client.internal;
+
+import com.gemstone.gemfire.cache.client.internal.AbstractOp;
+import com.gemstone.gemfire.cache.client.internal.ConnectionStats;
+import com.gemstone.gemfire.cache.client.internal.ExecutablePool;
+import com.gemstone.gemfire.cache.client.internal.CreateCQOp.CreateCQOpImpl;
+import com.gemstone.gemfire.internal.cache.tier.MessageType;
+
+/**
+ * Close a continuous query on the server
+ * @author darrel
+ * @since 5.7
+ */
+public class CloseCQOp {
+  /**
+   * Close a continuous query on the given server using connections from the given pool
+   * to communicate with the server.
+   * @param pool the pool to use to communicate with the server.
+   * @param cqName name of the CQ to close
+   */
+  public static void execute(ExecutablePool pool, String cqName)
+  {
+    AbstractOp op = new CloseCQOpImpl(cqName);
+    pool.executeOnAllQueueServers(op);
+  }
+                                                               
+  private CloseCQOp() {
+    // no instances allowed
+  }
+  
+  private static class CloseCQOpImpl extends CreateCQOpImpl {
+    /**
+     * @throws com.gemstone.gemfire.SerializationException if serialization fails
+     */
+    public CloseCQOpImpl(String cqName) {
+      super(MessageType.CLOSECQ_MSG_TYPE, 1);
+      getMessage().addStringPart(cqName);
+    }
+    @Override
+    protected String getOpName() {
+      return "closeCQ";
+    }
+    @Override
+    protected long startAttempt(ConnectionStats stats) {
+      return stats.startCloseCQ();
+    }
+    @Override
+    protected void endSendAttempt(ConnectionStats stats, long start) {
+      stats.endCloseCQSend(start, hasFailed());
+    }
+    @Override
+    protected void endAttempt(ConnectionStats stats, long start) {
+      stats.endCloseCQ(start, hasTimedOut(), hasFailed());
+    }
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CreateCQOp.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CreateCQOp.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CreateCQOp.java
new file mode 100644
index 0000000..438cb70
--- /dev/null
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CreateCQOp.java
@@ -0,0 +1,154 @@
+/*=========================================================================
+ * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.client.internal;
+
+import com.gemstone.gemfire.internal.Version;
+import com.gemstone.gemfire.internal.cache.tier.MessageType;
+import com.gemstone.gemfire.internal.cache.tier.sockets.Message;
+import com.gemstone.gemfire.internal.cache.tier.sockets.ChunkedMessage;
+import com.gemstone.gemfire.internal.cache.tier.sockets.Part;
+import com.gemstone.gemfire.security.NotAuthorizedException;
+import com.gemstone.gemfire.InternalGemFireError;
+import com.gemstone.gemfire.cache.client.ServerOperationException;
+import com.gemstone.gemfire.cache.client.internal.AbstractOp;
+import com.gemstone.gemfire.cache.client.internal.Connection;
+import com.gemstone.gemfire.cache.client.internal.ConnectionStats;
+import com.gemstone.gemfire.cache.client.internal.ExecutablePool;
+
+/**
+ * Creates a CQ on a server
+ * @author darrel
+ * @since 5.7
+ */
+public class CreateCQOp {
+  /**
+   * Create a continuous query on the server using connections from the given pool
+   * to communicate with the server.
+   * @param pool the pool to use to communicate with the server.
+   * @param cqName name of the CQ to create
+   * @param queryStr string OQL statement to be executed
+   * @param cqState int cqState to be set.
+   * @param isDurable true if CQ is durable
+   * @param regionDataPolicy the data policy ordinal of the region
+   */
+  public static Object execute(ExecutablePool pool, String cqName,
+      String queryStr, int cqState, boolean isDurable, byte regionDataPolicy)
+  {
+    AbstractOp op = new CreateCQOpImpl(cqName, queryStr, cqState,
+        isDurable, regionDataPolicy);
+    return pool.executeOnQueuesAndReturnPrimaryResult(op);
+  }
+  
+  
+  /**
+   * Create a continuous query on the server using a specific connections from the given pool.
+   * @param pool the pool to use to communicate with the server.
+   * @param conn the actual connection to use
+   * @param cqName name of the CQ to create
+   * @param queryStr string OQL statement to be executed
+   * @param cqState int cqState to be set.
+   * @param isDurable true if CQ is durable
+   * @param regionDataPolicy the data policy ordinal of the region
+   */
+  public static Object executeOn(ExecutablePool pool, Connection conn,
+      String cqName, String queryStr, int cqState, boolean isDurable,
+      byte regionDataPolicy)
+  {
+    AbstractOp op = new CreateCQOpImpl(cqName, queryStr, cqState,
+        isDurable, regionDataPolicy);
+    return pool.executeOn(conn,op);
+  }
+  
+                                                               
+  private CreateCQOp() {
+    // no instances allowed
+  }
+
+  /**
+   * Note both StopCQOpImpl and CloseCQOpImpl extend this class
+   */
+  protected static class CreateCQOpImpl extends AbstractOp {
+    /**
+     * @throws com.gemstone.gemfire.SerializationException if serialization fails
+     */
+    public CreateCQOpImpl(String cqName, String queryStr, int cqState,
+        boolean isDurable, byte regionDataPolicy) {
+      super(MessageType.EXECUTECQ_MSG_TYPE, 5);
+      getMessage().addStringPart(cqName);
+      getMessage().addStringPart(queryStr);
+      getMessage().addIntPart(cqState);
+      {
+        byte durableByte = (byte)(isDurable ? 0x01 : 0x00);
+        getMessage().addBytesPart(new byte[] {durableByte});
+      }
+      getMessage().addBytesPart(new byte[] {regionDataPolicy});
+    }
+    @Override  
+    protected Message createResponseMessage() {
+      return new ChunkedMessage(1, Version.CURRENT);
+    }
+    @Override  
+    protected Object processResponse(Message m) throws Exception {
+      ChunkedMessage msg = (ChunkedMessage)m;
+      msg.readHeader();
+      int msgType = msg.getMessageType();
+      msg.receiveChunk();
+      if (msgType == MessageType.REPLY) {
+        return Boolean.TRUE;
+      } else {
+        if (msgType == MessageType.EXCEPTION) {
+          Part part = msg.getPart(0);
+          String s = "While performing a remote " + getOpName();
+          throw new ServerOperationException(s, (Throwable) part.getObject());
+        } else if (isErrorResponse(msgType)) {
+          Part part = msg.getPart(0);
+          // Dan Smith- a hack, but I don't want to change the protocol right
+          // now. We need to throw a security exception so that the exception
+          // will be propagated up properly. Ideally, this exception would be
+          // contained in the message..
+          String errorMessage = part.getString();
+          if(errorMessage.indexOf("Not authorized") >= 0) {
+            throw new NotAuthorizedException(errorMessage);
+          }
+          
+          throw new ServerOperationException(errorMessage);
+        } else {
+          throw new InternalGemFireError("Unexpected message type "
+                                         + MessageType.getString(msgType));
+        }
+      }
+    }
+    /**
+     * This constructor is for our subclasses
+     * @throws com.gemstone.gemfire.SerializationException if serialization fails
+     */
+    protected CreateCQOpImpl(int msgType, int numParts) {
+      super(msgType, numParts);
+    }
+    protected String getOpName() {
+      return "createCQ";
+    }
+    @Override  
+    protected boolean isErrorResponse(int msgType) {
+      return msgType == MessageType.CQDATAERROR_MSG_TYPE
+        || msgType == MessageType.CQ_EXCEPTION_TYPE;
+    }
+    @Override  
+    protected long startAttempt(ConnectionStats stats) {
+      return stats.startCreateCQ();
+    }
+    @Override  
+    protected void endSendAttempt(ConnectionStats stats, long start) {
+      stats.endCreateCQSend(start, hasFailed());
+    }
+    @Override  
+    protected void endAttempt(ConnectionStats stats, long start) {
+      stats.endCreateCQ(start, hasTimedOut(), hasFailed());
+    }
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CreateCQWithIROp.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CreateCQWithIROp.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CreateCQWithIROp.java
new file mode 100644
index 0000000..394d239
--- /dev/null
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CreateCQWithIROp.java
@@ -0,0 +1,83 @@
+/*=========================================================================
+ * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.client.internal;
+
+import com.gemstone.gemfire.cache.client.internal.AbstractOp;
+import com.gemstone.gemfire.cache.client.internal.ConnectionStats;
+import com.gemstone.gemfire.cache.client.internal.ExecutablePool;
+import com.gemstone.gemfire.cache.client.internal.QueryOp;
+import com.gemstone.gemfire.cache.client.internal.QueryOp.QueryOpImpl;
+import com.gemstone.gemfire.cache.query.SelectResults;
+import com.gemstone.gemfire.internal.cache.tier.MessageType;
+
+/**
+ * Creates a CQ and fetches initial results on a server
+ * @author darrel
+ * @since 5.7
+ */
+public class CreateCQWithIROp {
+  /**
+   * Create a continuous query on the server using connections from the given pool
+   * to communicate with the server.
+   * @param pool the pool to use to communicate with the server.
+   * @param cqName name of the CQ to create
+   * @param queryStr string OQL statement to be executed
+   * @param cqState int cqState to be set.
+   * @param isDurable true if CQ is durable
+   * @param regionDataPolicy the data policy ordinal of the region
+   */
+  public static SelectResults execute(ExecutablePool pool, String cqName,
+      String queryStr, int cqState, boolean isDurable, byte regionDataPolicy)
+  {
+    AbstractOp op = new CreateCQWithIROpImpl(cqName,
+        queryStr, cqState, isDurable, regionDataPolicy);
+    return (SelectResults)pool.executeOnQueuesAndReturnPrimaryResult(op);
+  }
+                                                               
+  private CreateCQWithIROp() {
+    // no instances allowed
+  }
+
+  /**
+   * Note we extend QueryOpImpl to inherit processResponse and isErrorResponse
+   */
+  private static class CreateCQWithIROpImpl extends QueryOpImpl {
+    /**
+     * @throws com.gemstone.gemfire.SerializationException if serialization fails
+     */
+    public CreateCQWithIROpImpl(String cqName, String queryStr,
+        int cqState, boolean isDurable, byte regionDataPolicy) {
+      super(MessageType.EXECUTECQ_WITH_IR_MSG_TYPE, 5);
+      getMessage().addStringPart(cqName);
+      getMessage().addStringPart(queryStr);
+      getMessage().addIntPart(cqState);
+      {
+        byte durableByte = (byte)(isDurable ? 0x01 : 0x00);
+        getMessage().addBytesPart(new byte[] {durableByte});
+      }
+      getMessage().addBytesPart(new byte[] {regionDataPolicy});
+    }
+    @Override
+    protected String getOpName() {
+      return "createCQfetchInitialResult";
+    }
+    // using same stats as CreateCQOp
+    @Override
+    protected long startAttempt(ConnectionStats stats) {
+      return stats.startCreateCQ();
+    }
+    @Override
+    protected void endSendAttempt(ConnectionStats stats, long start) {
+      stats.endCreateCQSend(start, hasFailed());
+    }
+    @Override
+    protected void endAttempt(ConnectionStats stats, long start) {
+      stats.endCreateCQ(start, hasTimedOut(), hasFailed());
+    }
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/GetDurableCQsOp.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/GetDurableCQsOp.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/GetDurableCQsOp.java
new file mode 100755
index 0000000..39e0d6e
--- /dev/null
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/GetDurableCQsOp.java
@@ -0,0 +1,126 @@
+/*=========================================================================
+ * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.client.internal;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import com.gemstone.gemfire.InternalGemFireError;
+import com.gemstone.gemfire.cache.client.ServerOperationException;
+import com.gemstone.gemfire.cache.client.internal.AbstractOp;
+import com.gemstone.gemfire.cache.client.internal.ConnectionStats;
+import com.gemstone.gemfire.cache.client.internal.ExecutablePool;
+import com.gemstone.gemfire.cache.client.internal.CreateCQOp.CreateCQOpImpl;
+import com.gemstone.gemfire.internal.Version;
+import com.gemstone.gemfire.internal.cache.tier.MessageType;
+import com.gemstone.gemfire.internal.cache.tier.sockets.ChunkedMessage;
+import com.gemstone.gemfire.internal.cache.tier.sockets.Message;
+import com.gemstone.gemfire.internal.cache.tier.sockets.Part;
+
+/**
+ * Retrieves all durable cqs for a client from a server
+ * @author jhuynh
+ * @since 7.0
+ */
+public class GetDurableCQsOp {
+  /**
+   * Retrieves all durable continuous queries on the server using 
+   * connections from the given pool to communicate with the server.
+   * @param pool the pool to use to communicate with the server.
+   */
+  public static List<String> execute(ExecutablePool pool)
+  {
+    AbstractOp op = new GetDurableCQsOpImpl();
+    return (List<String>)pool.execute(op);
+  }
+                                                               
+  private GetDurableCQsOp() {
+    // no instances allowed
+  }
+  
+  private static class GetDurableCQsOpImpl extends CreateCQOpImpl {
+    /**
+     * @throws com.gemstone.gemfire.SerializationException if serialization fails
+     */
+    public GetDurableCQsOpImpl() {
+      super(MessageType.GETDURABLECQS_MSG_TYPE, 1 /*numparts*/);
+    }
+    @Override
+    protected String getOpName() {
+      return "getDurableCQs";
+    }
+    @Override
+    protected long startAttempt(ConnectionStats stats) {
+      return stats.startGetDurableCQs();
+    }
+    @Override
+    protected void endSendAttempt(ConnectionStats stats, long start) {
+      stats.endGetDurableCQsSend(start, hasFailed());
+    }
+    @Override
+    protected void endAttempt(ConnectionStats stats, long start) {
+      stats.endGetDurableCQs(start, hasTimedOut(), hasFailed());
+    }
+    
+    @Override  
+    protected Message createResponseMessage() {
+      return new ChunkedMessage(1, Version.CURRENT);
+    }
+    @Override  
+    protected Object processResponse(Message msg) throws Exception {
+      
+      ChunkedMessage getDurableCQsResponseMsg = (ChunkedMessage)msg;
+      final List<String> result = new LinkedList<String>();
+      final Exception[] exceptionRef = new Exception[1];
+      
+      getDurableCQsResponseMsg.readHeader();
+      final int msgType = getDurableCQsResponseMsg.getMessageType();
+      if (msgType == MessageType.RESPONSE) {
+        do {
+          getDurableCQsResponseMsg.receiveChunk();
+          //callback.handle(msg);
+          Part part = getDurableCQsResponseMsg.getPart(0);
+          Object o = part.getObject();
+          if (o instanceof Throwable) {
+            String s = "While performing a remote GetDurableCQs";
+            exceptionRef[0] = new ServerOperationException(s, (Throwable)o);
+          } else {
+            result.addAll((List)o);
+          }
+        } while (!getDurableCQsResponseMsg.isLastChunk());
+      } else {
+        if (msgType == MessageType.EXCEPTION) {
+          getDurableCQsResponseMsg.receiveChunk();
+          Part part = msg.getPart(0);
+          String s = "While performing a remote GetDurableCQs";
+          throw new ServerOperationException(s, (Throwable) part.getObject());
+          // Get the exception toString part.
+          // This was added for c++ thin client and not used in java
+          // Part exceptionToStringPart = msg.getPart(1);
+        } else if (isErrorResponse(msgType)) {
+          getDurableCQsResponseMsg.receiveChunk();
+          Part part = msg.getPart(0);
+          throw new ServerOperationException(part.getString());
+        } else {
+          throw new InternalGemFireError("Unexpected message type "
+                                         + MessageType.getString(msgType));
+        }
+      }
+      
+      if (exceptionRef[0] != null) {
+        throw exceptionRef[0];
+      } else {
+        return result;
+      }
+    }
+    @Override  
+    protected boolean isErrorResponse(int msgType) {
+      return msgType == MessageType.GET_DURABLE_CQS_DATA_ERROR;
+    }
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/ServerCQProxyImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/ServerCQProxyImpl.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/ServerCQProxyImpl.java
new file mode 100644
index 0000000..cf25f5b
--- /dev/null
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/ServerCQProxyImpl.java
@@ -0,0 +1,102 @@
+/*=========================================================================
+ * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.client.internal;
+
+import java.util.List;
+
+import com.gemstone.gemfire.cache.query.SelectResults;
+import com.gemstone.gemfire.cache.query.internal.CqStateImpl;
+import com.gemstone.gemfire.cache.query.internal.cq.ClientCQ;
+
+/**
+ * Used to send CQ operations from a client to a server
+ * @author darrel
+ * @since 5.7
+ */
+public class ServerCQProxyImpl extends ServerProxy {
+  /**
+   * Creates a server CQ proxy for the given pool name.
+   * @param pool the pool that this proxy will use to communicate with servers
+   */
+  public ServerCQProxyImpl(InternalPool pool) {
+    super(pool);
+  }
+  /**
+   * Creates a server CQ proxy given using the same pool as that of
+   * the given server proxy.
+   * @param sp server proxy whose pool we are to use
+   */
+  public ServerCQProxyImpl(ServerProxy sp) {
+    this(sp.pool);
+  }
+
+  /**
+   * Create a continuous query on the given pool
+   * @param cq the CQ to create on the server
+   */
+  public Object create(ClientCQ cq)
+  {
+    pool.getRITracker().addCq(cq, cq.isDurable());
+    byte regionDataPolicyOrdinal = cq.getCqBaseRegion()==null ? (byte) 0 : cq.getCqBaseRegion()
+        .getAttributes().getDataPolicy().ordinal;
+    return CreateCQOp.execute(this.pool, cq.getName(), cq.getQueryString(),
+        CqStateImpl.RUNNING, cq.isDurable(), regionDataPolicyOrdinal);
+  }
+  
+  /**
+   * Create a continuous query on the given server
+   * @param conn the connection to use
+   * @param cqName name of the CQ to create
+   * @param queryStr string OQL statement to be executed
+   * @param cqState int cqState to be set.
+   * @param isDurable true if CQ is durable
+   * @param regionDataPolicy the data policy ordinal of the region
+   */
+  public Object createOn(String cqName, Connection conn, String queryStr,
+      int cqState, boolean isDurable, byte regionDataPolicy)
+  {
+    
+    return CreateCQOp.executeOn(this.pool, conn, cqName, queryStr, cqState,
+        isDurable, regionDataPolicy);
+  }
+  
+  /**
+   * Create a continuous query on the given server and return the initial query results.
+   * @param cq the CQ to create on the server
+   */
+  public SelectResults createWithIR(ClientCQ cq)
+  {
+    pool.getRITracker().addCq(cq, cq.isDurable());
+    byte regionDataPolicyOrdinal = cq.getCqBaseRegion()==null ? (byte) 0 : cq.getCqBaseRegion()
+        .getAttributes().getDataPolicy().ordinal;
+    return CreateCQWithIROp.execute(this.pool, cq.getName(), cq
+        .getQueryString(), CqStateImpl.RUNNING, cq.isDurable(),regionDataPolicyOrdinal);
+  }
+
+  /**
+   * Does a CQ stop on all relevant servers
+   * @param cq the CQ to stop on the server
+   */
+  public void stop(ClientCQ cq) {
+    pool.getRITracker().removeCq(cq, cq.isDurable());
+    StopCQOp.execute(this.pool, cq.getName());
+  }
+
+  /**
+   * Does a CQ close on all relevant servers
+   * @param cq the CQ to close on the server
+   */
+  public void close(ClientCQ cq) {
+    pool.getRITracker().removeCq(cq, cq.isDurable());
+    CloseCQOp.execute(this.pool, cq.getName());
+  }
+  
+  public List<String> getAllDurableCqsFromServer() {
+    return GetDurableCQsOp.execute((ExecutablePool)pool);
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/StopCQOp.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/StopCQOp.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/StopCQOp.java
new file mode 100644
index 0000000..c156d88
--- /dev/null
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/StopCQOp.java
@@ -0,0 +1,63 @@
+/*=========================================================================
+ * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.client.internal;
+
+import com.gemstone.gemfire.cache.client.internal.AbstractOp;
+import com.gemstone.gemfire.cache.client.internal.ConnectionStats;
+import com.gemstone.gemfire.cache.client.internal.ExecutablePool;
+import com.gemstone.gemfire.cache.client.internal.CreateCQOp.CreateCQOpImpl;
+import com.gemstone.gemfire.internal.cache.tier.MessageType;
+
+/**
+ * Does a region query on a server
+ * @author darrel
+ * @since 5.7
+ */
+public class StopCQOp {
+  /**
+   * Stop a continuous query on the server using connections from the given pool
+   * to communicate with the server.
+   * @param pool the pool to use to communicate with the server.
+   * @param cqName name of the CQ to stop
+   */
+  public static void execute(ExecutablePool pool, String cqName)
+  {
+    AbstractOp op = new StopCQOpImpl(cqName);
+    pool.executeOnQueuesAndReturnPrimaryResult(op);
+  }
+                                                               
+  private StopCQOp() {
+    // no instances allowed
+  }
+  
+  private static class StopCQOpImpl extends CreateCQOpImpl {
+    /**
+     * @throws com.gemstone.gemfire.SerializationException if serialization fails
+     */
+    public StopCQOpImpl(String cqName) {
+      super(MessageType.STOPCQ_MSG_TYPE, 1);
+      getMessage().addStringPart(cqName);
+    }
+    @Override
+    protected String getOpName() {
+      return "stopCQ";
+    }
+    @Override
+    protected long startAttempt(ConnectionStats stats) {
+      return stats.startStopCQ();
+    }
+    @Override
+    protected void endSendAttempt(ConnectionStats stats, long start) {
+      stats.endStopCQSend(start, hasFailed());
+    }
+    @Override
+    protected void endAttempt(ConnectionStats stats, long start) {
+      stats.endStopCQ(start, hasTimedOut(), hasFailed());
+    }
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/ClientCQImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/ClientCQImpl.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/ClientCQImpl.java
new file mode 100644
index 0000000..b1fe8e6
--- /dev/null
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/ClientCQImpl.java
@@ -0,0 +1,599 @@
+package com.gemstone.gemfire.cache.query.internal.cq;
+
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+import org.apache.logging.log4j.Logger;
+
+import com.gemstone.gemfire.CancelException;
+import com.gemstone.gemfire.SystemFailure;
+import com.gemstone.gemfire.cache.CacheClosedException;
+import com.gemstone.gemfire.cache.client.internal.Connection;
+import com.gemstone.gemfire.cache.client.internal.ProxyCache;
+import com.gemstone.gemfire.cache.client.internal.ServerCQProxyImpl;
+import com.gemstone.gemfire.cache.client.internal.ServerRegionProxy;
+import com.gemstone.gemfire.cache.client.internal.UserAttributes;
+import com.gemstone.gemfire.cache.query.CqAttributes;
+import com.gemstone.gemfire.cache.query.CqAttributesMutator;
+import com.gemstone.gemfire.cache.query.CqClosedException;
+import com.gemstone.gemfire.cache.query.CqException;
+import com.gemstone.gemfire.cache.query.CqListener;
+import com.gemstone.gemfire.cache.query.CqResults;
+import com.gemstone.gemfire.cache.query.CqStatusListener;
+import com.gemstone.gemfire.cache.query.RegionNotFoundException;
+import com.gemstone.gemfire.cache.query.internal.CqStateImpl;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.cache.LocalRegion;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.internal.logging.LogService;
+import com.gemstone.gemfire.internal.logging.LoggingThreadGroup;
+import com.gemstone.gemfire.internal.logging.log4j.LocalizedMessage;
+import com.gemstone.gemfire.security.GemFireSecurityException;
+
+public class ClientCQImpl extends CqQueryImpl implements ClientCQ {
+  private static final Logger logger = LogService.getLogger();
+  
+  private CqAttributes cqAttributes = null;
+  
+  private volatile ServerCQProxyImpl cqProxy;
+  
+  private ProxyCache proxyCache = null;
+  
+  /** To queue the CQ Events arriving during CQ execution with 
+   * initial Results.
+   */
+  private volatile ConcurrentLinkedQueue<CqEventImpl> queuedEvents = null;
+  
+  public final Object queuedEventsSynchObject = new Object();
+  
+  private boolean connected = false;
+  
+  public ClientCQImpl(CqServiceImpl cqService, String cqName, String queryString, CqAttributes cqAttributes, ServerCQProxyImpl serverProxy, boolean isDurable)  {
+    super(cqService, cqName, queryString, isDurable);
+    this.cqAttributes = cqAttributes;
+    this.cqProxy = serverProxy;
+  }
+  
+  @Override
+  public String getServerCqName() {
+    return this.cqName;
+  }
+  
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqQuery2#getCQProxy()
+   */
+  public ServerCQProxyImpl getCQProxy() {
+    return this.cqProxy;
+  }
+  
+  /**
+   * Initializes the connection using the pool from the client region.
+   * Also sets the cqBaseRegion value of this CQ.
+   * @throws CqException
+   */
+  public void initConnectionProxy() throws CqException, RegionNotFoundException {
+    cqBaseRegion = (LocalRegion)cqService.getCache().getRegion(regionName);
+    // Check if the region exists on the local cache.
+    // In the current implementation of 5.1 the Server Connection is (ConnectionProxyImpl)
+    // is obtained by the Bridge Client/writer/loader on the local region.
+    if (cqBaseRegion == null){
+      throw new RegionNotFoundException( LocalizedStrings.CqQueryImpl_REGION_ON_WHICH_QUERY_IS_SPECIFIED_NOT_FOUND_LOCALLY_REGIONNAME_0
+          .toLocalizedString(regionName));
+    }
+    
+    ServerRegionProxy srp = cqBaseRegion.getServerProxy();
+    if (srp != null) {
+      if (logger.isTraceEnabled()){
+        logger.trace("Found server region proxy on region. RegionName: {}", regionName);
+      }
+      this.cqProxy = new ServerCQProxyImpl(srp);
+      if(!srp.getPool().getSubscriptionEnabled()) {
+         throw new CqException("The 'queueEnabled' flag on Pool installed on Region " + regionName + " is set to false.");
+      }
+    } else {
+      throw new CqException("Unable to get the connection pool. The Region does not have a pool configured.");
+    }
+    
+//    if (proxy == null) {
+//      throw new CqException(LocalizedStrings.CqQueryImpl_UNABLE_TO_GET_THE_CONNECTIONPROXY_THE_REGION_MAY_NOT_HAVE_A_BRIDGEWRITER_OR_BRIDGECLIENT_INSTALLED_ON_IT.toLocalizedString());
+//    } else if(!proxy.getEstablishCallbackConnection()){
+//      throw new CqException(LocalizedStrings.CqQueryImpl_THE_ESTABLISHCALLBACKCONNECTION_ON_BRIDGEWRITER_CLIENT_INSTALLED_ON_REGION_0_IS_SET_TO_FALSE
+//        .toLocalizedString(regionName));
+//    }
+  }
+  
+  public void close() throws CqClosedException, CqException {
+    this.close(true);
+  }
+
+  @Override
+  public void close(boolean sendRequestToServer) throws CqClosedException, CqException {
+    final boolean isDebugEnabled = logger.isDebugEnabled();
+    if (isDebugEnabled) {
+      logger.debug("Started closing CQ CqName: {} SendRequestToServer: {}", cqName, sendRequestToServer);
+    }   
+    // Synchronize with stop and execute CQ commands
+    synchronized(this.cqState) {
+      // Check if the cq is already closed.
+      if (this.isClosed()) {
+        //throw new CqClosedException("CQ is already closed, CqName : " + this.cqName);
+        if (isDebugEnabled){
+          logger.debug("CQ is already closed, CqName: {}", this.cqName);
+        }
+        return;
+      }
+
+      int stateBeforeClosing = this.cqState.getState();
+      this.cqState.setState(CqStateImpl.CLOSING);      
+      boolean isClosed = false;
+
+      // Client Close. Proxy is null in case of server.
+      // Check if this has been sent to server, if so send
+      // Close request to server.    
+      Exception exception = null;
+      if (this.cqProxy != null && sendRequestToServer) {
+        try {
+          if (this.proxyCache != null) {
+            if (this.proxyCache.isClosed()) {
+              throw new CacheClosedException("Cache is closed for this user.");
+            }
+            UserAttributes.userAttributes.set(this.proxyCache
+                .getUserAttributes());
+          }
+          cqProxy.close(this);
+          isClosed = true;
+        } 
+        catch (CancelException e) {
+          throw e;
+        } 
+        catch(Exception ex) {
+          if(shutdownInProgress()) {
+            return;
+          }
+          exception = ex;
+        } finally {
+          UserAttributes.userAttributes.set(null);
+        }
+      }
+
+      // Cleanup the resource used by cq.
+      this.removeFromCqMap(); 
+
+      if (cqProxy == null || !sendRequestToServer || isClosed) {       
+        // Stat update.
+        if (stateBeforeClosing == CqStateImpl.RUNNING) {
+          cqService.stats.decCqsActive();
+        } else if (stateBeforeClosing == CqStateImpl.STOPPED) {
+          cqService.stats.decCqsStopped();
+        }
+
+        // Set the state to close, and update stats
+        this.cqState.setState(CqStateImpl.CLOSED);
+        cqService.stats.incCqsClosed();
+        cqService.stats.decCqsOnClient();
+        if(this.stats != null)
+          this.stats.close();
+      } else {
+        if(shutdownInProgress()) {
+          return;
+        }
+        // Hasn't able to send close request to any server.
+        if (exception != null) {
+          throw new CqException(LocalizedStrings.CqQueryImpl_FAILED_TO_CLOSE_THE_CQ_CQNAME_0_ERROR_FROM_LAST_ENDPOINT_1
+              .toLocalizedString(new Object[] {this.cqName, exception.getLocalizedMessage()}), exception.getCause());   
+        } else {
+          throw new CqException(LocalizedStrings.CqQueryImpl_FAILED_TO_CLOSE_THE_CQ_CQNAME_0_THE_SERVER_ENDPOINTS_ON_WHICH_THIS_CQ_WAS_REGISTERED_WERE_NOT_FOUND
+              .toLocalizedString(this.cqName));   
+        }
+      }
+    }
+
+    // Invoke close on Listeners if any.
+    if (this.cqAttributes != null) {
+      CqListener[] cqListeners = this.getCqAttributes().getCqListeners();
+
+      if (cqListeners != null) {
+        if (isDebugEnabled){
+          logger.debug("Invoking CqListeners close() api for the CQ, CqName: {} Number of CqListeners: {}", cqName, cqListeners.length);
+        }
+        for (int lCnt=0; lCnt < cqListeners.length; lCnt++) {
+          try {
+            cqListeners[lCnt].close();
+            // Handle client side exceptions.
+          } catch (Exception ex) {
+            logger.warn(LocalizedMessage.create(
+                LocalizedStrings.CqQueryImpl_EXCEPTION_OCCOURED_IN_THE_CQLISTENER_OF_THE_CQ_CQNAME_0_ERROR_1,
+                new Object[] {cqName, ex.getLocalizedMessage()}));
+            if (isDebugEnabled) {
+              logger.debug(ex.getMessage(), ex);
+            }
+          } 
+          catch (VirtualMachineError err) {
+            SystemFailure.initiateFailure(err);
+            // If this ever returns, rethrow the error.  We're poisoned
+            // now, so don't let this thread continue.
+            throw err;
+          }
+          catch (Throwable t) {
+            // Whenever you catch Error or Throwable, you must also
+            // catch VirtualMachineError (see above).  However, there is
+            // _still_ a possibility that you are dealing with a cascading
+            // error condition, so you also need to check to see if the JVM
+            // is still usable:
+            SystemFailure.checkFailure();
+            logger.warn(LocalizedMessage.create(
+                LocalizedStrings.CqQueryImpl_RUNTIMEEXCEPTION_OCCOURED_IN_THE_CQLISTENER_OF_THE_CQ_CQNAME_0_ERROR_1,
+                new Object[] {cqName, t.getLocalizedMessage()}));
+            if (isDebugEnabled) {
+              logger.debug(t.getMessage(), t);
+            }
+          }        
+        }
+      }
+    }
+    if (isDebugEnabled) {
+      logger.debug("Successfully closed the CQ. {}", cqName);
+    }
+  }
+  
+  /**
+   * Clears the resource used by CQ.
+   * @throws CqException
+   */
+  protected void cleanup() throws CqException {
+    this.cqService.removeFromBaseRegionToCqNameMap(this.regionName, this.getServerCqName());      
+  }
+  
+  public CqAttributes getCqAttributes() {
+    return cqAttributes;
+  }
+  
+
+  
+  /**
+   * @return Returns the cqListeners.
+   */
+  public CqListener[] getCqListeners() {
+    
+    return cqAttributes.getCqListeners();
+  }
+  
+  
+  /**
+   * Start or resume executing the query.
+   */
+  public void execute() throws CqClosedException, RegionNotFoundException, CqException {
+    executeCqOnRedundantsAndPrimary(false);
+  }
+
+  /**
+   * Start or resume executing the query.
+   * Gets or updates the CQ results and returns them.
+   */
+  public CqResults executeWithInitialResults() 
+    throws CqClosedException, RegionNotFoundException, CqException {
+    
+    synchronized(queuedEventsSynchObject) {
+      //Prevents multiple calls to executeWithInitialResults from squishing
+      //each others queuedEvents.  Forces the second call to wait
+      //until first call is completed.      
+      while (queuedEvents != null) {
+        try {
+          queuedEventsSynchObject.wait();
+        }
+        catch (InterruptedException e) {
+          Thread.currentThread().interrupt();
+        }
+      }
+      //At this point we know queuedEvents is null and no one is adding to queuedEvents yet.
+      this.queuedEvents = new ConcurrentLinkedQueue<CqEventImpl>();
+    }
+    
+    if (CqQueryImpl.testHook != null) {
+      testHook.pauseUntilReady();
+    }
+    // Send CQ request to servers.
+    //If an exception is thrown, we need to clean up the queuedEvents 
+    //or else client will hang on next executeWithInitialResults
+    CqResults initialResults;
+    try {
+      initialResults = (CqResults)executeCqOnRedundantsAndPrimary(true);
+    }
+    catch (CqClosedException e) { 
+      queuedEvents = null;
+      throw e;
+    }
+    catch (RegionNotFoundException e) {
+      queuedEvents = null;
+      throw e;
+    }
+    catch (CqException e) {
+      queuedEvents = null;
+      throw e;
+    }
+    catch (RuntimeException e) {
+      queuedEvents = null;
+      throw e;
+    }
+    
+    //lock was released earlier so that events that are received while executing 
+    //initial results can be added to the queue.
+    synchronized(queuedEventsSynchObject) {
+      // Check if any CQ Events are received during query execution.
+      // Invoke the CQ Listeners with the received CQ Events.
+      try {
+        if (!this.queuedEvents.isEmpty()) {
+          try {
+            Runnable r = new Runnable(){
+              public void run(){ 
+                Object[] eventArray = null;
+                if (CqQueryImpl.testHook != null) {
+                  testHook.setEventCount(queuedEvents.size());
+                }
+                // Synchronization for the executer thread.
+                synchronized (queuedEventsSynchObject){
+                  try {
+                    eventArray = queuedEvents.toArray();
+                  
+                     //Process through the events
+                    for (Object cqEvent : eventArray) { 
+                      cqService.invokeListeners(cqName, ClientCQImpl.this, 
+                          (CqEventImpl)cqEvent);
+                      stats.decQueuedCqListenerEvents();
+                    } 
+                  }
+                  finally {
+                    //Make sure that we notify waiting threads or else possible dead lock
+                    queuedEvents.clear();
+                    queuedEvents = null;
+                    queuedEventsSynchObject.notify();
+                  }
+                }
+              }
+            };
+            final LoggingThreadGroup group =
+              LoggingThreadGroup.createThreadGroup("CQEventHandler", logger);
+            Thread thread = new Thread(group, r, "CQEventHandler For " + cqName);
+            thread.setDaemon(true);
+            thread.start();    
+          } catch (Exception ex) {
+            if (logger.isDebugEnabled()){
+              logger.debug("Exception while invoking the CQ Listener with queued events.", ex);
+            }
+          }
+        } else {
+          queuedEvents = null;
+        }
+      }
+      finally {
+        queuedEventsSynchObject.notify();
+      }
+      return initialResults;
+    }
+  }
+  
+  /**
+   * This executes the CQ first on the redundant server and then on the primary server.
+   * This is required to keep the redundancy behavior in accordance with the HAQueue
+   * expectation (wherein the events are delivered only from the primary).
+   * @param executeWithInitialResults boolean
+   * @return Object SelectResults in case of executeWithInitialResults
+   */
+  public Object executeCqOnRedundantsAndPrimary(boolean executeWithInitialResults) 
+  throws CqClosedException, RegionNotFoundException, CqException {
+
+    Object initialResults = null;
+    
+    synchronized (this.cqState) {
+      if (this.isClosed()) {
+        throw new CqClosedException(LocalizedStrings.CqQueryImpl_CQ_IS_CLOSED_CQNAME_0
+            .toLocalizedString(this.cqName));
+      }
+      if (this.isRunning()) {
+        throw new IllegalStateException(LocalizedStrings.CqQueryImpl_CQ_IS_IN_RUNNING_STATE_CQNAME_0
+            .toLocalizedString(this.cqName));
+      }
+
+      if (logger.isDebugEnabled()) {
+        logger.debug("Performing Execute {} request for CQ. CqName: {}", ((executeWithInitialResults)?"WithInitialResult":""), this.cqName);
+      }
+      this.cqBaseRegion = (LocalRegion)cqService.getCache().getRegion(this.regionName); 
+
+      // If not server send the request to server.
+      if (!cqService.isServer()) {
+        // Send execute request to the server.
+
+        // If CqService is initialized using the pool, the connection proxy is set using the
+        // pool that initializes the CQ. Else its set using the Region proxy. 
+        if (this.cqProxy == null){
+          initConnectionProxy();
+        }
+
+        boolean success = false;
+        try {
+          if (this.proxyCache != null) {
+            if (this.proxyCache.isClosed()) {
+              throw new CacheClosedException("Cache is closed for this user.");
+            }
+            UserAttributes.userAttributes.set(this.proxyCache
+                .getUserAttributes());
+          }
+          if(executeWithInitialResults) {
+            initialResults = cqProxy.createWithIR(this);
+            if (initialResults == null) {
+              String errMsg = "Failed to execute the CQ.  CqName: " + 
+              this.cqName + ", Query String is: " + this.queryString;
+              throw new CqException(errMsg);                    
+            }
+          } else {
+            cqProxy.create(this);
+          }
+          success = true;
+        } catch (Exception ex) {
+          // Check for system shutdown.
+          if (this.shutdownInProgress()){
+            throw new CqException("System shutdown in progress.");  
+          }
+          if (ex.getCause() instanceof GemFireSecurityException) {
+            if (securityLogWriter.warningEnabled()) {
+              securityLogWriter.warning(LocalizedStrings.CqQueryImpl_EXCEPTION_WHILE_EXECUTING_CQ_EXCEPTION_0, ex, null);              
+            }
+            throw new CqException(
+              LocalizedStrings.CqQueryImpl_GOT_SECURITY_EXCEPTION_WHILE_EXECUTING_CQ_ON_SERVER.toLocalizedString(), ex.getCause());  
+          } else if(ex instanceof CqException) {
+            throw (CqException)ex;
+          } else {
+            String errMsg = 
+              LocalizedStrings.CqQueryImpl_FAILED_TO_EXECUTE_THE_CQ_CQNAME_0_QUERY_STRING_IS_1_ERROR_FROM_LAST_SERVER_2
+              .toLocalizedString(new Object[] {this.cqName, this.queryString, ex.getLocalizedMessage()});
+            if (logger.isDebugEnabled()){
+              logger.debug(errMsg, ex);
+            }
+            throw new CqException(errMsg, ex);
+          }
+        } finally {
+          if(!success && !this.shutdownInProgress()) {
+            try {
+              cqProxy.close(this);
+            } catch(Exception e) {
+              if (logger.isDebugEnabled()) {
+                logger.debug("Exception cleaning up failed cq", e);
+              }
+              UserAttributes.userAttributes.set(null);
+            }
+          }
+          UserAttributes.userAttributes.set(null);
+        }
+      } 
+      this.cqState.setState(CqStateImpl.RUNNING);
+    }
+    //If client side, alert listeners that a cqs have been connected
+    if (!cqService.isServer()) {
+      connected = true;
+      CqListener[] cqListeners = getCqAttributes().getCqListeners();
+      for (int lCnt=0; lCnt < cqListeners.length; lCnt++) {
+        if (cqListeners[lCnt] != null) {
+          if (cqListeners[lCnt] instanceof CqStatusListener) {
+            CqStatusListener listener = (CqStatusListener) cqListeners[lCnt];
+            listener.onCqConnected(); 
+          }
+        }
+      }
+    }
+    // Update CQ-base region for book keeping.
+    this.cqService.stats.incCqsActive();
+    this.cqService.stats.decCqsStopped();
+    return initialResults;
+  }
+  
+  /**
+   * Check to see if shutdown in progress.
+   * @return true if shutdown in progress else false.
+   */
+  private boolean shutdownInProgress() {    
+    GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+    if (cache == null || cache.isClosed()) {
+      return true; //bail, things are shutting down
+    }
+    
+    
+    String reason = cqProxy.getPool().getCancelCriterion().cancelInProgress();
+    if (reason != null) {
+      return true;
+    }  
+    return false;
+    
+  }
+  
+  /**
+   * Stop or pause executing the query.
+   */
+  public void stop()throws CqClosedException, CqException {
+    boolean isStopped = false;
+    synchronized (this.cqState) {
+      if (this.isClosed()) {
+        throw new CqClosedException(LocalizedStrings.CqQueryImpl_CQ_IS_CLOSED_CQNAME_0
+            .toLocalizedString(this.cqName));
+      }
+      
+      if (!(this.isRunning())) {
+        throw new IllegalStateException(LocalizedStrings.CqQueryImpl_CQ_IS_NOT_IN_RUNNING_STATE_STOP_CQ_DOES_NOT_APPLY_CQNAME_0
+            .toLocalizedString(this.cqName));
+      }
+      
+      Exception exception = null;
+      try {
+        if (this.proxyCache != null) {
+          if (this.proxyCache.isClosed()) {
+            throw new CacheClosedException("Cache is closed for this user.");
+          }
+          UserAttributes.userAttributes.set(this.proxyCache
+              .getUserAttributes());
+        }
+        cqProxy.stop(this);
+        isStopped = true;
+      } catch(Exception e ) {
+        exception = e;
+      } finally {
+        UserAttributes.userAttributes.set(null);
+      }
+       if (cqProxy == null || isStopped) {
+         // Change state and stats on the client side
+         this.cqState.setState(CqStateImpl.STOPPED);
+         this.cqService.stats.incCqsStopped();
+         this.cqService.stats.decCqsActive();
+         if (logger.isDebugEnabled()) {
+           logger.debug("Successfully stopped the CQ. {}", cqName);
+         }
+       } else {
+         // Hasn't able to send stop request to any server.
+         if (exception != null) {
+           throw new CqException(LocalizedStrings.CqQueryImpl_FAILED_TO_STOP_THE_CQ_CQNAME_0_ERROR_FROM_LAST_SERVER_1
+              .toLocalizedString(new Object[] {this.cqName, exception.getLocalizedMessage()}),
+              exception.getCause());
+         } else {
+           throw new CqException(LocalizedStrings.CqQueryImpl_FAILED_TO_STOP_THE_CQ_CQNAME_0_THE_SERVER_ENDPOINTS_ON_WHICH_THIS_CQ_WAS_REGISTERED_WERE_NOT_FOUND
+              .toLocalizedString(this.cqName));
+         }
+       }
+    }
+  }
+  
+  public CqAttributesMutator getCqAttributesMutator() {
+    return (CqAttributesMutator)this.cqAttributes;
+  }
+  
+  
+  public ConcurrentLinkedQueue<CqEventImpl> getQueuedEvents() {
+    return this.queuedEvents;
+  }
+
+
+
+  /* (non-Javadoc)
+   * @see com.gemstone.gemfire.cache.query.internal.InternalCqQuery2#setProxyCache(com.gemstone.gemfire.cache.client.internal.ProxyCache)
+   */
+  @Override
+  public void setProxyCache(ProxyCache proxyCache){
+    this.proxyCache = proxyCache;
+  }
+  
+  boolean isConnected() {
+    return connected;
+  }
+  
+  void setConnected(boolean connected) {
+    this.connected = connected;
+  }
+
+  @Override
+  public void createOn(Connection conn, boolean isDurable) {
+    
+    byte regionDataPolicyOrdinal = getCqBaseRegion() == null ? (byte)0
+        : getCqBaseRegion().getAttributes().getDataPolicy().ordinal;
+    
+    int state = this.cqState.getState();
+    this.cqProxy.createOn(getName(), conn, getQueryString(), state, isDurable, regionDataPolicyOrdinal);
+  }
+  
+  
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqAttributesMutatorImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqAttributesMutatorImpl.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqAttributesMutatorImpl.java
new file mode 100644
index 0000000..09afc99
--- /dev/null
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqAttributesMutatorImpl.java
@@ -0,0 +1,60 @@
+/*=========================================================================
+ * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+
+package com.gemstone.gemfire.cache.query.internal.cq;
+
+import com.gemstone.gemfire.cache.query.CqAttributesMutator;
+import com.gemstone.gemfire.cache.query.CqListener;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+
+/**
+ * Supports modification of certain cq attributes after the cq has been
+ * created. 
+ * The setter methods all return the previous value of the attribute. 
+ *
+ * @author anil 
+ * @since 5.5
+ */
+public class CqAttributesMutatorImpl implements CqAttributesMutator {
+  
+  /**
+   * Adds a cq listener to the end of the list of cq listeners on this CqQuery.
+   * @param aListener the user defined cq listener to add to the CqQuery.
+   * @throws IllegalArgumentException if <code>aListener</code> is null
+   */
+  public void addCqListener(CqListener aListener) {
+    if(true) {
+      throw new IllegalStateException(LocalizedStrings.CqAttributesMutatorImpl_NOT_YET_SUPPORTED.toLocalizedString());
+    }
+  }
+  
+  /**
+   * Removes a cq listener from the list of cq listeners on this CqQuery.
+   * Does nothing if the specified listener has not been added.
+   * If the specified listener has been added then {@link com.gemstone.gemfire.cache.CacheCallback#close} will
+   * be called on it; otherwise does nothing.
+   * @param aListener the cq listener to remove from the CqQuery.
+   * @throws IllegalArgumentException if <code>aListener</code> is null
+   */
+  public void removeCqListener(CqListener aListener) {
+    if(true) {
+      throw new IllegalStateException(LocalizedStrings.CqAttributesMutatorImpl_NOT_YET_SUPPORTED.toLocalizedString());
+    }
+  }
+  
+  /**
+   * Removes all cq listeners, calling on each of them, and then adds each listener in the specified array.
+   * @param newListeners a possibly null or empty array of listeners to add to this CqQuery.
+   * @throws IllegalArgumentException if the <code>newListeners</code> array has a null element
+   */
+  public void initCqListeners(CqListener[] newListeners) {
+    if(true) {
+      throw new IllegalStateException(LocalizedStrings.CqAttributesMutatorImpl_NOT_YET_SUPPORTED.toLocalizedString());
+    }
+  } 
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqConflatable.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqConflatable.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqConflatable.java
new file mode 100644
index 0000000..fe5903c
--- /dev/null
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqConflatable.java
@@ -0,0 +1,214 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.query.internal.cq;
+
+import java.io.Serializable;
+
+import com.gemstone.gemfire.internal.cache.Conflatable;
+import com.gemstone.gemfire.internal.cache.EventID;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+
+/**
+ * Implementing class for <code>Conflatable</code> interface. Objects of this
+ * class will be add to the queue
+ * 
+ * @author Dinesh Patel
+ * 
+ */
+public class CqConflatable implements Conflatable, Serializable
+{
+  private static final long serialVersionUID = -7215022132135862557L;
+
+  /** The key for this entry */
+  private Object key;
+
+  /** The value for this entry */
+  private Object value;
+
+  /** The unique <code>EventID</code> object for this entry */
+  private EventID id;
+
+  /** boolean to indicate whether this entry should be conflated or not */
+  private boolean conflate;
+
+  /** The region to which this entry belongs */
+  private String regionname;
+
+  public CqConflatable() {
+
+  }
+
+  /**
+   * Constructor
+   * 
+   * @param key -
+   *          The key for this entry
+   * @param value -
+   *          The value for this entry
+   * @param eventId -
+   *          eventID object for this entry
+   * @param conflate -
+   *          conflate it true
+   * @param regionname -
+   *          The region to which this entry belongs
+   */
+  public CqConflatable(Object key, Object value, EventID eventId,
+      boolean conflate, String regionname) {
+    this.key = key;
+    this.value = value;
+    this.id = eventId;
+    this.conflate = conflate;
+    this.regionname = regionname;
+  }
+
+  /**
+   * Returns whether the object should be conflated
+   * 
+   * @return whether the object should be conflated
+   */
+  public boolean shouldBeConflated()
+  {
+    return this.conflate;
+  }
+
+  /**
+   * Returns the name of the region for this <code>Conflatable</code>
+   * 
+   * @return the name of the region for this <code>Conflatable</code>
+   */
+  public String getRegionToConflate()
+  {
+    return this.regionname;
+  }
+
+  /**
+   * Returns the key for this <code>Conflatable</code>
+   * 
+   * @return the key for this <code>Conflatable</code>
+   */
+  public Object getKeyToConflate()
+  {
+    return this.key;
+  }
+
+  /**
+   * Returns the value for this <code>Conflatable</code>
+   * 
+   * @return the value for this <code>Conflatable</code>
+   */
+  public Object getValueToConflate()
+  {
+    return this.value;
+  }
+
+  /**
+   * Sets the latest value for this <code>Conflatable</code>
+   * 
+   * @param value
+   *          The latest value
+   */
+  public void setLatestValue(Object value)
+  {
+     throw new UnsupportedOperationException(LocalizedStrings.CqConflatable_SETLATESTVALUE_SHOULD_NOT_BE_USED.toLocalizedString());
+  }
+
+  /**
+   * Return this event's identifier
+   * 
+   * @return this event's identifier
+   */
+  public EventID getEventId()
+  {
+    return this.id;
+  }
+
+  /**
+   * @return Returns the conflate.
+   */
+  final boolean isConflate()
+  {
+    return conflate;
+  }
+
+  /**
+   * @param conflate
+   *          The conflate to set.
+   */
+  final void setConflate(boolean conflate)
+  {
+    this.conflate = conflate;
+  }
+
+  /**
+   * @return Returns the id.
+   */
+  final EventID getId()
+  {
+    return id;
+  }
+
+  /**
+   * @param id
+   *          The id to set.
+   */
+  final void setId(EventID id)
+  {
+    this.id = id;
+  }
+
+  /**
+   * @return Returns the key.
+   */
+  final Object getKey()
+  {
+    return key;
+  }
+
+  /**
+   * @param key
+   *          The key to set.
+   */
+  final void setKey(Object key)
+  {
+    this.key = key;
+  }
+
+  /**
+   * @return Returns the regionname.
+   */
+  final String getRegionname()
+  {
+    return regionname;
+  }
+
+  /**
+   * @param regionname
+   *          The regionname to set.
+   */
+  final void setRegionname(String regionname)
+  {
+    this.regionname = regionname;
+  }
+
+  /**
+   * @return Returns the value.
+   */
+  final Object getValue()
+  {
+    return value;
+  }
+
+  /**
+   * @param value
+   *          The value to set.
+   */
+  final void setValue(Object value)
+  {
+    this.value = value;
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqEventImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqEventImpl.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqEventImpl.java
new file mode 100644
index 0000000..4b2fae6
--- /dev/null
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqEventImpl.java
@@ -0,0 +1,154 @@
+/*=========================================================================
+ * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ *========================================================================
+ */
+
+package com.gemstone.gemfire.cache.query.internal.cq;
+
+
+/**
+ * Interface for CqEvent. Offers methods to get information from
+ * CqEvent.
+ *
+ * @author anil
+ * @since 5.5
+ */
+
+import com.gemstone.gemfire.InvalidDeltaException;
+import com.gemstone.gemfire.cache.Operation;
+import com.gemstone.gemfire.cache.client.internal.QueueManager;
+import com.gemstone.gemfire.cache.query.CqEvent;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.internal.cache.EventID;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+
+public class CqEventImpl implements CqEvent {
+  
+  private final CqQuery cQuery;
+  private final Operation baseOp;
+  private final Operation queryOp;
+  private final Object newValue;
+  private final Object key;
+  private final byte[] delta;
+  private Throwable throwable = null;
+  private final QueueManager qManager;
+  private final EventID eventId;
+  
+  CqEventImpl(CqQuery cQuery, Operation baseOp, Operation cqOp, Object key, 
+      Object value, byte[] deltaVal, QueueManager qManager, EventID eventId) {
+    this.cQuery = cQuery;
+    this.queryOp = cqOp; 
+    this.baseOp = baseOp;
+    this.key = key;
+    this.newValue = value;
+    this.delta = deltaVal;
+    // Handle Exception event.
+    if (this.queryOp == null) {
+      setException();
+    }
+    this.qManager = qManager;
+    this.eventId = eventId;
+  }
+    
+  public CqQuery getCq() {
+    return this.cQuery;
+  }
+    
+  /** 
+   * Get the operation on the base region that triggered this event.
+   */
+  public Operation getBaseOperation() {
+    return this.baseOp;
+  }
+  
+  /** 
+   * Get the the operation on the query results. Supported operations include
+   * update, create, and destroy.
+   */
+  public Operation getQueryOperation() {
+    return this.queryOp;
+  }
+  
+  /**
+   * Get the key relating to the event.
+   * @return Object key. 
+   */
+  public Object getKey() {
+    return this.key;
+  }
+
+  /** 
+   * Get the old value that was modified.
+   * If there is no old value because this is an insert, then
+   * return null. 
+   */
+  /*
+  public Object getOldValue() {
+    return this.oldValue;
+  }
+  */
+  
+  /** 
+   * Get the new value of the modification.
+   *  If there is no new value because this is a delete, then
+   *  return null. 
+   */
+  public Object getNewValue() {
+    if (this.newValue == null && this.delta != null) {
+      throw new InvalidDeltaException();
+    }
+    return this.newValue;
+  }
+  
+  /** 
+   * If an error occurred, return the Throwable, otherwise return null.
+   * If an error occurred, then this event will be passed to the
+   * <code>onError</code> method of the CqListener instead of the
+   * <code>onEvent</code> method.
+   */
+  public Throwable getThrowable() {
+    return this.throwable;
+  }
+  
+  public byte[] getDeltaValue() {
+    return this.delta;
+  }
+
+  /**
+   * Checks if the Cq Event is for an exception. If so constructs the
+   * exception. 
+   */
+  public void setException() {
+    // Needs to be changed.
+    this.throwable = new Throwable(LocalizedStrings.CqEventImpl_EXCEPTION_OCCURED_WHILE_APPLYING_QUERY_ON_A_CACHE_EVENT.toLocalizedString());  
+  }
+  
+  public void setException(String exceptionText) {
+    this.throwable = new Throwable(exceptionText);  
+  }
+  
+  public QueueManager getQueueManager() {
+    return this.qManager;
+  }
+  
+  public EventID getEventID() {
+    return this.eventId;  
+  }
+  
+  @Override
+  public String toString() {
+    StringBuffer buffer = new StringBuffer();
+    buffer.append("CqEvent [").append(
+     "CqName=").append(this.cQuery.getName()).append(
+     "; base operation=").append(this.baseOp).append(
+     "; cq operation=").append(this.queryOp).append(
+     "; key=").append(this.key).append(
+     "; value=").append(this.newValue).append(
+     "]");
+    return buffer.toString();
+  }
+}
+

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqListenerImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqListenerImpl.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqListenerImpl.java
new file mode 100644
index 0000000..8b3777c
--- /dev/null
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqListenerImpl.java
@@ -0,0 +1,48 @@
+/*=========================================================================
+ * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ *========================================================================
+ */
+
+package com.gemstone.gemfire.cache.query.internal.cq;
+
+import com.gemstone.gemfire.cache.query.CqListener;
+import com.gemstone.gemfire.cache.query.CqEvent;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+
+/**
+ * CqListener class, implements CqListener interface methods. 
+ * Offers callback methods for the CqQuery.
+ *
+ * @author anil 
+ * @since 5.5
+ */
+public class CqListenerImpl implements CqListener {
+  
+  /**
+   * An event occurred that modifies the results of the query.
+   * This event does not contain an error.
+   */
+  public void onEvent(CqEvent aCqEvent) {
+    if(true) {
+      throw new IllegalStateException(LocalizedStrings.CqListenerImpl_NOT_YET_SUPPORTED.toLocalizedString());
+    }
+  }
+  
+  /** 
+   * An error occurred in the processing of a CQ.
+   * This event does contain an error. The newValue and oldValue in the
+   * may or may not be available, and will be null if not available.
+   */
+  public void onError(CqEvent aCqEvent) {
+    if(true) {
+      throw new IllegalStateException(LocalizedStrings.CqListenerImpl_NOT_YET_SUPPORTED.toLocalizedString());
+    }
+  }
+  
+  /** CQ is being closed, do any cleanup here */
+  public void close() {
+  }
+}


[21/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
new file mode 100644
index 0000000..aac9444
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
@@ -0,0 +1,855 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+/**
+ * 
+ */
+package com.gemstone.gemfire.internal.cache.wan.concurrent;
+
+import com.gemstone.gemfire.cache.EntryExistsException;
+import com.gemstone.gemfire.cache.client.ServerOperationException;
+import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
+import com.gemstone.gemfire.cache.wan.GatewaySender;
+import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
+import com.gemstone.gemfire.internal.cache.wan.BatchException70;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+import com.gemstone.gemfire.internal.cache.wan.parallel.ConcurrentParallelGatewaySenderEventProcessor;
+
+import java.net.SocketException;
+import java.util.Set;
+
+import dunit.AsyncInvocation;
+
+/**
+ * Test the functionality of ParallelGatewaySender with multiple dispatchers.
+ * @author skumar
+ *
+ */
+public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase {
+  
+  public ConcurrentParallelGatewaySenderDUnitTest(String name) {
+    super(name);
+  }
+  
+  public void setUp() throws Exception {
+    super.setUp();
+  }
+
+  /**
+   * Normal happy scenario test case.
+   * checks that all the dispatchers have successfully 
+   * dispatched something individually.
+   * 
+   * @throws Exception
+   */
+  public void testParallelPropagationConcurrentArtifacts() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION });
+    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION });
+    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    //before doing any puts, let the senders be running in order to ensure that
+    //not a single event will be lost
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    try {
+      // set the test hook to find out dispacthed events by each of the
+      // concurrent dispatcher
+      vm4.invoke(ConcurrentParallelGatewaySenderDUnitTest.class, "setTestHook",
+          new Object[] {"ln", Boolean.TRUE });
+      vm5.invoke(ConcurrentParallelGatewaySenderDUnitTest.class, "setTestHook",
+          new Object[] {"ln", Boolean.TRUE });
+      vm6.invoke(ConcurrentParallelGatewaySenderDUnitTest.class, "setTestHook",
+          new Object[] {"ln", Boolean.TRUE });
+      vm7.invoke(ConcurrentParallelGatewaySenderDUnitTest.class, "setTestHook",
+          new Object[] {"ln", Boolean.TRUE });
+
+      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+          1000 });
+
+      // verify all buckets drained on all sender nodes.
+      vm4.invoke(WANTestBase.class,
+          "validateParallelSenderQueueAllBucketsDrained", new Object[] { "ln" });
+      vm5.invoke(WANTestBase.class,
+          "validateParallelSenderQueueAllBucketsDrained", new Object[] { "ln" });
+      vm6.invoke(WANTestBase.class,
+          "validateParallelSenderQueueAllBucketsDrained", new Object[] { "ln" });
+      vm7.invoke(WANTestBase.class,
+          "validateParallelSenderQueueAllBucketsDrained", new Object[] { "ln" });
+
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 1000 });
+
+      int dispatched1 = (Integer)vm4.invoke(WANTestBase.class,
+          "verifyAndGetEventsDispatchedByConcurrentDispatchers",
+          new Object[] { "ln" });
+      int dispatched2 = (Integer)vm5.invoke(WANTestBase.class,
+          "verifyAndGetEventsDispatchedByConcurrentDispatchers",
+          new Object[] { "ln" });
+      int dispatched3 = (Integer)vm6.invoke(WANTestBase.class,
+          "verifyAndGetEventsDispatchedByConcurrentDispatchers",
+          new Object[] { "ln" });
+      int dispatched4 = (Integer)vm7.invoke(WANTestBase.class,
+          "verifyAndGetEventsDispatchedByConcurrentDispatchers",
+          new Object[] { "ln" });
+
+      assertEquals(1000, dispatched1 + dispatched2 + dispatched3 + dispatched4);
+    }
+    finally {
+      vm4.invoke(ConcurrentParallelGatewaySenderDUnitTest.class, "setTestHook", new Object[] {"ln", Boolean.FALSE });
+      vm5.invoke(ConcurrentParallelGatewaySenderDUnitTest.class, "setTestHook", new Object[] {"ln", Boolean.FALSE });
+      vm6.invoke(ConcurrentParallelGatewaySenderDUnitTest.class, "setTestHook", new Object[] {"ln", Boolean.FALSE });
+      vm7.invoke(ConcurrentParallelGatewaySenderDUnitTest.class, "setTestHook", new Object[] {"ln", Boolean.FALSE });
+    }
+  }
+  
+  /**
+   * Normal happy scenario test case.
+   * @throws Exception
+   */
+  public void testParallelPropagation() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION });
+    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION });
+    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    //before doing any puts, let the senders be running in order to ensure that
+    //not a single event will be lost
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+        1000 });
+    
+    //verify all buckets drained on all sender nodes.
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 1000 });
+  }
+  
+  
+  /**
+   * Normal happy scenario test case when bucket division tests boundary cases.
+   * @throws Exception
+   */
+  public void testParallelPropagationWithUnEqualBucketDivison() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.PARTITION });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.PARTITION });
+    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.PARTITION });
+    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.PARTITION });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    //before doing any puts, let the senders be running in order to ensure that
+    //not a single event will be lost
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+        1000 });
+    
+    //verify all buckets drained on all sender nodes.
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 1000 });
+  }
+  
+  
+  /**
+   * Initially the GatewayReceiver is not up but later it comes up.
+   * We verify that 
+   * @throws Exception
+   */
+  public void testParallelPropagation_withoutRemoteSite() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    //keep a larger batch to minimize number of exception occurrences in the log
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 300, false, false, null, true, 6, OrderPolicy.PARTITION });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 300, false, false, null, true, 6, OrderPolicy.PARTITION });
+    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 300, false, false, null, true, 6, OrderPolicy.PARTITION });
+    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 300, false, false, null, true, 6, OrderPolicy.PARTITION });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", false });
+    vm5.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", false });
+    vm6.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", false });
+    vm7.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", false });
+    
+    //make sure all the senders are running before doing any puts
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+      1000 });
+
+    
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 1, 100, isOffHeap() });
+    
+    //verify all buckets drained on all sender nodes.
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    
+    // Just making sure that though the remote site is started later,
+    // remote site is still able to get the data. Since the receivers are
+    // started before creating partition region it is quite possible that the
+    // region may loose some of the events. This needs to be handled by the code
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 1000 });
+  }
+  
+  /**
+   * Testing for colocated region with orderpolicy Partition
+   */
+  public void testParallelPropogationColocatedPartitionedRegions() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION });
+    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION });
+    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.PARTITION });
+
+
+    vm4.invoke(WANTestBase.class,
+        "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
+            "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class,
+        "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
+            "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class,
+        "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
+            "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class,
+        "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
+            "ln", 1, 100, isOffHeap() });
+    
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class,
+        "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
+            "ln", 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class,
+        "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
+            "ln", 1, 100, isOffHeap() });
+
+    //before doing any puts, let the senders be running in order to ensure that
+    //not a single event will be lost
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "putcolocatedPartitionedRegion", new Object[] { 1000 });
+    
+    //verify all buckets drained on all sender nodes.
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      customerRegionName, 1000 });
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      orderRegionName, 1000 });
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      shipmentRegionName, 1000 });
+  }
+  
+  /**
+   * Local and remote sites are up and running.
+   * Local site cache is closed and the site is built again.
+   * Puts are done to local site.
+   * Expected: Remote site should receive all the events put after the local
+   * site was built back.
+   * 
+   * @throws Exception
+   */
+  public void testParallelPropagationWithLocalCacheClosedAndRebuilt() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.PARTITION });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.PARTITION });
+    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.PARTITION});
+    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.PARTITION });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    //before doing any puts, let the senders be running in order to ensure that
+    //not a single event will be lost
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+      1000 });
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+              testName + "_PR", 1000 });
+    //-------------------Close and rebuild local site ---------------------------------
+
+    vm4.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm5.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm6.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm7.invoke(WANTestBase.class, "killSender", new Object[] {});
+    
+    Integer regionSize = 
+      (Integer) vm2.invoke(WANTestBase.class, "getRegionSize", new Object[] {testName + "_PR" });
+    getLogWriter().info("Region size on remote is: " + regionSize);
+    
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.PARTITION });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.PARTITION });
+    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.PARTITION });
+    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.PARTITION });
+
+    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
+    vm5.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
+    vm6.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
+    vm7.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
+    
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    //------------------------------------------------------------------------------------
+    
+    addExpectedException(EntryExistsException.class.getName());
+    addExpectedException(BatchException70.class.getName());
+    addExpectedException(ServerOperationException.class.getName());
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 10000 });
+    
+    //verify all buckets drained on all sender nodes.
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 10000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 10000 });
+  }
+  
+  /**
+   * Colocated regions using ConcurrentParallelGatewaySender.
+   * Normal scenario 
+   * @throws Exception
+   */
+  public void testParallelColocatedPropagation() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY });
+    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY });
+    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.KEY });
+
+    vm4.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
+        new Object[] { testName, "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
+        new Object[] { testName, "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
+        new Object[] { testName, "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
+        new Object[] { testName, "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
+        new Object[] { testName, null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
+        new Object[] { testName, null, 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 1000 });
+    
+    //verify all buckets drained on all sender nodes.
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 1000 });
+  }
+  
+  
+  /**
+   * Colocated regions using ConcurrentParallelGatewaySender.
+   * Normal scenario 
+   * @throws Exception
+   */
+  public void testParallelColocatedPropagationOrderPolicyPartition() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.PARTITION });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.PARTITION });
+    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.PARTITION });
+    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 7, OrderPolicy.PARTITION });
+
+    vm4.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
+        new Object[] { testName, "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
+        new Object[] { testName, "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
+        new Object[] { testName, "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
+        new Object[] { testName, "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
+        new Object[] { testName, null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createColocatedPartitionedRegions",
+        new Object[] { testName, null, 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 1000 });
+    
+    //verify all buckets drained on all sender nodes.
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 1000 });
+  }
+  
+  public void testPartitionedParallelPropagationHA() throws Exception {
+    addExpectedException(SocketException.class.getName()); // for Connection reset
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY });
+    vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY });
+    vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY });
+
+    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
+    vm5.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
+    vm6.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
+    vm7.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
+    
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 2, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 2, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 2, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 2, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    AsyncInvocation inv1 = vm7.invokeAsync(WANTestBase.class, "doPuts",
+        new Object[] { testName + "_PR", 5000 });
+    pause(500);
+    AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "killSender");
+    AsyncInvocation inv3 = vm6.invokeAsync(WANTestBase.class, "doPuts",
+        new Object[] { testName + "_PR", 10000 });
+    pause(1500);
+    AsyncInvocation inv4 = vm5.invokeAsync(WANTestBase.class, "killSender");
+    inv1.join();
+    inv2.join();
+    inv3.join();
+    inv4.join();
+    
+    vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 10000 });
+    vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 10000 });
+    
+    //verify all buckets drained on the sender nodes that up and running.
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 10000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 10000 });
+  }
+  
+  public void testWANPDX_PR_MultipleVM_ConcurrentParallelSender() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm3.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+    
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 0, 2, isOffHeap()});
+
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 0, 2, isOffHeap()});
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 0, 2, isOffHeap()});
+    
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { testName + "_PR",
+        10 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
+        testName + "_PR", 10 });
+  }
+  
+  public void testWANPDX_PR_MultipleVM_ConcurrentParallelSender_StartedLater() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver_PDX", new Object[] { nyPort });
+
+    vm3.invoke(WANTestBase.class, "createCache_PDX", new Object[] { lnPort });
+    vm4.invoke(WANTestBase.class, "createCache_PDX", new Object[] { lnPort });
+
+    vm3.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+    
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 0, 2, isOffHeap()});
+
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 0, 2, isOffHeap()});
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 0, 2, isOffHeap()});
+    
+    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { testName + "_PR",
+        10 });
+
+    AsyncInvocation inv1 = vm3.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    try{
+      inv1.join();
+      inv2.join();
+    }
+    catch(InterruptedException ie) {
+      fail("Caught interrupted exception");
+    }
+    
+    vm4.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { testName + "_PR",
+      40 });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
+        testName + "_PR", 40 });
+  }
+
+  public static void setTestHook(String senderId, boolean hook) {
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    GatewaySender sender = null;
+    for (GatewaySender s : senders) {
+      if (s.getId().equals(senderId)) {
+        sender = s;
+        break;
+      }
+    }
+    ConcurrentParallelGatewaySenderEventProcessor cProc = (ConcurrentParallelGatewaySenderEventProcessor)((AbstractGatewaySender)sender)
+        .getEventProcessor();
+    if (cProc == null) return;
+    cProc.TEST_HOOK = hook;
+  }
+  
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDUnitTest.java
new file mode 100644
index 0000000..e49216b
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDUnitTest.java
@@ -0,0 +1,16 @@
+package com.gemstone.gemfire.internal.cache.wan.concurrent;
+
+@SuppressWarnings("serial")
+public class ConcurrentParallelGatewaySenderOffHeapDUnitTest extends
+    ConcurrentParallelGatewaySenderDUnitTest {
+
+  public ConcurrentParallelGatewaySenderOffHeapDUnitTest(String name) {
+    super(name);
+  }
+
+  @Override
+  public boolean isOffHeap() {
+    return true;
+  }
+
+}



[16/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
new file mode 100644
index 0000000..e25f179
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
@@ -0,0 +1,744 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.wan.misc;
+
+import com.gemstone.gemfire.cache.CacheClosedException;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+
+import dunit.AsyncInvocation;
+import dunit.DistributedTestCase.ExpectedException;
+
+public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBase {
+  
+  public ReplicatedRegion_ParallelWANPersistenceDUnitTest(String name) {
+    super(name);
+    // TODO Auto-generated constructor stub
+  }
+
+  final String expectedExceptions = null;
+
+  public void testNothing() {
+    
+  }
+  
+  /**Below test is disabled intentionally
+  1> In this release 8.0, for rolling upgrade support queue name is changed to old style
+  2>Comman parallel sender for different non colocated regions is not supported in 8.0 so no need to bother about 
+      ParallelGatewaySenderQueue#convertPathToName
+  3> We have to enabled it in next release
+  4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 
+     and version prior to 8.0*/
+  public void DISABLED_test_DR_PGSPERSISTENCE_VALIDATEQUEUE_Restart_Validate_Receiver() {
+    //create locator on local site
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    //create locator on remote site
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    //create receiver on remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", null, isOffHeap() });
+    
+    //create cache in local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    //create senders with disk store
+    String diskStore1 = (String) vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore2 = (String) vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore3 = (String) vm6.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+
+    getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4);
+    
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    
+    //start puts in region on local site
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR", 3000 });
+    getLogWriter().info("Completed puts in the region");
+    
+    //--------------------close and rebuild local site -------------------------------------------------
+    //kill the senders
+/*    ExpectedException exp1 = addExpectedException(CacheClosedException.class
+        .getName());
+    try {
+*/      vm4.invoke(WANTestBase.class, "killSender", new Object[] {});
+      vm5.invoke(WANTestBase.class, "killSender", new Object[] {});
+      vm6.invoke(WANTestBase.class, "killSender", new Object[] {});
+      vm7.invoke(WANTestBase.class, "killSender", new Object[] {});
+/*    }
+    finally {
+      exp1.remove();
+    }
+*/    
+    getLogWriter().info("Killed all the senders.");
+    
+    //restart the vm
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    
+    getLogWriter().info("Created back the cache");
+    
+   //create senders with disk store
+    vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore1, true });
+    vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore2, true });
+    vm6.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore3, true });
+    vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true });
+    
+    getLogWriter().info("Created the senders back from the disk store.");
+    
+    //create PR on local site
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", isOffHeap() });
+    AsyncInvocation inv2 = vm5.invokeAsync(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", isOffHeap() });
+    AsyncInvocation inv3 = vm6.invokeAsync(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", isOffHeap() });
+    AsyncInvocation inv4 = vm7.invokeAsync(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", isOffHeap() });
+    try {
+      inv1.join();
+      inv2.join();
+      inv3.join();
+      inv4.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+    
+    //start the senders in async mode. This will ensure that the 
+    //node of shadow PR that went down last will come up first
+    vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    getLogWriter().info("Waiting for senders running.");
+    //wait for senders running
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    getLogWriter().info("All the senders are now running...");
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", 3000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", 3000 });
+    
+    //----------------------------------------------------------------------------------------------------
+    
+    vm4.invoke(WANTestBase.class, "doNextPuts", new Object[] { testName + "_RR", 3000, 10000 });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", 10000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", 10000 });
+    
+  }
+  
+  /**Below test is disabled intentionally
+  1> In this release 8.0, for rolling upgrade support queue name is changed to old style
+  2>Comman parallel sender for different non colocated regions is not supported in 8.0 so no need to bother about 
+      ParallelGatewaySenderQueue#convertPathToName
+  3> We have to enabled it in next release
+  4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 
+     and version prior to 8.0*/
+  public void DISABLED_test_DRPERSISTENCE_PGSPERSISTENCE_VALIDATEQUEUE_Restart_Validate_Receiver() {
+    //create locator on local site
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    //create locator on remote site
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    //create receiver on remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", null, isOffHeap() });
+    
+    //create cache in local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    //create senders with disk store
+    String diskStore1 = (String) vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore2 = (String) vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore3 = (String) vm6.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+
+    getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4);
+    
+    vm4.invoke(WANTestBase.class,
+        "createReplicatedRegion", new Object[] { testName + "_RR", "ln",
+            Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
+    vm5.invoke(WANTestBase.class,
+        "createReplicatedRegion", new Object[] { testName + "_RR", "ln",
+            Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
+    vm6.invoke(WANTestBase.class,
+        "createReplicatedRegion", new Object[] { testName + "_RR", "ln",
+            Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
+    vm7.invoke(WANTestBase.class,
+        "createReplicatedRegion", new Object[] { testName + "_RR", "ln",
+            Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    
+    //start puts in region on local site
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR", 3000 });
+    getLogWriter().info("Completed puts in the region");
+    
+    //--------------------close and rebuild local site -------------------------------------------------
+    //kill the senders
+/*    ExpectedException exp1 = addExpectedException(CacheClosedException.class
+        .getName());
+    try {*/
+      vm4.invoke(WANTestBase.class, "killSender", new Object[] {});
+      vm5.invoke(WANTestBase.class, "killSender", new Object[] {});
+      vm6.invoke(WANTestBase.class, "killSender", new Object[] {});
+      vm7.invoke(WANTestBase.class, "killSender", new Object[] {});
+/*    }
+    finally {
+      exp1.remove();
+    }*/
+    
+    //restart the vm
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    
+    getLogWriter().info("Created back the cache");
+    
+   //create senders with disk store
+    vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore1, true });
+    vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore2, true });
+    vm6.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore3, true });
+    vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true });
+    
+    getLogWriter().info("Created the senders back from the disk store.");
+    
+    //create PR on local site
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
+    AsyncInvocation inv2 = vm5.invokeAsync(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
+    AsyncInvocation inv3 = vm6.invokeAsync(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
+    AsyncInvocation inv4 = vm7.invokeAsync(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
+    
+    try {
+      inv1.join();
+      inv2.join();
+      inv3.join();
+      inv4.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+    
+    //start the senders in async mode. This will ensure that the 
+    //node of shadow PR that went down last will come up first
+    vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    getLogWriter().info("Waiting for senders running.");
+    //wait for senders running
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    getLogWriter().info("All the senders are now running...");
+    
+    //----------------------------------------------------------------------------------------------------
+    
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", 3000 });
+    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", 3000 });
+    vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", 3000 });
+    vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", 3000 });
+    
+/*    exp1 = addExpectedException(CacheClosedException.class.getName());
+    try {
+*/      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_RR", 3000 });
+      vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_RR", 3000 });
+
+      vm4.invoke(WANTestBase.class, "doNextPuts", new Object[] {
+          testName + "_RR", 3000, 10000 });
+
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_RR", 10000 });
+      vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_RR", 10000 });
+/*    }
+    finally {
+      exp1.remove();
+    }
+*/  }
+  
+  /**Below test is disabled intentionally
+  1> In this release 8.0, for rolling upgrade support queue name is changed to old style
+  2>Comman parallel sender for different non colocated regions is not supported in 8.0 so no need to bother about 
+      ParallelGatewaySenderQueue#convertPathToName
+  3> We have to enabled it in next release
+  4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 
+     and version prior to 8.0*/
+  public void DISABLED_test_DRPERSISTENCE_PRPERSISTENCE_PGSPERSISTENCE_VALIDATEQUEUE_Restart_Validate_Receiver() {
+    //create locator on local site
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    //create locator on remote site
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    //create receiver on remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", null, isOffHeap() });
+    
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 1, 100, isOffHeap() });
+    
+    //create cache in local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    //create senders with disk store
+    String diskStore1 = (String) vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore2 = (String) vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore3 = (String) vm6.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+
+    getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4);
+    
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", Scope.DISTRIBUTED_ACK,
+        DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", Scope.DISTRIBUTED_ACK,
+        DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", Scope.DISTRIBUTED_ACK,
+        DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", Scope.DISTRIBUTED_ACK,
+        DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
+        new Object[] { testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
+        new Object[] { testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
+        new Object[] { testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPersistentPartitionedRegion",
+        new Object[] { testName + "_PR", "ln", 1, 100, isOffHeap() });
+    
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    
+    //start puts in region on local site
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR", 3000 });
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 3000 });
+    getLogWriter().info("Completed puts in the region");
+    
+    //--------------------close and rebuild local site -------------------------------------------------
+    //kill the senders
+/*    ExpectedException exp1 = addExpectedException(CacheClosedException.class
+        .getName());
+    try {
+*/      vm4.invoke(WANTestBase.class, "killSender", new Object[] {});
+      vm5.invoke(WANTestBase.class, "killSender", new Object[] {});
+      vm6.invoke(WANTestBase.class, "killSender", new Object[] {});
+      vm7.invoke(WANTestBase.class, "killSender", new Object[] {});
+/*    }
+    finally {
+      exp1.remove();
+    }
+*/    
+    getLogWriter().info("Killed all the senders.");
+    
+    //restart the vm
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    
+    getLogWriter().info("Created back the cache");
+    
+   //create senders with disk store
+    vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore1, true });
+    vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore2, true });
+    vm6.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore3, true });
+    vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true });
+    
+    getLogWriter().info("Created the senders back from the disk store.");
+    
+    //create PR on local site
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
+    AsyncInvocation inv2 = vm5.invokeAsync(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
+    AsyncInvocation inv3 = vm6.invokeAsync(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
+    AsyncInvocation inv4 = vm7.invokeAsync(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", Scope.DISTRIBUTED_ACK, DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
+    
+    try {
+      inv1.join();
+      inv2.join();
+      inv3.join();
+      inv4.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+    
+    inv1 = vm4.invokeAsync(WANTestBase.class,
+        "createPersistentPartitionedRegion", new Object[] { testName + "_PR", "ln", 1,
+            100, isOffHeap() });
+    inv2 = vm5.invokeAsync(WANTestBase.class,
+        "createPersistentPartitionedRegion", new Object[] { testName + "_PR", "ln", 1,
+            100, isOffHeap() });
+    inv3 = vm6.invokeAsync(WANTestBase.class,
+        "createPersistentPartitionedRegion", new Object[] { testName + "_PR", "ln", 1,
+            100, isOffHeap() });
+    inv4 = vm7.invokeAsync(WANTestBase.class,
+        "createPersistentPartitionedRegion", new Object[] { testName + "_PR", "ln", 1,
+            100, isOffHeap() });
+
+    try {
+      inv1.join();
+      inv2.join();
+      inv3.join();
+      inv4.join();
+    }
+    catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+    
+    //start the senders in async mode. This will ensure that the 
+    //node of shadow PR that went down last will come up first
+    vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    getLogWriter().info("Waiting for senders running.");
+    //wait for senders running
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    getLogWriter().info("All the senders are now running...");
+    
+    //----------------------------------------------------------------------------------------------------
+    
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", 3000 });
+    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", 3000 });
+    vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", 3000 });
+    vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", 3000 });
+    
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 3000 });
+    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 3000 });
+    vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 3000 });
+    vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 3000 });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", 3000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", 3000 });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 3000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 3000 });
+    
+    vm4.invoke(WANTestBase.class, "doNextPuts", new Object[] { testName + "_RR", 3000, 10000 });
+    vm4.invoke(WANTestBase.class, "doNextPuts", new Object[] { testName + "_PR", 3000, 10000 });
+    
+/*    exp1 = addExpectedException(CacheClosedException.class.getName());
+    try {*/
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_RR", 10000 });
+      vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_RR", 10000 });
+
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10000 });
+      vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10000 });
+/*    }
+    finally {
+      exp1.remove();
+    }
+*/    
+  }
+  
+  /**Below test is disabled intentionally
+  1> In this release 8.0, for rolling upgrade support queue name is changed to old style
+  2>Comman parallel sender for different non colocated regions is not supported in 8.0 so no need to bother about 
+      ParallelGatewaySenderQueue#convertPathToName
+  3> We have to enabled it in next release
+  4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 
+     and version prior to 8.0*/
+  public void DISABLED_test_DRPERSISTENCE_PGSPERSISTENCE_4NODES_2NODESDOWN_Validate_Receiver()
+      throws Exception {
+
+    Integer lnPort = (Integer) vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer) vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    // create senders with disk store
+    String diskStore1 = (String) vm4.invoke(WANTestBase.class,
+        "createSenderWithDiskStore", new Object[] { "ln", 2, true, 100, 10,
+            false, true, null, null, true });
+    String diskStore2 = (String) vm5.invoke(WANTestBase.class,
+        "createSenderWithDiskStore", new Object[] { "ln", 2, true, 100, 10,
+            false, true, null, null, true });
+    String diskStore3 = (String) vm6.invoke(WANTestBase.class,
+        "createSenderWithDiskStore", new Object[] { "ln", 2, true, 100, 10,
+            false, true, null, null, true });
+    String diskStore4 = (String) vm7.invoke(WANTestBase.class,
+        "createSenderWithDiskStore", new Object[] { "ln", 2, true, 100, 10,
+            false, true, null, null, true });
+
+    getLogWriter().info(
+        "The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + ","
+            + diskStore4);
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", Scope.DISTRIBUTED_ACK,
+        DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", Scope.DISTRIBUTED_ACK,
+        DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", Scope.DISTRIBUTED_ACK,
+        DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", Scope.DISTRIBUTED_ACK,
+        DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState",
+        new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState",
+        new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState",
+        new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState",
+        new Object[] { "ln" });
+
+    pauseWaitCriteria(60000);
+    {
+      AsyncInvocation inv1 = vm7.invokeAsync(
+          ReplicatedRegion_ParallelWANPropogationDUnitTest.class, "doPuts0",
+          new Object[] { testName + "_RR", 10000 });
+      pauseWaitCriteria(1000);
+      AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "killSender");
+      pauseWaitCriteria(2000);
+      AsyncInvocation inv3 = vm6.invokeAsync(
+          ReplicatedRegion_ParallelWANPropogationDUnitTest.class, "doPuts1",
+          new Object[] { testName + "_RR", 10000 });
+      pauseWaitCriteria(1500);
+      AsyncInvocation inv4 = vm5.invokeAsync(WANTestBase.class, "killSender");
+      try {
+        inv1.join();
+        inv2.join();
+        inv3.join();
+        inv4.join();
+      } catch (Exception e) {
+        fail("UnExpected Exception", e);
+      }
+    }
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    getLogWriter().info("Created back the cache");
+
+    // create senders with disk store
+    vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] {
+        "ln", 2, true, 100, 10, false, true, null, diskStore1, true });
+    vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] {
+        "ln", 2, true, 100, 10, false, true, null, diskStore2, true });
+
+    getLogWriter().info("Created the senders back from the disk store.");
+
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class,
+        "createReplicatedRegion",
+        new Object[] { testName + "_RR", "ln", Scope.DISTRIBUTED_ACK,
+            DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
+    AsyncInvocation inv2 = vm5.invokeAsync(WANTestBase.class,
+        "createReplicatedRegion",
+        new Object[] { testName + "_RR", "ln", Scope.DISTRIBUTED_ACK,
+            DataPolicy.PERSISTENT_REPLICATE, isOffHeap() });
+    AsyncInvocation inv3 = vm6.invokeAsync(
+        ReplicatedRegion_ParallelWANPropogationDUnitTest.class, "doPuts2",
+        new Object[] { testName + "_RR", 15000 });
+    try {
+      inv1.join();
+      inv2.join();
+
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+
+    vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    getLogWriter().info("Waiting for senders running.");
+    // wait for senders running
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState",
+        new Object[] { "ln" });
+
+    vm6.invoke(WANTestBase.class,
+        "validateParallelSenderQueueAllBucketsDrained", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class,
+        "validateParallelSenderQueueAllBucketsDrained", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 15000 });
+  }
+}



[34/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
new file mode 100644
index 0000000..52c454f
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
@@ -0,0 +1,4408 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+import com.gemstone.gemfire.DataSerializable;
+import com.gemstone.gemfire.DataSerializer;
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.CacheWriterException;
+import com.gemstone.gemfire.cache.CommitConflictException;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.Declarable;
+import com.gemstone.gemfire.cache.DiskStore;
+import com.gemstone.gemfire.cache.EntryEvent;
+import com.gemstone.gemfire.cache.InterestResultPolicy;
+import com.gemstone.gemfire.cache.Operation;
+import com.gemstone.gemfire.cache.PartitionAttributesFactory;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.Region.Entry;
+import com.gemstone.gemfire.cache.RegionDestroyedException;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.client.ClientCache;
+import com.gemstone.gemfire.cache.client.ClientCacheFactory;
+import com.gemstone.gemfire.cache.client.ClientRegionFactory;
+import com.gemstone.gemfire.cache.client.ClientRegionShortcut;
+import com.gemstone.gemfire.cache.client.PoolFactory;
+import com.gemstone.gemfire.cache.client.PoolManager;
+import com.gemstone.gemfire.cache.client.ServerConnectivityException;
+import com.gemstone.gemfire.cache.client.ServerOperationException;
+import com.gemstone.gemfire.cache.persistence.PartitionOfflineException;
+import com.gemstone.gemfire.cache.query.CqAttributes;
+import com.gemstone.gemfire.cache.query.CqAttributesFactory;
+import com.gemstone.gemfire.cache.query.CqClosedException;
+import com.gemstone.gemfire.cache.query.CqEvent;
+import com.gemstone.gemfire.cache.query.CqException;
+import com.gemstone.gemfire.cache.query.CqExistsException;
+import com.gemstone.gemfire.cache.query.CqListener;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.QueryInvalidException;
+import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.cache.query.RegionNotFoundException;
+import com.gemstone.gemfire.cache.query.SelectResults;
+import com.gemstone.gemfire.cache.query.Struct;
+import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
+import com.gemstone.gemfire.cache.util.CacheWriterAdapter;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.internal.AvailablePort;
+import com.gemstone.gemfire.internal.AvailablePortHelper;
+import com.gemstone.gemfire.internal.cache.LocalRegion.NonTXEntry;
+import com.gemstone.gemfire.internal.cache.versions.VersionTag;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+
+import dunit.AsyncInvocation;
+import dunit.DistributedTestCase;
+import dunit.Host;
+import dunit.SerializableCallable;
+import dunit.SerializableRunnable;
+import dunit.VM;
+
+/**
+ * Tests putAll for c/s. Also tests removeAll
+ * 
+ * @author Gester Zhou
+ * @since 5.0.23
+ */
+public class PutAllCSDUnitTest extends ClientServerTestCase {
+
+  final int numberOfEntries = 100;
+  
+  final int testEndPointSwitchNumber = 200;
+  
+  final int thousandEntries = 1000;
+  
+  final int TOTAL_BUCKETS = 10;
+
+  static Object lockObject = new Object();
+
+  static Object lockObject2 = new Object();
+  
+  static Object lockObject3 = new Object();
+  
+  static Object lockObject4 = new Object();
+  
+  final String expectedExceptions = PutAllPartialResultException.class.getName()+"||"
+  + ServerConnectivityException.class.getName()+"||"+RegionDestroyedException.class.getName()+"||java.net.ConnectException";
+
+  // public static void caseTearDown() throws Exception {
+  // disconnectAllFromDS();
+  // }
+
+  /**
+   * Creates a new <code>GemFireMemberStatusDUnitTest</code>
+   */
+  public PutAllCSDUnitTest(String name) {
+    super(name);
+  }
+
+  // ////// Test Methods
+
+  private static void checkRegionSize(final Region region, final int expectedSize) {
+    WaitCriterion ev = new WaitCriterion() {
+      public boolean done() {
+        return region.size() == expectedSize; 
+      }
+      public String description() {
+        return null;
+      }
+    };
+    DistributedTestCase.waitForCriterion(ev, 10 * 1000, 1000, true);
+    assertEquals(expectedSize, region.size());
+  }
+  
+  /**
+   * Tests putAll to one server.
+   * 
+   * @throws InterruptedException
+   */
+public void testOneServer() throws CacheException, InterruptedException {
+    final String title = "testOneServer:";
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client1 = host.getVM(2);
+    VM client2 = host.getVM(3);
+    final String regionName = getUniqueName();
+    final int serverPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    final String serverHost = getServerHostName(server.getHost());
+
+    // set <false, true> means <PR=false, notifyBySubscription=true> to enable registerInterest and CQ
+    createBridgeServer(server, regionName, serverPort, false, 0, null);
+    createClient(client1, regionName, serverHost, new int[] {serverPort}, -1, -1, false, true, true);
+    createClient(client2, regionName, serverHost, new int[] {serverPort}, -1, -1, false, true, true);
+
+    server.invoke(new CacheSerializableRunnable(title+"server add listener") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        region.getAttributesMutator().addCacheListener(new MyListener(false));
+      }
+    });
+
+    client2.invoke(new CacheSerializableRunnable(title+"client2 registerInterest and add listener") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        region.getAttributesMutator().addCacheListener(new MyListener(false));
+        
+        // registerInterest for ALL_KEYS
+        region.registerInterest("ALL_KEYS");
+        getLogWriter().info("client2 registerInterest ALL_KEYS at "+region.getFullPath());
+      }
+    });
+
+    client1.invoke(new CacheSerializableRunnable(title+"client1 create local region and run putAll") {
+      public void run2() throws CacheException {
+        AttributesFactory factory2 = new AttributesFactory();
+        factory2.setScope(Scope.LOCAL);
+        factory2.addCacheListener(new MyListener(false));
+        createRegion("localsave", factory2.create());
+        
+        Region region = doPutAll(regionName, "key-", numberOfEntries);
+        assertEquals(numberOfEntries, region.size());
+      }
+    });   
+        
+    AsyncInvocation async1 = client1.invokeAsync(new CacheSerializableRunnable(title+"client1 create CQ") {
+      public void run2() throws CacheException {
+        // create a CQ for key 10-20
+ 	Region localregion = getRootRegion().getSubregion("localsave");
+        CqAttributesFactory cqf1 = new CqAttributesFactory();
+        EOCQEventListener EOCQListener = new EOCQEventListener(localregion);
+        cqf1.addCqListener(EOCQListener);
+        CqAttributes cqa1 = cqf1.create();
+        String cqName1 = "EOInfoTracker";
+        String queryStr1 = "SELECT ALL * FROM /root/"+regionName+" ii WHERE ii.getTicker() >= '10' and ii.getTicker() < '20'";
+        getLogWriter().info("Query String: "+queryStr1);
+        try {
+          QueryService cqService = getCache().getQueryService();
+          CqQuery EOTracker = cqService.newCq(cqName1, queryStr1, cqa1);
+          SelectResults rs1 = EOTracker.executeWithInitialResults();
+            
+          List list1 = rs1.asList();
+          for (int i=0; i<list1.size(); i++) {
+            Struct s = (Struct)list1.get(i);
+            TestObject o = (TestObject)s.get("value");
+            getLogWriter().info("InitialResult:"+i+":"+o);
+            localregion.put("key-"+i, o);
+          }
+          if (localregion.size() > 0) {
+            getLogWriter().info("CQ is ready");
+            synchronized(lockObject) {
+              lockObject.notify();
+            }
+          }
+
+          waitTillNotify(lockObject2, 20000, (EOCQListener.num_creates == 5 && EOCQListener.num_updates == 5));
+          EOTracker.close();
+        }
+        catch (CqClosedException e) {
+          fail("CQ", e);
+        }
+        catch (RegionNotFoundException e) {
+          fail("CQ", e);
+        }
+        catch (QueryInvalidException e) {
+          fail("CQ", e);
+        }
+        catch (CqExistsException e) {
+          fail("CQ", e);
+        }
+        catch (CqException e) {
+          fail("CQ", e);
+        }
+      }
+    });
+    
+    server.invoke(new CacheSerializableRunnable(title+"verify Bridge Server") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        assertEquals(numberOfEntries, region.size());
+        for (int i=0; i<numberOfEntries; i++) {
+          TestObject obj = (TestObject)region.getEntry("key-"+i).getValue();
+          assertEquals(i, obj.getPrice());
+        }
+      }
+    });
+
+    // verify CQ is ready
+    client1.invoke(new CacheSerializableRunnable(title+"verify CQ is ready") {
+      public void run2() throws CacheException {
+        Region localregion = getRootRegion().getSubregion("localsave");
+        waitTillNotify(lockObject, 10000, (localregion.size()>0));
+        assertTrue(localregion.size()>0);
+      }
+    });
+
+    // verify registerInterest result at client2
+    client2.invoke(new CacheSerializableRunnable(title+"verify client2") {
+      public void run2() throws CacheException {
+        final Region region = getRootRegion().getSubregion(regionName);
+        checkRegionSize(region, numberOfEntries);
+        for (int i=0; i<numberOfEntries; i++) {
+          TestObject obj = (TestObject)region.getEntry("key-"+i).getValue();
+          assertEquals(i, obj.getPrice());
+        }
+        
+        // then do update for key 10-20 to trigger CQ at server2
+        // destroy key 10-14 to simulate create/update mix case
+        region.removeAll(Arrays.asList("key-10", "key-11", "key-12", "key-13", "key-14"), "removeAllCallback");
+        assertEquals(null, region.get("key-10"));
+        assertEquals(null, region.get("key-11"));
+        assertEquals(null, region.get("key-12"));
+        assertEquals(null, region.get("key-13"));
+        assertEquals(null, region.get("key-14"));
+      }
+    });
+    
+    // verify CQ result at client1
+    client1.invoke(new CacheSerializableRunnable(title+"Verify client1") {
+      public void run2() throws CacheException {
+        Region localregion = getRootRegion().getSubregion("localsave");
+        for (int i=10; i<15; i++) {
+          TestObject obj = null; 
+          int cnt = 0;
+          while (cnt < 100) {
+            obj = (TestObject)localregion.get("key-"+i);
+            if (obj != null) {
+              // wait for the key to be destroyed
+              pause(100);
+              if (getLogWriter().fineEnabled()) {
+                getLogWriter().info("Waiting 100ms("+cnt+") for key-" + i + " to be destroyed");
+              }
+              cnt++;
+            } else {
+              break;
+            }
+          }
+        }
+      }
+    });
+    client2.invoke(new CacheSerializableRunnable(title+"verify client2") {
+      public void run2() throws CacheException {
+        final Region region = getRootRegion().getSubregion(regionName);
+        LinkedHashMap map = new LinkedHashMap();
+        for (int i=10; i<20; i++) {
+          map.put("key-"+i, new TestObject(i*10));
+        }
+        region.putAll(map, "putAllCallback");
+      }
+    });
+    // verify CQ result at client1
+    client1.invoke(new CacheSerializableRunnable(title+"Verify client1") {
+      public void run2() throws CacheException {
+        Region localregion = getRootRegion().getSubregion("localsave");
+        for (int i=10; i<20; i++) {
+          TestObject obj = null; 
+          int cnt = 0;
+          while (cnt < 100) {
+            obj = (TestObject)localregion.get("key-"+i);
+            if (obj == null || obj.getPrice() != i*10) {
+              pause(100);
+              getLogWriter().info("Waiting 100ms("+cnt+") for obj.getPrice() == i*10 at entry "+i);
+              cnt++;
+            } else {
+              break;
+            }
+          }
+          assertEquals(i*10, obj.getPrice());
+        }
+        synchronized(lockObject2) {
+          lockObject2.notify();
+        }
+      }
+    });
+
+    DistributedTestCase.join(async1, 30 * 1000, getLogWriter());
+    
+    // verify stats for client putAll into distributed region
+    // 1. verify client staus
+    /*
+     * server2.invoke(new CacheSerializableRunnable("server2 execute putAll") {
+     * public void run2() throws CacheException { try { DistributedSystemConfig
+     * config = AdminDistributedSystemFactory.defineDistributedSystem(system,
+     * null); AdminDistributedSystem ads =
+     * AdminDistributedSystemFactory.getDistributedSystem(config);
+     * ads.connect(); DistributedMember distributedMember =
+     * system.getDistributedMember(); SystemMember member =
+     * ads.lookupSystemMember(distributedMember);
+     * 
+     * StatisticResource[] resources = member.getStats(); for (int i=0; i<resources.length;
+     * i++) { System.out.println("GGG:"+resources[i].getType()); if
+     * (resources[i].getType().equals("CacheServerClientStats")) { Statistic[]
+     * stats = resources[i].getStatistics(); for (int j=0; i<stats.length; i++) {
+     * if (stats[j].getName().equals("putAll")) {
+     * System.out.println("GGG:"+stats[j].getName()+":"+stats[j].getValue()); }
+     * else if (stats[j].getName().equals("sendPutAllTime")) {
+     * System.out.println("GGG:"+stats[j].getName()+":"+stats[j].getValue()); } } } } }
+     * catch (AdminException e) {
+     * fail("Failed while creating AdminDS", e); } } });
+     */
+
+    // Test Exception handling
+    // verify CQ is ready
+    client1.invoke(new CacheSerializableRunnable(title+"test exception handling") {
+      public void run2() throws CacheException {
+    	Region region = getRootRegion().getSubregion(regionName);
+        Map m = null;
+        boolean NPEthrowed = false;
+        try{
+          region.putAll(m, "putAllCallback");
+          fail("Should have thrown NullPointerException");
+        }
+        catch (NullPointerException ex) {
+          NPEthrowed = true;
+        }
+        assertTrue(NPEthrowed);
+
+        region.localDestroyRegion();
+        boolean RDEthrowed = false;
+        try{
+          m = new HashMap();
+          for(int i=1; i<21; i++) {
+            m.put(new Integer(i), Integer.toString(i));
+          }
+          region.putAll(m, "putAllCallback");
+          fail("Should have thrown RegionDestroyedException");
+        }
+        catch (RegionDestroyedException ex){
+          RDEthrowed = true;
+        }
+        assertTrue(RDEthrowed);
+        try{
+          region.removeAll(Arrays.asList("key-10", "key-11"), "removeAllCallback");
+          fail("Should have thrown RegionDestroyedException");
+        }
+        catch (RegionDestroyedException expected) {
+        }
+      }
+    });
+    
+    // Stop server
+    stopBridgeServers(getCache());
+  }
+
+  /**
+   * Tests putAll afterUpdate event contained oldValue.
+   * 
+   * @throws InterruptedException
+   */
+  public void testOldValueInEvent() throws CacheException, InterruptedException {
+    final String title = "testOldValueInEvent:";
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client1 = host.getVM(2);
+    VM client2 = host.getVM(3);
+    final String regionName = getUniqueName();
+    
+    final int serverPort1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    final int serverPort2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    final String serverHost = getServerHostName(server1.getHost());
+  
+    // set notifyBySubscription=false to test local-invalidates
+    createBridgeServer(server1, regionName, serverPort1, false, 0, null);
+    createBridgeServer(server2, regionName, serverPort2, false, 0, null);
+    createClient(client1, regionName, serverHost, new int[] {serverPort1}, -1, -1, false, true, true);
+    createClient(client2, regionName, serverHost, new int[] {serverPort2}, -1, -1, false, true, true);
+  
+    client2.invoke(new CacheSerializableRunnable(title+"client2 registerInterest and add listener") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        region.getAttributesMutator().addCacheListener(new MyListener(false));
+        
+        // registerInterest for ALL_KEYS
+        region.registerInterest("ALL_KEYS");
+        getLogWriter().info("client2 registerInterest ALL_KEYS at "+region.getFullPath());
+      }
+    });
+  
+    client1.invoke(new CacheSerializableRunnable(title+"client1 create local region and run putAll") {
+      public void run2() throws CacheException {
+        // create keys
+        Region region = getRootRegion().getSubregion(regionName);
+        region.getAttributesMutator().addCacheListener(new MyListener(false));
+        doPutAll(regionName, title, numberOfEntries);
+        assertEquals(numberOfEntries, region.size());
+  
+        // update keys
+        doPutAll(regionName, title, numberOfEntries);
+        assertEquals(numberOfEntries, region.size());
+      }
+    });
+    
+    // verify 41890, the local PUTALL_UPDATE event should contain old value
+    client1.invoke(new CacheSerializableRunnable(title+"verify after update events") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        waitTillNotify(lockObject, 20000, (region.size() == numberOfEntries));
+      }
+    });
+        
+    client2.invoke(new CacheSerializableRunnable(title+"verify after update events") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        waitTillNotify(lockObject, 20000, (region.size() == numberOfEntries));
+      }
+    });
+    
+    // Stop server
+    stopBridgeServers(getCache());
+  }
+
+  /**
+   * Tests putAll and removeAll to 2 servers. Use Case: 1) putAll from a single-threaded
+   * client to a replicated region 2) putAll from a multi-threaded client to a
+   * replicated region 3)
+   */
+  public void test2Server() throws CacheException, InterruptedException {
+    final String title = "test2Server:";
+//    disconnectAllFromDS();
+
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client1 = host.getVM(2);
+    VM client2 = host.getVM(3);
+    final String regionName = getUniqueName();
+    
+    final int serverPort1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    final int serverPort2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    final String serverHost = getServerHostName(server1.getHost());
+
+    // set notifyBySubscription=false to test local-invalidates
+    createBridgeServer(server1, regionName, serverPort1, false, 0, null);
+    createBridgeServer(server2, regionName, serverPort2, false, 0, null);
+    createBridgeClient(client1, regionName, serverHost, new int[] {serverPort1}, -1, -1, true);
+    createBridgeClient(client2, regionName, serverHost, new int[] {serverPort2}, -1, -1, true);
+
+    client2.invoke(new CacheSerializableRunnable(title+"client2 add listener") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        region.getAttributesMutator().addCacheListener(new MyListener(false));
+      }
+    });   
+
+    client1.invoke(new CacheSerializableRunnable(title+"client1 add listener and putAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        region.getAttributesMutator().addCacheListener(new MyListener(false));
+        doPutAll(regionName, "key-", numberOfEntries);
+        assertEquals(numberOfEntries, region.size());
+        for (int i = 0; i < numberOfEntries; i++) {
+          TestObject obj = (TestObject)region.getEntry("key-" + i).getValue();
+          assertEquals(i, obj.getPrice());
+        }
+      }
+    });   
+
+    // verify bridge server 1, its data are from client
+    server1.invoke(new CacheSerializableRunnable(title
+        + "verify Bridge Server 1") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        region.getAttributesMutator().setCacheWriter(new MyWriter("key-"));
+        assertEquals(numberOfEntries, region.size());
+        for (int i = 0; i < numberOfEntries; i++) {
+          TestObject obj = (TestObject)region.getEntry("key-" + i).getValue();
+          assertEquals(i, obj.getPrice());
+        }
+      }
+    });
+
+    // verify bridge server 2, because its data are from distribution
+    server2.invoke(new CacheSerializableRunnable(title
+        + "verify Bridge Server 2") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        region.getAttributesMutator().setCacheWriter(new MyWriter("key-"));
+        assertEquals(numberOfEntries, region.size());
+        for (int i = 0; i < numberOfEntries; i++) {
+          TestObject obj = (TestObject)region.getEntry("key-" + i).getValue();
+          assertEquals(i, obj.getPrice());
+        }
+      }
+    });
+
+    client2.invoke(new CacheSerializableRunnable(title+"client2 verify putAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        checkRegionSize(region, numberOfEntries);
+        for (int i = 0; i < numberOfEntries; i++) {
+          Region.Entry re = region.getEntry("key-" + i);
+          assertNotNull(re);
+          assertEquals(null, re.getValue());
+        }
+      }
+    });   
+
+    client1.invoke(new CacheSerializableRunnable(title+"client1 removeAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        doRemoveAll(regionName, "key-", numberOfEntries);
+        assertEquals(0, region.size());
+      }
+    });   
+
+    // verify bridge server 1, its data are from client
+    server1.invoke(new CacheSerializableRunnable(title
+        + "verify removeAll Bridge Server 1") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        assertEquals(0, region.size());
+        MyWriter mywriter = (MyWriter)region.getAttributes().getCacheWriter();
+        getLogWriter().info("server cachewriter triggered for destroy: "+mywriter.num_destroyed);
+        assertEquals(numberOfEntries, mywriter.num_destroyed);
+      }
+    });
+
+    // verify bridge server 2, because its data are from distribution
+    server2.invoke(new CacheSerializableRunnable(title
+        + "verify removeAll Bridge Server 2") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        assertEquals(0, region.size());
+        MyWriter mywriter = (MyWriter)region.getAttributes().getCacheWriter();
+        getLogWriter().info("server cachewriter triggered for destroy: "+mywriter.num_destroyed);
+        // beforeDestroys are only triggered at server1 since the removeAll is submitted from client1
+        assertEquals(0, mywriter.num_destroyed);
+      }
+    });
+
+    client2.invoke(new CacheSerializableRunnable(title+"client2 verify removeAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        checkRegionSize(region, 0);
+      }
+    });   
+
+    {
+    // Execute client putAll from multithread client
+    AsyncInvocation async1 = client1.invokeAsync(new CacheSerializableRunnable(
+        title + "async putAll1 from client1") {
+      public void run2() throws CacheException {
+        doPutAll(regionName, "async1key-", numberOfEntries);
+      }
+    });
+    AsyncInvocation async2 = client1.invokeAsync(new CacheSerializableRunnable(
+        title + "async putAll2 from client1") {
+      public void run2() throws CacheException {
+        doPutAll(regionName, "async2key-", numberOfEntries);
+      }
+    });
+
+    DistributedTestCase.join(async1, 30 * 1000, getLogWriter());
+    DistributedTestCase.join(async2, 30 * 1000, getLogWriter());
+    }
+
+    client1.invoke(new CacheSerializableRunnable(title
+        + "verify client 1 for async keys") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        assertEquals(numberOfEntries*2, region.size());
+        long ts1 = 0, ts2 = 0;
+        for (int i = 0; i < numberOfEntries; i++) {
+          TestObject obj = (TestObject)region.getEntry("async1key-" + i)
+              .getValue();
+          assertEquals(i, obj.getPrice());
+          assertTrue(obj.getTS() >= ts1);
+          ts1 = obj.getTS();
+
+          obj = (TestObject)region.getEntry("async2key-" + i).getValue();
+          assertEquals(i, obj.getPrice());
+          assertTrue(obj.getTS() >= ts2);
+          ts2 = obj.getTS();
+        }
+      }
+    });
+
+    // verify bridge server 1 for asyn keys
+    server1.invoke(new CacheSerializableRunnable(title
+        + "verify Bridge Server 1 for async keys") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        assertEquals(numberOfEntries*2, region.size());
+        long ts1 = 0, ts2 = 0;
+        for (int i = 0; i < numberOfEntries; i++) {
+          TestObject obj = (TestObject)region.getEntry("async1key-" + i)
+              .getValue();
+          assertEquals(i, obj.getPrice());
+          assertTrue(obj.getTS() >= ts1);
+          ts1 = obj.getTS();
+
+          obj = (TestObject)region.getEntry("async2key-" + i).getValue();
+          assertEquals(i, obj.getPrice());
+          assertTrue(obj.getTS() >= ts2);
+          ts2 = obj.getTS();
+        }
+      }
+    });
+    // verify bridge server 2 for asyn keys
+    server2.invoke(new CacheSerializableRunnable(title
+        + "verify Bridge Server 2 for async keys") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        assertEquals(numberOfEntries*2, region.size());
+        long ts1 = 0, ts2 = 0;
+        for (int i = 0; i < numberOfEntries; i++) {
+          TestObject obj = (TestObject)region.getEntry("async1key-" + i)
+              .getValue();
+          assertEquals(i, obj.getPrice());
+          assertTrue(obj.getTS() >= ts1);
+          ts1 = obj.getTS();
+
+          obj = (TestObject)region.getEntry("async2key-" + i).getValue();
+          assertEquals(i, obj.getPrice());
+          assertTrue(obj.getTS() >= ts2);
+          ts2 = obj.getTS();
+        }
+      }
+    });
+    client2.invoke(new CacheSerializableRunnable(title+"client2 verify async putAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        checkRegionSize(region, numberOfEntries*2);
+        for (int i = 0; i < numberOfEntries; i++) {
+          Region.Entry re = region.getEntry("async1key-" + i);
+          assertNotNull(re);
+          assertEquals(null, re.getValue());
+        }
+        for (int i = 0; i < numberOfEntries; i++) {
+          Region.Entry re = region.getEntry("async2key-" + i);
+          assertNotNull(re);
+          assertEquals(null, re.getValue());
+        }
+      }
+    });   
+
+    {
+      // Execute client removeAll from multithread client
+      AsyncInvocation async1 = client1.invokeAsync(new CacheSerializableRunnable(
+          title + "async putAll1 from client1") {
+        public void run2() throws CacheException {
+          doRemoveAll(regionName, "async1key-", numberOfEntries);
+        }
+      });
+      AsyncInvocation async2 = client1.invokeAsync(new CacheSerializableRunnable(
+          title + "async putAll2 from client1") {
+        public void run2() throws CacheException {
+          doRemoveAll(regionName, "async2key-", numberOfEntries);
+        }
+      });
+
+      DistributedTestCase.join(async1, 30 * 1000, getLogWriter());
+      DistributedTestCase.join(async2, 30 * 1000, getLogWriter());
+    }
+
+    client1.invoke(new CacheSerializableRunnable(title+"client1 removeAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        doRemoveAll(regionName, "key-", numberOfEntries);
+        assertEquals(0, region.size());
+      }
+    });   
+
+    // verify bridge server 1, its data are from client
+    server1.invoke(new CacheSerializableRunnable(title
+        + "verify async removeAll Bridge Server 1") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        assertEquals(0, region.size());
+      }
+    });
+
+    // verify bridge server 2, because its data are from distribution
+    server2.invoke(new CacheSerializableRunnable(title
+        + "verify async removeAll Bridge Server 2") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        assertEquals(0, region.size());
+      }
+    });
+
+    client2.invoke(new CacheSerializableRunnable(title+"client2 verify async removeAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        checkRegionSize(region, 0);
+      }
+    });
+    
+    // Execute p2p putAll
+    server1.invoke(new CacheSerializableRunnable(title
+        + "server1 execute P2P putAll") {
+      public void run2() throws CacheException {
+        doPutAll(regionName, "p2pkey-", numberOfEntries);
+        Region region = getRootRegion().getSubregion(regionName);
+        long ts1 = 0;
+        for (int i = 0; i < numberOfEntries; i++) {
+          TestObject obj = (TestObject)region.getEntry("p2pkey-" + i)
+              .getValue();
+          assertEquals(i, obj.getPrice());
+          assertTrue(obj.getTS() >= ts1);
+          ts1 = obj.getTS();
+        }
+      }
+    });
+
+    // verify bridge server 2 for p2p keys
+    server2.invoke(new CacheSerializableRunnable(title
+        + "verify Bridge Server 2 for p2p keys") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        long ts1 = 0;
+        for (int i = 0; i < numberOfEntries; i++) {
+          TestObject obj = (TestObject)region.getEntry("p2pkey-" + i)
+              .getValue();
+          assertEquals(i, obj.getPrice());
+          assertTrue(obj.getTS() >= ts1);
+          ts1 = obj.getTS();
+        }
+      }
+    });
+    client2.invoke(new CacheSerializableRunnable(title+"client2 verify p2p putAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        checkRegionSize(region, numberOfEntries);
+        for (int i = 0; i < numberOfEntries; i++) {
+          Region.Entry re = region.getEntry("p2pkey-" + i);
+          assertNotNull(re);
+          assertEquals(null, re.getValue());
+        }
+      }
+    });   
+    client1.invoke(new CacheSerializableRunnable(title+"client1 verify p2p putAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        checkRegionSize(region, numberOfEntries);
+        for (int i = 0; i < numberOfEntries; i++) {
+          Region.Entry re = region.getEntry("p2pkey-" + i);
+          assertNotNull(re);
+          assertEquals(null, re.getValue());
+        }
+      }
+    });   
+
+    // Execute p2p removeAll
+    server1.invoke(new CacheSerializableRunnable(title
+        + "server1 execute P2P removeAll") {
+      public void run2() throws CacheException {
+        doRemoveAll(regionName, "p2pkey-", numberOfEntries);
+        Region region = getRootRegion().getSubregion(regionName);
+        assertEquals(0, region.size());
+      }
+    });
+    // verify bridge server 2, because its data are from distribution
+    server2.invoke(new CacheSerializableRunnable(title
+        + "verify p2p removeAll Bridge Server 2") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        assertEquals(0, region.size());
+      }
+    });
+
+    client2.invoke(new CacheSerializableRunnable(title+"client2 verify p2p removeAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        checkRegionSize(region, 0);
+      }
+    });
+
+    client1.invoke(new CacheSerializableRunnable(title+"client1 verify p2p removeAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        checkRegionSize(region, 0);
+      }
+    });
+
+    // putAll at client2 to trigger local-invalidates at client1
+    client2.invoke(new CacheSerializableRunnable(title
+        + "execute putAll on client2 for key 0-10") {
+      public void run2() throws CacheException {
+        doPutAll(regionName, "key-", 10);
+      }
+    });
+
+    // verify client 2 for key 0-10
+    client1.invoke(new CacheSerializableRunnable(title
+        + "verify client1 for local invalidate") {
+      public void run2() throws CacheException {
+        final Region region = getRootRegion().getSubregion(regionName);
+        for (int i = 0; i < 10; i++) {
+          final int ii = i;
+          WaitCriterion ev = new WaitCriterion() {
+            public boolean done() {
+              Entry entry = region.getEntry("key-" + ii);
+              return entry != null  &&  entry.getValue() == null;
+            }
+            public String description() {
+              return null;
+            }
+          };
+          DistributedTestCase.waitForCriterion(ev, 10 * 1000, 1000, true);
+          // local invalidate will set the value to null
+          TestObject obj = null;
+          obj = (TestObject)region.getEntry("key-" + i).getValue();
+          assertEquals(null, obj);
+        }
+      }
+    });
+
+    // clean up
+    // Stop server
+    stopBridgeServers(getCache());
+  }
+
+  
+  /* same as test2Server(), but all the servers are using policy normal */
+  private int createServerRegion(VM vm, final String regionName, final boolean CCE) {
+    SerializableCallable createRegion = new SerializableCallable() {
+      public Object call() throws Exception {
+        AttributesFactory af = new AttributesFactory();
+        af.setConcurrencyChecksEnabled(CCE);
+        af.setScope(Scope.DISTRIBUTED_ACK);
+        af.setDataPolicy(DataPolicy.NORMAL);
+        createRootRegion(new AttributesFactory().create());
+        Region region = createRegion(regionName, af.create());
+
+        CacheServer server = getCache().addCacheServer();
+        int port = AvailablePortHelper.getRandomAvailableTCPPort();
+        server.setPort(port);
+        server.start();
+        return port;
+      }
+    };
+
+    return (Integer) vm.invoke(createRegion);
+  }
+  
+  public void doTest2NormalServerCCE(boolean CCE) throws CacheException, InterruptedException {
+    final String title = "doTest2NormalServerCCE="+CCE+":";
+//    disconnectAllFromDS();
+
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client1 = host.getVM(2);
+    VM client2 = host.getVM(3);
+    final String regionName = getUniqueName();
+    
+    final String serverHost = getServerHostName(server1.getHost());
+
+    // set notifyBySubscription=false to test local-invalidates
+    int serverPort1 = createServerRegion(server1, regionName, CCE);
+    int serverPort2 = createServerRegion(server2, regionName, CCE);
+    createBridgeClient(client1, regionName, serverHost, new int[] {serverPort1}, -1, 59000, true);
+    createBridgeClient(client2, regionName, serverHost, new int[] {serverPort2}, -1, 59000, true);
+    
+    client2.invoke(new CacheSerializableRunnable(title+"client2 add listener") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        region.getAttributesMutator().addCacheListener(new MyListener(false));
+      }
+    });   
+
+    // test case 1: putAll and removeAll to server1
+    client1.invoke(new CacheSerializableRunnable(title+"client1 add listener and putAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        region.getAttributesMutator().addCacheListener(new MyListener(false));
+        doPutAll(regionName, "case1-", numberOfEntries);
+        assertEquals(numberOfEntries, region.size());
+        for (int i = 0; i < numberOfEntries; i++) {
+          TestObject obj = (TestObject)region.getEntry("case1-" + i).getValue();
+          assertEquals(i, obj.getPrice());
+        }
+        region.put(numberOfEntries, "specialvalue");
+      }
+    });   
+
+    // verify bridge server 1, its data are from client
+    server1.invoke(new CacheSerializableRunnable(title
+        + "verify Bridge Server 1") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        region.getAttributesMutator().setCacheWriter(new MyWriter("case1-"));
+        region.localDestroy(numberOfEntries);
+        assertEquals(numberOfEntries, region.size());
+        for (int i = 0; i < numberOfEntries; i++) {
+          TestObject obj = (TestObject)region.getEntry("case1-" + i).getValue();
+          assertEquals(i, obj.getPrice());
+        }
+      }
+    });
+
+    server2.invoke(new CacheSerializableRunnable(title
+        + "verify Bridge Server 2") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        region.getAttributesMutator().setCacheWriter(new MyWriter("case1-"));
+        // normal policy will not distribute create events
+        assertEquals(0, region.size());
+      }
+    });
+
+    client1.invoke(new CacheSerializableRunnable(title+"client1 removeAll") {
+      public void run2() throws CacheException {
+        LocalRegion region = (LocalRegion)getRootRegion().getSubregion(regionName);
+        assertEquals(numberOfEntries+1, region.size());
+        // do removeAll with some keys not exist
+        doRemoveAll(regionName, "case1-", numberOfEntries*2);
+        assertEquals(1, region.size());
+        region.localDestroy(numberOfEntries); // do cleanup
+      }
+    });   
+
+    // verify bridge server 1, its data are from client
+    server1.invoke(new CacheSerializableRunnable(title
+        + "verify removeAll Bridge Server 1") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        assertEquals(0, region.size());
+        MyWriter mywriter = (MyWriter)region.getAttributes().getCacheWriter();
+        getLogWriter().info("server cachewriter triggered for destroy: "+mywriter.num_destroyed);
+        assertEquals(numberOfEntries, mywriter.num_destroyed);
+      }
+    });
+
+    // verify bridge server 2, because its data are from distribution
+    server2.invoke(new CacheSerializableRunnable(title
+        + "verify removeAll Bridge Server 2") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        assertEquals(0, region.size());
+        MyWriter mywriter = (MyWriter)region.getAttributes().getCacheWriter();
+        getLogWriter().info("server cachewriter triggered for destroy: "+mywriter.num_destroyed);
+        // beforeDestroys are only triggered at server1 since the removeAll is submitted from client1
+        assertEquals(0, mywriter.num_destroyed);
+      }
+    });
+
+    client2.invoke(new CacheSerializableRunnable(title+"client2 verify removeAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        checkRegionSize(region, 0);
+      }
+    });   
+
+    // test case 2: putAll to server1, removeAll to server2
+    client1.invoke(new CacheSerializableRunnable(title+"client1 add listener and putAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        doPutAll(regionName, "case2-", numberOfEntries);
+        assertEquals(numberOfEntries, region.size());
+        for (int i = 0; i < numberOfEntries; i++) {
+          TestObject obj = (TestObject)region.getEntry("case2-" + i).getValue();
+          assertEquals(i, obj.getPrice());
+        }
+      }
+    });   
+
+    // verify bridge server 1, its data are from client
+    server1.invoke(new CacheSerializableRunnable(title
+        + "verify Bridge Server 1") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        assertEquals(numberOfEntries, region.size());
+        for (int i = 0; i < numberOfEntries; i++) {
+          TestObject obj = (TestObject)region.getEntry("case2-" + i).getValue();
+          assertEquals(i, obj.getPrice());
+        }
+      }
+    });
+
+    server2.invoke(new CacheSerializableRunnable(title
+        + "verify Bridge Server 2") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        // normal policy will not distribute create events
+        assertEquals(0, region.size());
+      }
+    });
+
+    client2.invoke(new CacheSerializableRunnable(title+"client1 removeAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        doRemoveAll(regionName, "case2-", numberOfEntries);
+        assertEquals(0, region.size());
+      }
+    });   
+
+    server1.invoke(new CacheSerializableRunnable(title
+        + "verify removeAll Bridge Server 1") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        assertEquals(100, region.size());
+      }
+    });
+
+    server2.invoke(new CacheSerializableRunnable(title
+        + "verify removeAll Bridge Server 2") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        assertEquals(0, region.size());
+      }
+    });
+
+    client1.invoke(new CacheSerializableRunnable(title+"client1 verify removeAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        checkRegionSize(region, 100);
+        doRemoveAll(regionName, "case2-", numberOfEntries); // do cleanup
+      }
+    });   
+
+    // test case 3: removeAll a list with duplicated keys 
+    client1.invoke(new CacheSerializableRunnable(title+"put 3 keys then removeAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        region.put("case3-1", "case3-1");
+        region.put("case3-2", "case3-2");
+        region.put("case3-3", "case3-3");
+        assertEquals(3, region.size());
+        ArrayList keys = new ArrayList();
+        keys.add("case3-1");
+        keys.add("case3-2");
+        keys.add("case3-3");
+        keys.add("case3-1");
+        region.removeAll(keys, "removeAllCallback");
+        assertEquals(0, region.size());
+      }
+    });   
+
+    // verify bridge server 1, its data are from client
+    server1.invoke(new CacheSerializableRunnable(title
+        + "verify Bridge Server 1") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        assertEquals(0, region.size());
+      }
+    });
+
+    // clean up
+    // Stop server
+    stopBridgeServers(getCache());
+  }
+  
+  public void test2NormalServerCCE() throws CacheException, InterruptedException {
+    doTest2NormalServerCCE(true);
+    disconnectAllFromDS();
+    doTest2NormalServerCCE(false);
+    disconnectAllFromDS();
+  }
+  
+  public void testPRServerRVDuplicatedKeys() throws CacheException, InterruptedException {
+    doRVDuplicatedKeys(true, 1);
+    disconnectAllFromDS();
+    doRVDuplicatedKeys(true, 0);
+    disconnectAllFromDS();
+    doRVDuplicatedKeys(false, 1);
+    disconnectAllFromDS();
+  }
+  
+  public void doRVDuplicatedKeys(final boolean isPR, final int redundantCopies) throws CacheException, InterruptedException {
+    final String title = "doRVDuplicatedKeys:";
+    //  disconnectAllFromDS();
+
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client1 = host.getVM(2);
+    VM client2 = host.getVM(3);
+    final String regionName = getUniqueName();
+
+    final int serverPort1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    final int serverPort2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    final String serverHost = getServerHostName(server1.getHost());
+
+    // set <true, false> means <PR=true, notifyBySubscription=false> to test local-invalidates
+    createBridgeServer(server1, regionName, serverPort1, isPR, redundantCopies, null);
+    createBridgeServer(server2, regionName, serverPort2, isPR, redundantCopies, null);
+    createBridgeClient(client1, regionName, serverHost, new int[] {serverPort1}, -1, 59000, false);
+    createBridgeClient(client2, regionName, serverHost, new int[] {serverPort2}, -1, 59000, false);
+
+    client2.invoke(new CacheSerializableRunnable(title+"client2 add listener") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        region.getAttributesMutator().addCacheListener(new MyListener(false));
+      }
+    });   
+
+    client1.invoke(new CacheSerializableRunnable(title+"client1 add listener and putAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        region.getAttributesMutator().addCacheListener(new MyListener(false));
+        doPutAll(regionName, "key-", numberOfEntries);
+        assertEquals(numberOfEntries, region.size());
+        for (int i = 0; i < numberOfEntries; i++) {
+          TestObject obj = (TestObject)region.getEntry("key-" + i).getValue();
+          assertEquals(i, obj.getPrice());
+        }
+      }
+    });   
+
+    // test case 3: removeAll a list with duplicated keys 
+    client1.invoke(new CacheSerializableRunnable(title+"put 3 keys then removeAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        region.put("case3-1", "case3-1");
+        region.put("case3-2", "case3-2");
+        region.put("case3-3", "case3-3");
+      }
+    });   
+
+    client2.invoke(new CacheSerializableRunnable(title
+        + "verify Bridge Server 2") {
+      public void run2() throws CacheException {
+        pause(5000);
+        Region region = getRootRegion().getSubregion(regionName);
+        Region.Entry re = region.getEntry("case3-1");
+        assertNotNull(re);
+        re = region.getEntry("case3-2");
+        assertNotNull(re);
+        re = region.getEntry("case3-3");
+        assertNotNull(re);
+      }
+    });
+
+    client1.invoke(new CacheSerializableRunnable(title+"put 3 keys then removeAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        ArrayList keys = new ArrayList();
+        keys.add("case3-1");
+        keys.add("case3-2");
+        keys.add("case3-3");
+        keys.add("case3-1");
+        region.removeAll(keys, "removeAllCallback");
+        Region.Entry re = region.getEntry("case3-1");
+        assertNull(re);
+        re = region.getEntry("case3-2");
+        assertNull(re);
+        re = region.getEntry("case3-3");
+        assertNull(re);
+      }
+    });
+
+    server1.invoke(new CacheSerializableRunnable(title
+        + "verify Bridge Server 1") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        Region.Entry re = region.getEntry("case3-1");
+        assertNull(re);
+        re = region.getEntry("case3-2");
+        assertNull(re);
+        re = region.getEntry("case3-3");
+        assertNull(re);
+      }
+    });
+
+    server2.invoke(new CacheSerializableRunnable(title
+        + "verify Bridge Server 2") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        Region.Entry re = region.getEntry("case3-1");
+        assertNull(re);
+        re = region.getEntry("case3-2");
+        assertNull(re);
+        re = region.getEntry("case3-3");
+        assertNull(re);
+      }
+    });
+
+    client2.invoke(new CacheSerializableRunnable(title
+        + "verify Bridge Server 2") {
+      public void run2() throws CacheException {
+        pause(5000);
+        Region region = getRootRegion().getSubregion(regionName);
+        Region.Entry re = region.getEntry("case3-1");
+        assertNull(re);
+        re = region.getEntry("case3-2");
+        assertNull(re);
+        re = region.getEntry("case3-3");
+        assertNull(re);
+      }
+    });
+
+    // clean up
+    // Stop server
+    stopBridgeServers(getCache());
+  }
+  
+  public void testBug51725() throws CacheException, InterruptedException {
+    doBug51725(false);
+    disconnectAllFromDS();
+  }
+
+  public void testBug51725_singlehup() throws CacheException, InterruptedException {
+    doBug51725(true);
+    disconnectAllFromDS();
+  }
+
+  /**
+   * One failure found in bug 51725, both for putAll and removeAll:
+   * non-singlehop with redundency=1. Do some singlehop putAll to see if retry succeeded after PRE
+   * This is a singlehop putAll test.
+   */
+  public void doBug51725(boolean enableSingleHop) throws CacheException, InterruptedException {
+    final String title = "doBug51725:";
+    int client1Size;
+    int client2Size;
+    int server1Size;
+    int server2Size;
+
+//    disconnectAllFromDS();
+
+    final Host host = Host.getHost(0);
+    final VM server1 = host.getVM(0);
+    final VM server2 = host.getVM(1);
+    final VM client1 = host.getVM(2);
+    final VM client2 = host.getVM(3);
+    final String regionName = getUniqueName();
+    
+    final int serverPort1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    final int serverPort2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    final String serverHost = getServerHostName(server1.getHost());
+
+    // set <true, false> means <PR=true, notifyBySubscription=false> to test local-invalidates
+    createBridgeServer(server1, regionName, serverPort1, true, 0, "ds1");
+    createBridgeServer(server2, regionName, serverPort2, true, 0, "ds1");
+    createClient(client1, regionName, serverHost, new int[] {serverPort1}, -1, 59000, false, false, enableSingleHop);
+    createClient(client2, regionName, serverHost, new int[] {serverPort1}, -1, 59000, false, false, enableSingleHop);
+
+    server1.invoke(addExceptionTag1(expectedExceptions));
+    server2.invoke(addExceptionTag1(expectedExceptions));
+    client1.invoke(addExceptionTag1(expectedExceptions));
+    client2.invoke(addExceptionTag1(expectedExceptions));
+
+    client2.invoke(new CacheSerializableRunnable(title+"client2 add listener") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        region.getAttributesMutator().addCacheListener(new MyListener(false));
+        
+        region.registerInterest("ALL_KEYS");
+        getLogWriter().info("client2 registerInterest ALL_KEYS at "+region.getFullPath());
+      }
+    });
+    
+    client1.invoke(new CacheSerializableRunnable(title+"put 3 keys then removeAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        region.getAttributesMutator().addCacheListener(new MyListener(false));
+        // do putAll to create all buckets
+        doPutAll(regionName, "key-", numberOfEntries);
+        assertEquals(numberOfEntries, region.size());
+      }
+    });   
+    
+    closeCache(server2);
+    client1.invoke(new CacheSerializableRunnable(title+"putAll from client again") {
+      public void run2() throws CacheException {
+        LocalRegion region = (LocalRegion)getRootRegion().getSubregion(regionName);
+        region.getAttributesMutator().addCacheListener(new MyListener(false));
+
+        try {
+          doPutAll(regionName, title, numberOfEntries);
+          fail("Expect ServerOperationException caused by PutAllParitialResultException");
+        } catch (ServerOperationException soe) {
+          assertTrue(soe.getMessage().contains(LocalizedStrings.Region_PutAll_Applied_PartialKeys_At_Server_0.toLocalizedString(region.getFullPath())));
+          assertTrue(soe.getCause() instanceof RuntimeException);
+        }
+        assertEquals(numberOfEntries*3/2, region.size());
+        VersionTag tag;
+        int cnt=0;
+        for (int i=0; i<numberOfEntries; i++) {
+          tag = region.getVersionTag(title+i);
+          if (tag != null && 1 == tag.getEntryVersion()) {
+            cnt++;
+          }
+        }
+        assertEquals(numberOfEntries/2, cnt);
+
+        try {
+          doRemoveAll(regionName, title, numberOfEntries);
+        } catch (ServerOperationException soe) {
+          assertTrue(soe.getMessage().contains(LocalizedStrings.Region_RemoveAll_Applied_PartialKeys_At_Server_0.toLocalizedString(region.getFullPath())));
+          assertTrue(soe.getCause() instanceof RuntimeException);
+        }
+        Region.Entry re;
+        // putAll only created 50 entries, removeAll removed them. So 100 entries are all NULL
+        for (int i=0; i<numberOfEntries; i++) {
+          re = region.getEntry(title+i);
+          assertNull(re);
+        }
+      }
+    });
+    
+    client2.invoke(new CacheSerializableRunnable(title+"verify entries from client2") {
+      public void run2() throws CacheException {
+        pause(5000);
+        Region region = getRootRegion().getSubregion(regionName);
+        Region.Entry re;
+        for (int i=0; i<numberOfEntries; i++) {
+          re = region.getEntry(title+i);
+          assertNull(re);
+        }
+      }
+    });   
+
+    // Stop server
+    stopBridgeServers(getCache());
+  }
+
+  /**
+   * Tests putAll to 2 PR servers.
+   */
+  public void testPRServer() throws CacheException, InterruptedException {
+    final String title = "testPRServer:";
+//    disconnectAllFromDS();
+
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client1 = host.getVM(2);
+    VM client2 = host.getVM(3);
+    final String regionName = getUniqueName();
+    
+    final int serverPort1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    final int serverPort2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    final String serverHost = getServerHostName(server1.getHost());
+
+    // set <true, false> means <PR=true, notifyBySubscription=false> to test local-invalidates
+    createBridgeServer(server1, regionName, serverPort1, true, 1, null);
+    createBridgeServer(server2, regionName, serverPort2, true, 1, null);
+    createBridgeClient(client1, regionName, serverHost, new int[] {serverPort1}, -1, 59000, false);
+    createBridgeClient(client2, regionName, serverHost, new int[] {serverPort2}, -1, 59000, false);
+    
+    client2.invoke(new CacheSerializableRunnable(title+"client2 add listener") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        region.getAttributesMutator().addCacheListener(new MyListener(false));
+      }
+    });   
+    
+    client1.invoke(new CacheSerializableRunnable(title+"client1 add listener and putAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        region.getAttributesMutator().addCacheListener(new MyListener(false));
+        doPutAll(regionName, "key-", numberOfEntries);
+        assertEquals(numberOfEntries, region.size());
+        for (int i = 0; i < numberOfEntries; i++) {
+          TestObject obj = (TestObject)region.getEntry("key-" + i).getValue();
+          assertEquals(i, obj.getPrice());
+        }
+      }
+    });   
+
+    // verify bridge server 1, its data are from client
+    server1.invoke(new CacheSerializableRunnable(title
+        + "verify Bridge Server 1") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        region.getAttributesMutator().setCacheWriter(new MyWriter("key-"));
+        assertEquals(numberOfEntries, region.size());
+        for (int i = 0; i < numberOfEntries; i++) {
+          TestObject obj = (TestObject)region.getEntry("key-" + i).getValue();
+          assertEquals(i, obj.getPrice());
+        }
+      }
+    });
+
+    // verify bridge server 2, because its data are from distribution
+    server2.invoke(new CacheSerializableRunnable(title
+        + "verify Bridge Server 2") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        region.getAttributesMutator().setCacheWriter(new MyWriter("key-"));
+        assertEquals(numberOfEntries, region.size());
+        for (int i = 0; i < numberOfEntries; i++) {
+          TestObject obj = (TestObject)region.getEntry("key-" + i).getValue();
+          assertEquals(i, obj.getPrice());
+        }
+      }
+    });
+    client2.invoke(new CacheSerializableRunnable(title
+        + "verify client2") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        checkRegionSize(region, numberOfEntries);
+        for (int i = 0; i < numberOfEntries; i++) {
+          Region.Entry re = region.getEntry("key-" + i);
+          assertNotNull(re);
+          assertEquals(null, re.getValue());
+        }
+      }
+    });
+
+    client1.invoke(new CacheSerializableRunnable(title+"client1 removeAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        doRemoveAll(regionName, "key-", numberOfEntries);
+        assertEquals(0, region.size());
+      }
+    });
+
+    // verify bridge server 1, its data are from client
+    server1.invoke(new CacheSerializableRunnable(title
+        + "verify removeAll Bridge Server 1") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        assertEquals(0, region.size());
+        MyWriter mywriter = (MyWriter)region.getAttributes().getCacheWriter();
+        getLogWriter().info("server cachewriter triggered for destroy: "+mywriter.num_destroyed);
+        // beforeDestroys are only triggered at primary buckets. server1 and server2 each holds half of buckets
+        assertEquals(numberOfEntries/2, mywriter.num_destroyed);
+      }
+    });
+
+    // verify bridge server 2, because its data are from distribution
+    server2.invoke(new CacheSerializableRunnable(title
+        + "verify removeAll Bridge Server 2") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        assertEquals(0, region.size());
+        MyWriter mywriter = (MyWriter)region.getAttributes().getCacheWriter();
+        getLogWriter().info("server cachewriter triggered for destroy: "+mywriter.num_destroyed);
+        // beforeDestroys are only triggered at primary buckets. server1 and server2 each holds half of buckets
+        assertEquals(numberOfEntries/2, mywriter.num_destroyed);
+      }
+    });
+
+    client2.invoke(new CacheSerializableRunnable(title+"client2 verify removeAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        checkRegionSize(region, 0);
+      }
+    });   
+
+    // Execute client putAll from multithread client
+    {
+    AsyncInvocation async1 = client1.invokeAsync(new CacheSerializableRunnable(
+        title + "async putAll1 from client1") {
+      public void run2() throws CacheException {
+        doPutAll(regionName, "async1key-", numberOfEntries);
+      }
+    });
+    AsyncInvocation async2 = client1.invokeAsync(new CacheSerializableRunnable(
+        title + "async putAll2 from client1") {
+      public void run2() throws CacheException {
+        doPutAll(regionName, "async2key-", numberOfEntries);
+      }
+    });
+
+    DistributedTestCase.join(async1, 30 * 1000, getLogWriter());
+    DistributedTestCase.join(async2, 30 * 1000, getLogWriter());
+    }
+    
+    client1.invoke(new CacheSerializableRunnable(title
+        + "verify client 1 for async keys") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        assertEquals(numberOfEntries*2, region.size());
+        long ts1 = 0, ts2 = 0;
+        for (int i = 0; i < numberOfEntries; i++) {
+          TestObject obj = (TestObject)region.getEntry("async1key-" + i)
+              .getValue();
+          assertEquals(i, obj.getPrice());
+          assertTrue(obj.getTS() >= ts1);
+          ts1 = obj.getTS();
+
+          obj = (TestObject)region.getEntry("async2key-" + i).getValue();
+          assertEquals(i, obj.getPrice());
+          assertTrue(obj.getTS() >= ts2);
+          ts2 = obj.getTS();
+        }
+      }
+    });
+
+    // verify bridge server 2 for asyn keys
+    server2.invoke(new CacheSerializableRunnable(title
+        + "verify Bridge Server 2 for async keys") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        long ts1 = 0, ts2 = 0;
+        for (int i = 0; i < numberOfEntries; i++) {
+          TestObject obj = (TestObject)region.getEntry("async1key-" + i)
+              .getValue();
+          assertEquals(i, obj.getPrice());
+          assertTrue(obj.getTS() >= ts1);
+          ts1 = obj.getTS();
+
+          obj = (TestObject)region.getEntry("async2key-" + i).getValue();
+          assertEquals(i, obj.getPrice());
+          assertTrue(obj.getTS() >= ts2);
+          ts2 = obj.getTS();
+        }
+      }
+    });
+
+    client2.invoke(new CacheSerializableRunnable(title+"client2 verify async putAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        checkRegionSize(region, numberOfEntries*2);
+        for (int i = 0; i < numberOfEntries; i++) {
+          Region.Entry re = region.getEntry("async1key-" + i);
+          assertNotNull(re);
+          assertEquals(null, re.getValue());
+        }
+        for (int i = 0; i < numberOfEntries; i++) {
+          Region.Entry re = region.getEntry("async2key-" + i);
+          assertNotNull(re);
+          assertEquals(null, re.getValue());
+        }
+      }
+    });   
+
+    {
+      // Execute client removeAll from multithread client
+      AsyncInvocation async1 = client1.invokeAsync(new CacheSerializableRunnable(
+          title + "async putAll1 from client1") {
+        public void run2() throws CacheException {
+          doRemoveAll(regionName, "async1key-", numberOfEntries);
+        }
+      });
+      AsyncInvocation async2 = client1.invokeAsync(new CacheSerializableRunnable(
+          title + "async putAll2 from client1") {
+        public void run2() throws CacheException {
+          doRemoveAll(regionName, "async2key-", numberOfEntries);
+        }
+      });
+
+      DistributedTestCase.join(async1, 30 * 1000, getLogWriter());
+      DistributedTestCase.join(async2, 30 * 1000, getLogWriter());
+    }
+
+    client1.invoke(new CacheSerializableRunnable(title+"client1 removeAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        doRemoveAll(regionName, "key-", numberOfEntries);
+        assertEquals(0, region.size());
+      }
+    });   
+
+    // verify bridge server 1, its data are from client
+    server1.invoke(new CacheSerializableRunnable(title
+        + "verify async removeAll Bridge Server 1") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        assertEquals(0, region.size());
+      }
+    });
+
+    // verify bridge server 2, because its data are from distribution
+    server2.invoke(new CacheSerializableRunnable(title
+        + "verify async removeAll Bridge Server 2") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        assertEquals(0, region.size());
+      }
+    });
+
+    client2.invoke(new CacheSerializableRunnable(title+"client2 verify async removeAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        checkRegionSize(region, 0);
+      }
+    });
+
+    // Execute p2p putAll
+    server1.invoke(new CacheSerializableRunnable(title
+        + "server1 execute P2P putAll") {
+      public void run2() throws CacheException {
+        doPutAll(regionName, "p2pkey-", numberOfEntries);
+        Region region = getRootRegion().getSubregion(regionName);
+        long ts1 = 0;
+        for (int i = 0; i < numberOfEntries; i++) {
+          TestObject obj = (TestObject)region.getEntry("p2pkey-" + i)
+              .getValue();
+          assertEquals(i, obj.getPrice());
+          assertTrue(obj.getTS() >= ts1);
+          ts1 = obj.getTS();
+        }
+      }
+    });
+
+    // verify bridge server 2 for p2p keys
+    server2.invoke(new CacheSerializableRunnable(title
+        + "verify Bridge Server 2 for async keys") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        long ts1 = 0;
+        for (int i = 0; i < numberOfEntries; i++) {
+          TestObject obj = (TestObject)region.getEntry("p2pkey-" + i)
+              .getValue();
+          assertEquals(i, obj.getPrice());
+          assertTrue(obj.getTS() >= ts1);
+          ts1 = obj.getTS();
+        }
+      }
+    });
+    client2.invoke(new CacheSerializableRunnable(title+"client2 verify p2p putAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        checkRegionSize(region, numberOfEntries);
+        for (int i = 0; i < numberOfEntries; i++) {
+          Region.Entry re = region.getEntry("p2pkey-" + i);
+          assertNotNull(re);
+          assertEquals(null, re.getValue());
+        }
+      }
+    });   
+    client1.invoke(new CacheSerializableRunnable(title+"client1 verify p2p putAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        checkRegionSize(region, numberOfEntries);
+        for (int i = 0; i < numberOfEntries; i++) {
+          Region.Entry re = region.getEntry("p2pkey-" + i);
+          assertNotNull(re);
+          assertEquals(null, re.getValue());
+        }
+      }
+    });   
+
+    // Execute p2p removeAll
+    server1.invoke(new CacheSerializableRunnable(title
+        + "server1 execute P2P removeAll") {
+      public void run2() throws CacheException {
+        doRemoveAll(regionName, "p2pkey-", numberOfEntries);
+        Region region = getRootRegion().getSubregion(regionName);
+        assertEquals(0, region.size());
+      }
+    });
+    // verify bridge server 2, because its data are from distribution
+    server2.invoke(new CacheSerializableRunnable(title
+        + "verify p2p removeAll Bridge Server 2") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        assertEquals(0, region.size());
+      }
+    });
+
+    client2.invoke(new CacheSerializableRunnable(title+"client2 verify p2p removeAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        checkRegionSize(region, 0);
+      }
+    });
+
+    client1.invoke(new CacheSerializableRunnable(title+"client1 verify p2p removeAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        checkRegionSize(region, 0);
+      }
+    });
+
+    // putAll at client2 to trigger local-invalidates at client1
+    client2.invoke(new CacheSerializableRunnable(title
+        + "execute putAll on client2 for key 0-10") {
+      public void run2() throws CacheException {
+        doPutAll(regionName, "key-", 10);
+      }
+    });
+
+    // verify client 2 for key 0-10
+    client1.invoke(new CacheSerializableRunnable(title
+        + "verify client1 for local invalidate") {
+      public void run2() throws CacheException {
+        final Region region = getRootRegion().getSubregion(regionName);
+        for (int i = 0; i < 10; i++) {
+          final int ii = i;
+          WaitCriterion ev = new WaitCriterion() {
+            public boolean done() {
+              Entry entry = region.getEntry("key-" + ii);
+              return entry != null && entry.getValue() == null;
+            }
+            public String description() {
+              return null;
+            }
+          };
+          DistributedTestCase.waitForCriterion(ev, 10 * 1000, 1000, true);
+          // local invalidate will set the value to null
+          TestObject obj = (TestObject)region.getEntry("key-" + i).getValue();
+          assertEquals(null, obj);
+        }
+      }
+    });
+
+    // Stop server
+    stopBridgeServers(getCache());
+  }
+
+  // Checks to see if a client does a destroy that throws an exception from CacheWriter beforeDestroy
+  // that the size of the region is still correct.
+  // See bug 51583.
+  public void testClientDestroyOfUncreatedEntry() throws CacheException, InterruptedException {
+    final String title = "testClientDestroyOfUncreatedEntry:";
+
+    final Host host = Host.getHost(0);
+    final VM server1 = host.getVM(0);
+    final VM client1 = host.getVM(1);
+    final String regionName = getUniqueName();
+
+    final int serverPort1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    final String serverHost = getServerHostName(server1.getHost());
+
+    // set <true, false> means <PR=true, notifyBySubscription=false> to test local-invalidates
+    createBridgeServer(server1, regionName, serverPort1, false, 0, null);
+    createClient(client1, regionName, serverHost, new int[] {serverPort1}, -1, -1, false, true, true);
+ 
+    server1.invoke(addExceptionTag1(expectedExceptions));
+    client1.invoke(addExceptionTag1(expectedExceptions));
+
+    server1.invoke(new CacheSerializableRunnable(title
+        + "server1 add cacheWriter") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        // Install cacheWriter that causes the very first destroy to fail
+        region.getAttributesMutator().setCacheWriter(new MyWriter(0));
+      }
+    });
+
+    assertEquals(0, getRegionSize(server1, regionName));
+    client1.invoke(new CacheSerializableRunnable(title+"client1 destroy") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        try {
+          region.destroy("bogusKey");
+          fail("Expect ServerOperationException caused by CacheWriterException");
+        } catch (ServerOperationException expected) {
+          assertTrue(expected.getCause() instanceof CacheWriterException);
+        }
+      }
+    });   
+    assertEquals(0, getRegionSize(server1, regionName));
+    
+    server1.invoke(removeExceptionTag1(expectedExceptions));
+    client1.invoke(removeExceptionTag1(expectedExceptions));
+
+    stopBridgeServers(getCache());
+  }
+
+  /**
+   * Tests partial key putAll and removeAll to 2 servers with local region
+   */
+  public void testPartialKeyInLocalRegion() throws CacheException, InterruptedException {
+    final String title = "testPartialKeyInLocalRegion:";
+//    disconnectAllFromDS();
+
+    final Host host = Host.getHost(0);
+    final VM server1 = host.getVM(0);
+    final VM server2 = host.getVM(1);
+    final VM client1 = host.getVM(2);
+    final VM client2 = host.getVM(3);
+    final String regionName = getUniqueName();
+    
+    final int serverPort1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    final int serverPort2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    final String serverHost = getServerHostName(server1.getHost());
+
+    // set <true, false> means <PR=true, notifyBySubscription=false> to test local-invalidates
+    createBridgeServer(server1, regionName, serverPort1, false, 0, null);
+    createBridgeServer(server2, regionName, serverPort2, false, 0, null);
+    createClient(client1, regionName, serverHost, new int[] {serverPort1}, -1, -1, false, true, true);
+    createClient(client2, regionName, serverHost, new int[] {serverPort1}, -1, -1, false, true, true);
+    
+    server1.invoke(addExceptionTag1(expectedExceptions));
+    server2.invoke(addExceptionTag1(expectedExceptions));
+    client1.invoke(addExceptionTag1(expectedExceptions));
+    client2.invoke(addExceptionTag1(expectedExceptions));
+
+    server1.invoke(new CacheSerializableRunnable(title
+        + "server1 add cacheWriter") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        // let the server to trigger exception after created 15 keys
+        region.getAttributesMutator().setCacheWriter(new MyWriter(15));
+      }
+    });
+
+    client2.invoke(new CacheSerializableRunnable(title+"client2 add listener") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        region.getAttributesMutator().addCacheListener(new MyListener(false));
+        
+        region.registerInterest("ALL_KEYS");
+        getLogWriter().info("client1 registerInterest ALL_KEYS at "+region.getFullPath());
+      }
+    });   
+
+    client1.invoke(new CacheSerializableRunnable(title+"client1 putAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+
+        // create keys
+        try {
+          doPutAll(regionName, title, numberOfEntries);
+          fail("Expect ServerOperationException caused by PutAllParitialResultException");
+        } catch (ServerOperationException soe) {
+          assertTrue(soe.getMessage().contains(LocalizedStrings.Region_PutAll_Applied_PartialKeys_At_Server_0.toLocalizedString(region.getFullPath())));
+          assertTrue(soe.getCause() instanceof RuntimeException);
+          assertTrue(soe.getCause().getMessage().contains("Triggered exception as planned, created 15 keys"));
+        }
+      }
+    });   
+
+    {
+    WaitCriterion waitForSizes = new WaitCriterion() {
+      public String description() {
+        return "waiting for conditions to be met";
+      }
+      public boolean done() {
+        int c1Size = getRegionSize(client1, regionName);
+        int c2Size = getRegionSize(client2, regionName);
+        int s1Size = getRegionSize(server1, regionName);
+        int s2Size = getRegionSize(server2, regionName);
+        getLogWriter().info("region sizes: "+c1Size+","+c2Size+","+s1Size+","+s2Size);
+        if (c1Size != 15) {
+          getLogWriter().info("waiting for client1 to get all updates");
+          return false;
+        }
+        if (c2Size != 15) {
+          getLogWriter().info("waiting for client2 to get all updates");
+          return false;
+        }
+        if (s1Size != 15) {
+          getLogWriter().info("waiting for server1 to get all updates");
+          return false;
+        }
+        if (s2Size != 15) {
+          getLogWriter().info("waiting for server2 to get all updates");
+          return false;
+        }
+        return true;
+      }
+    };
+    waitForCriterion(waitForSizes, 10000, 1000, true);
+    }
+    int server1Size = getRegionSize(server1, regionName);
+    int server2Size = getRegionSize(server1, regionName);
+
+    // reset cacheWriter's count to allow another 15 keys to be created
+    server1.invoke(new CacheSerializableRunnable(title
+        + "server1 add cacheWriter") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        // let the server to trigger exception after created 15 keys
+        region.getAttributesMutator().setCacheWriter(new MyWriter(15));
+      }
+    });
+
+    // p2p putAll on DR and expect exception
+    server2.invoke(new CacheSerializableRunnable(title+"server2 add listener and putAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        region.getAttributesMutator().addCacheListener(new MyListener(false));
+
+        // create keys
+        try {
+          doPutAll(regionName, title+"again:", numberOfEntries);
+          fail("Expect original RuntimeException caused by cacheWriter");
+        } catch (RuntimeException rte) {
+          assertTrue(rte.getMessage().contains("Triggered exception as planned, created 15 keys"));
+        }
+      }
+    });   
+
+    server2Size = getRegionSize(server1, regionName);
+    assertEquals(server1Size+15, server2Size);
+    
+    {
+      WaitCriterion waitForSizes = new WaitCriterion() {
+        public String description() {
+          return "waiting for conditions to be met";
+        }
+        public boolean done() {
+          int c1Size = getRegionSize(client1, regionName);
+          int c2Size = getRegionSize(client2, regionName);
+          int s1Size = getRegionSize(server1, regionName);
+          int s2Size = getRegionSize(server2, regionName);
+          getLogWriter().info("region sizes: "+c1Size+","+c2Size+","+s1Size+","+s2Size);
+          if (c1Size != 15) { // client 1 did not register interest
+            getLogWriter().info("waiting for client1 to get all updates");
+            return false;
+          }
+          if (c2Size != 15*2) {
+            getLogWriter().info("waiting for client2 to get all updates");
+            return false;
+          }
+          if (s1Size != 15*2) {
+            getLogWriter().info("waiting for server1 to get all updates");
+            return false;
+          }
+          if (s2Size != 15*2) {
+            getLogWriter().info("waiting for server2 to get all updates");
+            return false;
+          }
+          return true;
+        }
+      };
+      waitForCriterion(waitForSizes, 10000, 1000, true);
+    }
+    
+    // now do a removeAll that is not allowed to remove everything
+    server1.invoke(new CacheSerializableRunnable(title
+        + "server1 add cacheWriter") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        // server triggers exception after destroying 5 keys
+        region.getAttributesMutator().setCacheWriter(new MyWriter(5));
+      }
+    });
+    client1.invoke(new CacheSerializableRunnable(title+"client1 removeAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+
+        // create keys
+        try {
+          doRemoveAll(regionName, title, numberOfEntries);
+          fail("Expect ServerOperationException caused by PutAllParitialResultException");
+        } catch (ServerOperationException soe) {
+          assertTrue(soe.getMessage().contains(LocalizedStrings.Region_RemoveAll_Applied_PartialKeys_At_Server_0.toLocalizedString(region.getFullPath())));
+          assertTrue(soe.getCause() instanceof RuntimeException);
+          assertTrue(soe.getCause().getMessage().contains("Triggered exception as planned, destroyed 5 keys"));
+        }
+      }
+    });   
+    {
+      WaitCriterion waitForSizes = new WaitCriterion() {
+        public String description() {
+          return "waiting for conditions to be met";
+        }
+        public boolean done() {
+          int c1Size = getRegionSize(client1, regionName);
+          int c2Size = getRegionSize(client2, regionName);
+          int s1Size = getRegionSize(server1, regionName);
+          int s2Size = getRegionSize(server2, regionName);
+          getLogWriter().info("region sizes: "+c1Size+","+c2Size+","+s1Size+","+s2Size);
+          if (c1Size != 15-5) { // client 1 did not register interest
+            getLogWriter().info("waiting for client1 to get all destroys");
+            return false;
+          }
+          if (c2Size != (15*2)-5) {
+            getLogWriter().info("waiting for client2 to get all destroys");
+            return false;
+          }
+          if (s1Size != (15*2)-5) {
+            getLogWriter().info("waiting for server1 to get all destroys");
+            return false;
+          }
+          if (s2Size != (15*2)-5) {
+            getLogWriter().info("waiting for server2 to get all destroys");
+            return false;
+          }
+          return true;
+        }
+      };
+      waitForCriterion(waitForSizes, 10000, 1000, true);
+    }
+
+    // reset cacheWriter's count to allow another 5 keys to be destroyed
+    server1.invoke(new CacheSerializableRunnable(title
+        + "server1 add cacheWriter") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        // server triggers exception after destroying 5 keys
+        region.getAttributesMutator().setCacheWriter(new MyWriter(5));
+      }
+    });
+
+    // p2p putAll on DR and expect exception
+    server2.invoke(new CacheSerializableRunnable(title+"server2 add listener and removeAll") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        region.getAttributesMutator().addCacheListener(new MyListener(false));
+
+        // create keys
+        try {
+          doRemoveAll(regionName, title+"again:", numberOfEntries);
+          fail("Expect original RuntimeException caused by cacheWriter");
+        } catch (RuntimeException rte) {
+          assertTrue(rte.getMessage().contains("Triggered exception as planned, destroyed 5 keys"));
+        }
+      }
+    });   
+    
+    {
+      WaitCriterion waitForSizes = new WaitCriterion() {
+        public String description() {
+          return "waiting for conditions to be met";
+        }
+        public boolean done() {
+          int c1Size = getRegionSize(client1, regionName);
+          int c2Size = getRegionSize(client2, regionName);
+          int s1Size = getRegionSize(server1, regionName);
+          int s2Size = getRegionSize(server2, regionName);
+          getLogWriter().info("region sizes: "+c1Size+","+c2Size+","+s1Size+","+s2Size);
+          if (c1Size != 15-5) { // client 1 did not register interest
+            getLogWriter().info("waiting for client1 to get all destroys");
+            return false;
+          }
+          if (c2Size != (15*2)-5-5) {
+            getLogWriter().info("waiting for client2 to get all destroys");
+            return false;
+          }
+          if (s1Size != (15*2)-5-5) {
+            getLogWriter().info("waiting for server1 to get all destroys");
+            return false;
+          }
+          if (s2Size != (15*2)-5-5) {
+            getLogWriter().info("waiting for server2 to get all destroys");
+            return false;
+          }
+          return true;
+        }
+      };
+      waitForCriterion(waitForSizes, 10000, 1000, true);
+    }
+    server1.invoke(removeExceptionTag1(expectedExceptions));
+    server2.invoke(removeExceptionTag1(expectedExceptions));
+    client1.invoke(removeExceptionTag1(expectedExceptions));
+    client2.invoke(removeExceptionTag1(expectedExceptions));
+
+    // Stop server
+    stopBridgeServers(getCache());
+  }
+
+  /**
+   * Tests partial key putAll to 2 PR servers, because putting data at server
+   * side is different between PR and LR. PR does it in postPutAll.
+   * It's not running in singleHop putAll
+   */
+  public void testPartialKeyInPR() throws CacheException, InterruptedException {
+    final String title = "testPartialKeyInPR:";
+//    disconnectAllFromDS();
+
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    final VM server2 = host.getVM(1);
+    VM client1 = host.getVM(2);
+    VM client2 = host.getVM(3);
+    final String regionName = getUniqueName();
+    
+    final int serverPort1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    final int serverPort2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    final String serverHost = getServerHostName(server1.getHost());
+
+    // set <true, false> means <PR=true, notifyBySubscription=false> to test local-invalidates
+    createBridgeServer(server1, regionName, serverPort1, true, 0, "ds1");
+    createBridgeServer(server2, regionName, serverPort2, true, 0, "ds1");
+    createClient(client1, regionName, serverHost, new int[] {serverPort1, serverPort2}, -1, -1, false, false, true);
+    createClient(client2, regionName, serverHost, new int[] {serverPort1, serverPort2}, -1, -1, false, false, true);
+
+    server1.invoke(addExceptionTag1(expectedExceptions));
+    server2.invoke(addExceptionTag1(expectedExceptions));
+    client1.invoke(addExceptionTag1(expectedExceptions));
+    client2.invoke(addExceptionTag1(expectedExceptions));
+
+    server1.invoke(new CacheSerializableRunnable(title
+        + "server1 add slow listener") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        region.getAttributesMutator().addCacheListener(new MyListener(true));
+      }
+    });
+
+    final SharedCounter sc_server2 = new SharedCounter("server2");
+    
+    server2.invoke(new CacheSerializableRunnable(title
+        + "server2 add slow listener") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        region.getAttributesMutator().addCacheListener(new MyListener(server2, true, sc_server2, 10));
+      }
+    });
+    
+    client2.invoke(new CacheSerializableRunnable(title+"client2 add listener") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        region.getAttributesMutator().addCacheListener(new MyListener(false));
+       

<TRUNCATED>


[53/70] incubator-geode git commit: GEODE-802: Add cq, wan projects to the gradle build

Posted by up...@apache.org.
GEODE-802: Add cq, wan projects to the gradle build

The gemfire-cq and gemfire-wan projects will now be built along with
everything else.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/56bbcbe2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/56bbcbe2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/56bbcbe2

Branch: refs/heads/develop
Commit: 56bbcbe27f59055f8f2fe7606b14c2de93025f2a
Parents: 2b78134
Author: Dan Smith <up...@apache.org>
Authored: Wed Jan 20 13:34:21 2016 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Fri Jan 22 14:45:24 2016 -0800

----------------------------------------------------------------------
 gemfire-assembly/build.gradle | 10 ++++++++++
 gemfire-cq/build.gradle       |  1 -
 settings.gradle               |  2 ++
 3 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/56bbcbe2/gemfire-assembly/build.gradle
----------------------------------------------------------------------
diff --git a/gemfire-assembly/build.gradle b/gemfire-assembly/build.gradle
index 0b922d5..834413e 100755
--- a/gemfire-assembly/build.gradle
+++ b/gemfire-assembly/build.gradle
@@ -53,6 +53,8 @@ dependencies {
   archives project(':gemfire-web')
   archives project(':gemfire-web-api')
   archives project(':gemfire-pulse')
+  archives project(':gemfire-wan')
+  archives project(':gemfire-cq')
 
   testCompile project(path: ':gemfire-junit', configuration: 'testOutput')
   testCompile project(path: ':gemfire-core', configuration: 'testOutput')
@@ -145,6 +147,8 @@ def cp = {
       it.contains('hbase') ||
       it.contains('jgroups') ||
       it.contains('netty') ||
+      it.contains('gemfire-wan') ||
+      it.contains('gemfire-cq') ||
       
       // dependencies from gemfire-lucene
       it.contains('lucene-analyzers-common') ||
@@ -249,6 +253,12 @@ distributions {
         from project(":gemfire-joptsimple").configurations.runtime
         from project(":gemfire-joptsimple").configurations.archives.allArtifacts.files
 
+        from project(":gemfire-wan").configurations.runtime
+        from project(":gemfire-wan").configurations.archives.allArtifacts.files
+
+        from project(":gemfire-cq").configurations.runtime
+        from project(":gemfire-cq").configurations.archives.allArtifacts.files
+
         from project(":gemfire-core").configurations.runtime
         // Copying from provided configuration is only for supporting Spring Data GemFire.
         // If there are more dependencies added to provided configuration, this will need

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/56bbcbe2/gemfire-cq/build.gradle
----------------------------------------------------------------------
diff --git a/gemfire-cq/build.gradle b/gemfire-cq/build.gradle
index ed92c42..eba2539 100644
--- a/gemfire-cq/build.gradle
+++ b/gemfire-cq/build.gradle
@@ -1,6 +1,5 @@
 dependencies {
   provided project(':gemfire-core')
-  provided project(':gemfire-test')
   provided project(path: ':gemfire-core', configuration: 'testOutput')
   provided project(path: ':gemfire-junit', configuration: 'testOutput')
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/56bbcbe2/settings.gradle
----------------------------------------------------------------------
diff --git a/settings.gradle b/settings.gradle
index 8fd2d6c..0e03868 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -27,6 +27,8 @@ include 'gemfire-pulse'
 include 'gemfire-assembly'
 include 'gemfire-rebalancer'
 include 'gemfire-lucene'
+include 'gemfire-wan'
+include 'gemfire-cq'
 
 def minimumGradleVersion = '2.3'
 if (GradleVersion.current() < GradleVersion.version(minimumGradleVersion)) {


[60/70] incubator-geode git commit: GEODE-803: Updating headers on WAN and CQ code

Posted by up...@apache.org.
GEODE-803: Updating headers on WAN and CQ code

These files all needed the apache header.

I deleted some empty .keepme files which are no longer necessary.

I also deleted cqStatsHCT.conf and cqStats.bt because the test framework
required to run those tests has not yet been open sourced.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/0979936e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/0979936e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/0979936e

Branch: refs/heads/develop
Commit: 0979936ec6e07cf2543f7fd30c43a609f88b0f88
Parents: 8fdbab4
Author: Dan Smith <up...@apache.org>
Authored: Mon Jan 25 10:11:54 2016 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Mon Jan 25 10:41:03 2016 -0800

----------------------------------------------------------------------
 gemfire-cq/build.gradle                         |   17 +
 .../cache/client/internal/CloseCQOp.java        |   21 +-
 .../cache/client/internal/CreateCQOp.java       |   21 +-
 .../cache/client/internal/CreateCQWithIROp.java |   21 +-
 .../cache/client/internal/GetDurableCQsOp.java  |   21 +-
 .../client/internal/ServerCQProxyImpl.java      |   21 +-
 .../gemfire/cache/client/internal/StopCQOp.java |   21 +-
 .../cache/query/internal/cq/ClientCQImpl.java   |   16 +
 .../internal/cq/CqAttributesMutatorImpl.java    |   22 +-
 .../cache/query/internal/cq/CqConflatable.java  |   21 +-
 .../cache/query/internal/cq/CqEventImpl.java    |   22 +-
 .../cache/query/internal/cq/CqListenerImpl.java |   22 +-
 .../cache/query/internal/cq/CqQueryImpl.java    |   22 +-
 .../query/internal/cq/CqServiceFactoryImpl.java |   16 +
 .../cache/query/internal/cq/CqServiceImpl.java  |   22 +-
 .../internal/cq/CqServiceStatisticsImpl.java    |   22 +-
 .../query/internal/cq/CqServiceVsdStats.java    |   21 +-
 .../query/internal/cq/CqStatisticsImpl.java     |   22 +-
 .../cache/query/internal/cq/ServerCQImpl.java   |   16 +
 .../tier/sockets/command/BaseCQCommand.java     |   16 +
 .../cache/tier/sockets/command/CloseCQ.java     |   24 +-
 .../cache/tier/sockets/command/ExecuteCQ.java   |   24 +-
 .../cache/tier/sockets/command/ExecuteCQ61.java |   24 +-
 .../cache/tier/sockets/command/GetCQStats.java  |   24 +-
 .../tier/sockets/command/GetDurableCQs.java     |   24 +-
 .../cache/tier/sockets/command/MonitorCQ.java   |   24 +-
 .../cache/tier/sockets/command/StopCQ.java      |   24 +-
 ...cache.query.internal.cq.spi.CqServiceFactory |   14 +
 .../gemfire/cache/query/cq/CQJUnitTest.java     |   27 +-
 .../cache/query/cq/dunit/CqDataDUnitTest.java   |   21 +-
 .../dunit/CqDataOptimizedExecuteDUnitTest.java  |   21 +-
 .../cq/dunit/CqDataUsingPoolDUnitTest.java      |   21 +-
 ...qDataUsingPoolOptimizedExecuteDUnitTest.java |   21 +-
 .../cache/query/cq/dunit/CqPerfDUnitTest.java   |   21 +-
 .../cq/dunit/CqPerfUsingPoolDUnitTest.java      |   21 +-
 .../cache/query/cq/dunit/CqQueryDUnitTest.java  |   21 +-
 .../dunit/CqQueryOptimizedExecuteDUnitTest.java |   21 +-
 .../cq/dunit/CqQueryUsingPoolDUnitTest.java     |   22 +-
 ...QueryUsingPoolOptimizedExecuteDUnitTest.java |   21 +-
 .../cq/dunit/CqResultSetUsingPoolDUnitTest.java |   21 +-
 ...ltSetUsingPoolOptimizedExecuteDUnitTest.java |   21 +-
 .../cache/query/cq/dunit/CqStateDUnitTest.java  |   16 +
 .../cache/query/cq/dunit/CqStatsDUnitTest.java  |   21 +-
 .../dunit/CqStatsOptimizedExecuteDUnitTest.java |   21 +-
 .../cq/dunit/CqStatsUsingPoolDUnitTest.java     |   21 +-
 ...StatsUsingPoolOptimizedExecuteDUnitTest.java |   21 +-
 .../query/cq/dunit/CqTimeTestListener.java      |   21 +-
 .../PartitionedRegionCqQueryDUnitTest.java      |   21 +-
 ...dRegionCqQueryOptimizedExecuteDUnitTest.java |   21 +-
 .../query/cq/dunit/PrCqUsingPoolDUnitTest.java  |   21 +-
 .../PrCqUsingPoolOptimizedExecuteDUnitTest.java |   21 +-
 .../cache/query/dunit/PdxQueryCQDUnitTest.java  |   16 +
 .../cache/query/dunit/PdxQueryCQTestBase.java   | 1000 +++++++++---------
 .../dunit/QueryIndexUpdateRIDUnitTest.java      |   24 +-
 .../query/dunit/QueryMonitorDUnitTest.java      |   21 +-
 .../cache/snapshot/ClientSnapshotDUnitTest.java |   21 +-
 .../AnalyzeCQSerializablesJUnitTest.java        |  149 +--
 .../cache/PRDeltaPropagationDUnitTest.java      |   21 +-
 .../internal/cache/PutAllCSDUnitTest.java       |   21 +-
 .../cache/RemoteCQTransactionDUnitTest.java     |   16 +
 .../internal/cache/ha/CQListGIIDUnitTest.java   |   22 +-
 .../cache/ha/HADispatcherDUnitTest.java         |   21 +-
 .../sockets/ClientToServerDeltaDUnitTest.java   |   21 +-
 .../DeltaPropagationWithCQDUnitTest.java        |   24 +-
 ...ToRegionRelationCQRegistrationDUnitTest.java |   21 +-
 .../sockets/DurableClientCrashDUnitTest.java    |   21 +-
 .../sockets/DurableClientNetDownDUnitTest.java  |   21 +-
 .../sockets/DurableClientSimpleDUnitTest.java   |   21 +-
 .../tier/sockets/DurableClientTestCase.java     |   21 +-
 .../CacheServerManagementDUnitTest.java         |   20 +-
 .../cli/commands/ClientCommandsDUnitTest.java   |   20 +-
 .../DurableClientCommandsDUnitTest.java         |   21 +-
 .../internal/pulse/TestCQDUnitTest.java         |   20 +-
 .../internal/pulse/TestClientsDUnitTest.java    |   20 +-
 .../internal/pulse/TestServerDUnitTest.java     |   20 +-
 .../ClientAuthorizationTwoDUnitTest.java        |   21 +-
 .../security/ClientAuthzObjectModDUnitTest.java |   21 +-
 .../ClientCQPostAuthorizationDUnitTest.java     |   21 +-
 .../ClientPostAuthorizationDUnitTest.java       |   21 +-
 .../gemfire/security/MultiuserAPIDUnitTest.java |   21 +-
 .../MultiuserDurableCQAuthzDUnitTest.java       |   24 +-
 gemfire-cq/src/test/resources/.keepme           |    0
 .../tier/sockets/durablecq-client-cache.xml     |   16 +
 .../tier/sockets/durablecq-server-cache.xml     |   16 +
 .../src/test/resources/cq/statistics/cqStats.bt |    3 -
 .../resources/cq/statistics/cqStatsHCT.conf     |  100 --
 gemfire-wan/build.gradle                        |   17 +
 gemfire-wan/src/main/java/.keepme               |    0
 .../client/internal/GatewaySenderBatchOp.java   |   21 +-
 .../cache/client/internal/SenderProxy.java      |   21 +-
 .../internal/locator/wan/LocatorDiscovery.java  |   21 +-
 .../internal/locator/wan/LocatorHelper.java     |   21 +-
 .../locator/wan/LocatorJoinMessage.java         |   21 +-
 .../wan/LocatorMembershipListenerImpl.java      |   21 +-
 .../locator/wan/RemoteLocatorJoinRequest.java   |   21 +-
 .../locator/wan/RemoteLocatorJoinResponse.java  |   21 +-
 .../locator/wan/RemoteLocatorPingRequest.java   |   21 +-
 .../locator/wan/RemoteLocatorPingResponse.java  |   21 +-
 .../locator/wan/RemoteLocatorRequest.java       |   21 +-
 .../locator/wan/RemoteLocatorResponse.java      |   21 +-
 .../internal/locator/wan/WANFactoryImpl.java    |   16 +
 .../locator/wan/WanLocatorDiscovererImpl.java   |   21 +-
 .../cache/wan/AbstractRemoteGatewaySender.java  |   16 +
 .../cache/wan/GatewayReceiverFactoryImpl.java   |   21 +-
 .../internal/cache/wan/GatewayReceiverImpl.java |   20 +-
 .../wan/GatewaySenderEventRemoteDispatcher.java |   21 +-
 .../cache/wan/GatewaySenderFactoryImpl.java     |   20 +-
 .../wan/parallel/ParallelGatewaySenderImpl.java |   22 +-
 ...rentParallelGatewaySenderEventProcessor.java |   16 +
 ...moteParallelGatewaySenderEventProcessor.java |   16 +
 ...urrentSerialGatewaySenderEventProcessor.java |   16 +
 ...RemoteSerialGatewaySenderEventProcessor.java |   16 +
 .../wan/serial/SerialGatewaySenderImpl.java     |   21 +-
 gemfire-wan/src/main/resources/.keepme          |    0
 ...ternal.locator.wan.LocatorMembershipListener |   16 +-
 ...ne.gemfire.internal.cache.wan.spi.WANFactory |   14 +
 .../cache/CacheXml70GatewayDUnitTest.java       |   16 +
 .../cache/CacheXml80GatewayDUnitTest.java       |   16 +
 .../AnalyzeWANSerializablesJUnitTest.java       |  173 +--
 .../internal/cache/UpdateVersionDUnitTest.java  |   24 +-
 .../gemfire/internal/cache/wan/WANTestBase.java |   21 +-
 ...oncurrentParallelGatewaySenderDUnitTest.java |   24 +-
 ...ntParallelGatewaySenderOffHeapDUnitTest.java |   16 +
 ...allelGatewaySenderOperation_1_DUnitTest.java |   24 +-
 ...allelGatewaySenderOperation_2_DUnitTest.java |   24 +-
 ...tSerialGatewaySenderOperationsDUnitTest.java |   24 +-
 ...GatewaySenderOperationsOffHeapDUnitTest.java |   16 +
 .../ConcurrentWANPropogation_1_DUnitTest.java   |   24 +-
 .../ConcurrentWANPropogation_2_DUnitTest.java   |   24 +-
 .../cache/wan/disttx/DistTXWANDUnitTest.java    |   16 +
 .../CommonParallelGatewaySenderDUnitTest.java   |   24 +-
 ...onParallelGatewaySenderOffHeapDUnitTest.java |   16 +
 ...wWANConcurrencyCheckForDestroyDUnitTest.java |   24 +-
 .../cache/wan/misc/PDXNewWanDUnitTest.java      |   21 +-
 ...dRegion_ParallelWANPersistenceDUnitTest.java |   21 +-
 ...dRegion_ParallelWANPropogationDUnitTest.java |   21 +-
 .../SenderWithTransportFilterDUnitTest.java     |   21 +-
 ...downAllPersistentGatewaySenderDUnitTest.java |   21 +-
 .../wan/misc/WANConfigurationJUnitTest.java     |   21 +-
 .../wan/misc/WANLocatorServerDUnitTest.java     |   21 +-
 .../cache/wan/misc/WANSSLDUnitTest.java         |   16 +
 .../wan/misc/WanAutoDiscoveryDUnitTest.java     |   21 +-
 .../cache/wan/misc/WanValidationsDUnitTest.java |   21 +-
 ...GatewaySenderOperationsOffHeapDUnitTest.java |   16 +
 ...ewaySenderQueueOverflowOffHeapDUnitTest.java |   16 +
 .../ParallelWANConflationOffHeapDUnitTest.java  |   16 +
 ...nceEnabledGatewaySenderOffHeapDUnitTest.java |   16 +
 ...ropogationConcurrentOpsOffHeapDUnitTest.java |   16 +
 .../ParallelWANPropogationOffHeapDUnitTest.java |   16 +
 ...erialGatewaySenderQueueOffHeapDUnitTest.java |   16 +
 ...nceEnabledGatewaySenderOffHeapDUnitTest.java |   16 +
 .../SerialWANPropogationOffHeapDUnitTest.java   |   16 +
 ...ation_PartitionedRegionOffHeapDUnitTest.java |   16 +
 ...arallelGatewaySenderOperationsDUnitTest.java |   21 +-
 ...llelGatewaySenderQueueOverflowDUnitTest.java |   21 +-
 .../ParallelWANConflationDUnitTest.java         |   24 +-
 ...ersistenceEnabledGatewaySenderDUnitTest.java |   21 +-
 ...llelWANPropagationClientServerDUnitTest.java |   24 +-
 ...lelWANPropagationConcurrentOpsDUnitTest.java |   21 +-
 .../ParallelWANPropagationDUnitTest.java        |   21 +-
 ...ParallelWANPropagationLoopBackDUnitTest.java |   21 +-
 .../wan/parallel/ParallelWANStatsDUnitTest.java |   21 +-
 ...tewaySenderDistributedDeadlockDUnitTest.java |   16 +
 ...rialGatewaySenderEventListenerDUnitTest.java |   21 +-
 .../SerialGatewaySenderOperationsDUnitTest.java |   24 +-
 .../SerialGatewaySenderQueueDUnitTest.java      |   21 +-
 ...ersistenceEnabledGatewaySenderDUnitTest.java |   24 +-
 .../SerialWANPropagationLoopBackDUnitTest.java  |   21 +-
 .../serial/SerialWANPropogationDUnitTest.java   |   21 +-
 ...NPropogation_PartitionedRegionDUnitTest.java |   21 +-
 .../SerialWANPropogationsFeatureDUnitTest.java  |   21 +-
 .../wan/serial/SerialWANStatsDUnitTest.java     |   21 +-
 .../wan/wancommand/WANCommandTestBase.java      |   21 +-
 ...anCommandCreateGatewayReceiverDUnitTest.java |   21 +-
 .../WanCommandCreateGatewaySenderDUnitTest.java |   21 +-
 ...WanCommandGatewayReceiverStartDUnitTest.java |   21 +-
 .../WanCommandGatewayReceiverStopDUnitTest.java |   21 +-
 .../WanCommandGatewaySenderStartDUnitTest.java  |   21 +-
 .../WanCommandGatewaySenderStopDUnitTest.java   |   21 +-
 .../wan/wancommand/WanCommandListDUnitTest.java |   21 +-
 .../WanCommandPauseResumeDUnitTest.java         |   21 +-
 .../wancommand/WanCommandStatusDUnitTest.java   |   21 +-
 .../management/WANManagementDUnitTest.java      |   21 +-
 .../ClusterConfigurationDUnitTest.java          |   16 +
 .../pulse/TestRemoteClusterDUnitTest.java       |   20 +-
 gemfire-wan/src/test/resources/.keepme          |    0
 186 files changed, 3348 insertions(+), 1674 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/build.gradle
----------------------------------------------------------------------
diff --git a/gemfire-cq/build.gradle b/gemfire-cq/build.gradle
index eba2539..35ee0fa 100644
--- a/gemfire-cq/build.gradle
+++ b/gemfire-cq/build.gradle
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 dependencies {
   provided project(':gemfire-core')
   provided project(path: ':gemfire-core', configuration: 'testOutput')

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CloseCQOp.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CloseCQOp.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CloseCQOp.java
index f1c608f..d5e540a 100644
--- a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CloseCQOp.java
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CloseCQOp.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.client.internal;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CreateCQOp.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CreateCQOp.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CreateCQOp.java
index 438cb70..df297a8 100644
--- a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CreateCQOp.java
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CreateCQOp.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.client.internal;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CreateCQWithIROp.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CreateCQWithIROp.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CreateCQWithIROp.java
index 394d239..bd8c52a 100644
--- a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CreateCQWithIROp.java
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/CreateCQWithIROp.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.client.internal;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/GetDurableCQsOp.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/GetDurableCQsOp.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/GetDurableCQsOp.java
index 39e0d6e..2c1ede0 100755
--- a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/GetDurableCQsOp.java
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/GetDurableCQsOp.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.client.internal;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/ServerCQProxyImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/ServerCQProxyImpl.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/ServerCQProxyImpl.java
index cf25f5b..d1f6892 100644
--- a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/ServerCQProxyImpl.java
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/ServerCQProxyImpl.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.client.internal;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/StopCQOp.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/StopCQOp.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/StopCQOp.java
index c156d88..75b3e1e 100644
--- a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/StopCQOp.java
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/client/internal/StopCQOp.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.client.internal;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/ClientCQImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/ClientCQImpl.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/ClientCQImpl.java
index b1fe8e6..7fbd9d0 100644
--- a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/ClientCQImpl.java
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/ClientCQImpl.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.cache.query.internal.cq;
 
 import java.util.concurrent.ConcurrentLinkedQueue;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqAttributesMutatorImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqAttributesMutatorImpl.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqAttributesMutatorImpl.java
index 09afc99..c991db8 100644
--- a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqAttributesMutatorImpl.java
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqAttributesMutatorImpl.java
@@ -1,11 +1,19 @@
-/*=========================================================================
- * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package com.gemstone.gemfire.cache.query.internal.cq;
 
 import com.gemstone.gemfire.cache.query.CqAttributesMutator;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqConflatable.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqConflatable.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqConflatable.java
index fe5903c..f431343 100644
--- a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqConflatable.java
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqConflatable.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.query.internal.cq;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqEventImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqEventImpl.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqEventImpl.java
index 4b2fae6..bcd3cad 100644
--- a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqEventImpl.java
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqEventImpl.java
@@ -1,11 +1,19 @@
-/*=========================================================================
- * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- *========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package com.gemstone.gemfire.cache.query.internal.cq;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqListenerImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqListenerImpl.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqListenerImpl.java
index 8b3777c..65281f6 100644
--- a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqListenerImpl.java
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqListenerImpl.java
@@ -1,11 +1,19 @@
-/*=========================================================================
- * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- *========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package com.gemstone.gemfire.cache.query.internal.cq;
 
 import com.gemstone.gemfire.cache.query.CqListener;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqQueryImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqQueryImpl.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqQueryImpl.java
index f2aed77..d8daa2a 100644
--- a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqQueryImpl.java
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqQueryImpl.java
@@ -1,10 +1,18 @@
-/*=========================================================================
- * Copyright Copyright (c) 2000-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- * $Id: DefaultQueryService.java,v 1.2 2005/02/01 17:19:20 vaibhav Exp $
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.query.internal.cq;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceFactoryImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceFactoryImpl.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceFactoryImpl.java
index e39ba53..a735ec2 100644
--- a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceFactoryImpl.java
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceFactoryImpl.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.cache.query.internal.cq;
 
 import java.io.DataInput;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceImpl.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceImpl.java
index 7d4dbb0..21d8ff5 100644
--- a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceImpl.java
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceImpl.java
@@ -1,10 +1,18 @@
-/*=========================================================================
- * Copyright Copyright (c) 2000-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- * $Id: DefaultQueryService.java,v 1.2 2005/02/01 17:19:20 vaibhav Exp $
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.query.internal.cq;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceStatisticsImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceStatisticsImpl.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceStatisticsImpl.java
index 9f504fa..a66eec7 100644
--- a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceStatisticsImpl.java
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceStatisticsImpl.java
@@ -1,11 +1,19 @@
-/*=========================================================================
- * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- *========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package com.gemstone.gemfire.cache.query.internal.cq;
 
 import com.gemstone.gemfire.cache.CacheFactory;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceVsdStats.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceVsdStats.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceVsdStats.java
index 3e932cf..a2e8b6e 100644
--- a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceVsdStats.java
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqServiceVsdStats.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.query.internal.cq;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqStatisticsImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqStatisticsImpl.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqStatisticsImpl.java
index 492a563..0792061 100644
--- a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqStatisticsImpl.java
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/CqStatisticsImpl.java
@@ -1,11 +1,19 @@
-/*=========================================================================
- * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- *========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package com.gemstone.gemfire.cache.query.internal.cq;
 
 import com.gemstone.gemfire.cache.query.CqStatistics;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/ServerCQImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/ServerCQImpl.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/ServerCQImpl.java
index 385c0a5..1acb23c 100644
--- a/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/ServerCQImpl.java
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/cache/query/internal/cq/ServerCQImpl.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.cache.query.internal.cq;
 
 import java.io.DataInput;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/BaseCQCommand.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/BaseCQCommand.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/BaseCQCommand.java
index 85e886b..a77ebe5 100644
--- a/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/BaseCQCommand.java
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/BaseCQCommand.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.internal.cache.tier.sockets.command;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/CloseCQ.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/CloseCQ.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/CloseCQ.java
index 4f8b2ef..2b25d89 100644
--- a/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/CloseCQ.java
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/CloseCQ.java
@@ -1,12 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-/**
- * 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets.command;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteCQ.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteCQ.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteCQ.java
index 9f111fc..378cfc4 100644
--- a/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteCQ.java
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteCQ.java
@@ -1,12 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-/**
- * 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets.command;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteCQ61.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteCQ61.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteCQ61.java
index 8e19ef3..d30832a 100755
--- a/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteCQ61.java
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/ExecuteCQ61.java
@@ -1,12 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-/**
- * 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets.command;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetCQStats.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetCQStats.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetCQStats.java
index b483ddf..5c51fd0 100644
--- a/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetCQStats.java
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetCQStats.java
@@ -1,12 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-/**
- * 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets.command;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetDurableCQs.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetDurableCQs.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetDurableCQs.java
index f22d141..f06d61f 100755
--- a/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetDurableCQs.java
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/GetDurableCQs.java
@@ -1,12 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-/**
- * 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets.command;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/MonitorCQ.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/MonitorCQ.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/MonitorCQ.java
index bd77cee..bf18dae 100644
--- a/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/MonitorCQ.java
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/MonitorCQ.java
@@ -1,12 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-/**
- * 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets.command;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/StopCQ.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/StopCQ.java b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/StopCQ.java
index 157158e..1bdf352 100644
--- a/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/StopCQ.java
+++ b/gemfire-cq/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/StopCQ.java
@@ -1,12 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-/**
- * 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets.command;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/main/resources/META-INF/services/com.gemstone.gemfire.cache.query.internal.cq.spi.CqServiceFactory
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/main/resources/META-INF/services/com.gemstone.gemfire.cache.query.internal.cq.spi.CqServiceFactory b/gemfire-cq/src/main/resources/META-INF/services/com.gemstone.gemfire.cache.query.internal.cq.spi.CqServiceFactory
index 0c51c3d..4504603 100644
--- a/gemfire-cq/src/main/resources/META-INF/services/com.gemstone.gemfire.cache.query.internal.cq.spi.CqServiceFactory
+++ b/gemfire-cq/src/main/resources/META-INF/services/com.gemstone.gemfire.cache.query.internal.cq.spi.CqServiceFactory
@@ -1 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 com.gemstone.gemfire.cache.query.internal.cq.CqServiceFactoryImpl

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/CQJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/CQJUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/CQJUnitTest.java
index 66b23c2..606d8aa 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/CQJUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/CQJUnitTest.java
@@ -1,16 +1,19 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
-//
-//  CQJUnitTest.java
-//
-//  Created by Eric Zoerner on 6/28/07.
-
 package com.gemstone.gemfire.cache.query.cq;
 
 import java.util.Properties;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java
index 1a1fc77..63235d4 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
index 9ea420d..2a44b3e 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
index e87cb0f..245b6e4 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
index 157ffab..dd0adec 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java
index 7d47dd6..989fee0 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
index 883e6ee..5fd1998 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
index a2670e6..5ee75e3 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
index 4b09e73..8688057 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
index f4f524d..343b529 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
@@ -1,11 +1,19 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package com.gemstone.gemfire.cache.query.cq.dunit;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
index c58e02c..acfb473 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
index e7f3e0e..2346e91 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.cache.query.cq.dunit;
 



[55/70] incubator-geode git commit: GEODE-804: Remaining WAN and CQ changes from pivotal

Posted by up...@apache.org.
GEODE-804: Remaining WAN and CQ changes from pivotal

These are minor changes that happened after the SGA but before the
initial code drop.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/8fdbab40
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/8fdbab40
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/8fdbab40

Branch: refs/heads/develop
Commit: 8fdbab40c0fd3e5eb977f41666d6fd4550600d06
Parents: 56bbcbe
Author: Dan Smith <up...@apache.org>
Authored: Fri Jan 22 15:07:36 2016 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Fri Jan 22 15:11:42 2016 -0800

----------------------------------------------------------------------
 .../query/dunit/QueryMonitorDUnitTest.java      | 124 ++-
 .../internal/cache/PutAllCSDUnitTest.java       |  79 +-
 .../sockets/DurableClientSimpleDUnitTest.java   | 862 ++++++++++---------
 .../tier/sockets/DurableClientTestCase.java     | 193 +++--
 .../DurableClientCommandsDUnitTest.java         |  39 +-
 .../wan/GatewaySenderEventRemoteDispatcher.java |   4 +-
 .../wan/parallel/ParallelGatewaySenderImpl.java |   8 +-
 .../wan/serial/SerialGatewaySenderImpl.java     |   8 +-
 .../gemfire/internal/cache/wan/WANTestBase.java |  36 +-
 ...allelGatewaySenderOperation_1_DUnitTest.java |   7 +-
 ...tSerialGatewaySenderOperationsDUnitTest.java |  67 +-
 ...arallelGatewaySenderOperationsDUnitTest.java |   5 -
 .../SerialGatewaySenderOperationsDUnitTest.java |  66 +-
 13 files changed, 859 insertions(+), 639 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fdbab40/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
index 92f2817..1f1758d 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
@@ -59,47 +59,48 @@ public class QueryMonitorDUnitTest extends CacheTestCase {
   private final String exampleRegionName2 = "exampleRegion2";
   private final String poolName = "serverConnectionPool";
   
+  
   /* Some of the queries are commented out as they were taking less time */
   String[]  queryStr = {
       "SELECT ID FROM /root/exampleRegion p WHERE  p.ID > 100",
-      //"SELECT DISTINCT * FROM /root/exampleRegion x, x.positions.values WHERE  x.pk != '1000'",
-      //"SELECT DISTINCT * FROM /root/exampleRegion x, x.positions.values WHERE  x.pkid != '1'",
-      //"SELECT DISTINCT * FROM /root/exampleRegion p, p.positions.values WHERE  p.pk > '1'",
-      //"SELECT DISTINCT * FROM /root/exampleRegion p, p.positions.values WHERE  p.pkid != '53'",
-      //"SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos WHERE  pos.Id > 100",
-      //"SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos WHERE  pos.Id > 100 and pos.secId IN SET('YHOO', 'IBM', 'AMZN')",
-      //"SELECT * FROM /root/exampleRegion p WHERE  p.ID > 100 and p.status = 'active' and p.ID < 100000",
+      "SELECT DISTINCT * FROM /root/exampleRegion x, x.positions.values WHERE  x.pk != '1000'",
+      "SELECT DISTINCT * FROM /root/exampleRegion x, x.positions.values WHERE  x.pkid != '1'",
+      "SELECT DISTINCT * FROM /root/exampleRegion p, p.positions.values WHERE  p.pk > '1'",
+      "SELECT DISTINCT * FROM /root/exampleRegion p, p.positions.values WHERE  p.pkid != '53'",
+      "SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos WHERE  pos.Id > 100",
+      "SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos WHERE  pos.Id > 100 and pos.secId IN SET('YHOO', 'IBM', 'AMZN')",
+      "SELECT * FROM /root/exampleRegion p WHERE  p.ID > 100 and p.status = 'active' and p.ID < 100000",
       "SELECT * FROM /root/exampleRegion WHERE  ID > 100 and status = 'active'",
-      //"SELECT DISTINCT * FROM /root/exampleRegion p WHERE  p.ID > 100 and p.status = 'active' and p.ID < 100000",
-      //"SELECT DISTINCT ID FROM /root/exampleRegion WHERE  status = 'active'",
-      //"SELECT DISTINCT ID FROM /root/exampleRegion p WHERE  p.status = 'active'",
-      //"SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos WHERE  pos.secId IN SET('YHOO', 'IBM', 'AMZN')",
-      //"SELECT DISTINCT proj1:p, proj2:itrX FROM /root/exampleRegion p, (SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos"
-      //+ " WHERE  pos.secId = 'YHOO') as itrX",
-      //"SELECT DISTINCT * FROM /root/exampleRegion p, (SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos"
-      //+ " WHERE  pos.secId = 'YHOO') as itrX",
-      //"SELECT DISTINCT * FROM /root/exampleRegion p, (SELECT DISTINCT p.ID FROM /root/exampleRegion x"
-      //+ " WHERE  x.ID = p.ID) as itrX",
+      "SELECT DISTINCT * FROM /root/exampleRegion p WHERE  p.ID > 100 and p.status = 'active' and p.ID < 100000",
+      "SELECT DISTINCT ID FROM /root/exampleRegion WHERE  status = 'active'",
+      "SELECT DISTINCT ID FROM /root/exampleRegion p WHERE  p.status = 'active'",
+      "SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos WHERE  pos.secId IN SET('YHOO', 'IBM', 'AMZN')",
+      "SELECT DISTINCT proj1:p, proj2:itrX FROM /root/exampleRegion p, (SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos"
+      + " WHERE  pos.secId = 'YHOO') as itrX",
+      "SELECT DISTINCT * FROM /root/exampleRegion p, (SELECT DISTINCT pos FROM /root/exampleRegion p, p.positions.values pos"
+      + " WHERE  pos.secId = 'YHOO') as itrX",
+      "SELECT DISTINCT * FROM /root/exampleRegion p, (SELECT DISTINCT p.ID FROM /root/exampleRegion x"
+      + " WHERE  x.ID = p.ID) as itrX",
       "SELECT DISTINCT * FROM /root/exampleRegion p, (SELECT DISTINCT pos FROM /root/exampleRegion x, x.positions.values pos"
       + " WHERE  x.ID = p.ID) as itrX",
-      //"SELECT DISTINCT x.ID FROM /root/exampleRegion x, x.positions.values v WHERE  "
-      //+ "v.secId = element(SELECT DISTINCT vals.secId FROM /root/exampleRegion p, p.positions.values vals WHERE  vals.secId = 'YHOO')",
+      "SELECT DISTINCT x.ID FROM /root/exampleRegion x, x.positions.values v WHERE  "
+      + "v.secId = element(SELECT DISTINCT vals.secId FROM /root/exampleRegion p, p.positions.values vals WHERE  vals.secId = 'YHOO')",
       "SELECT DISTINCT * FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.status = 'active'",
-      //"SELECT DISTINCT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID",
+      "SELECT DISTINCT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID",
       "SELECT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID and p.status = 'active' and p2.status = 'active'",
-      //"SELECT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID and p.status = 'active' and p.status = p2.status",
+      "SELECT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID and p.status = 'active' and p.status = p2.status",
       "SELECT DISTINCT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID and p.ID > 100 and p2.ID < 100000",
-      //"SELECT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID and p.ID > 100 and p2.ID < 100000 or p.status = p2.status",
+      "SELECT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID and p.ID > 100 and p2.ID < 100000 or p.status = p2.status",
       "SELECT p.ID FROM /root/exampleRegion p, /root/exampleRegion2 p2 WHERE  p.ID = p2.ID and p.ID > 100 and p2.ID < 100000 or p.status = 'active'",
-      //"SELECT DISTINCT * FROM /root/exampleRegion p, positions.values pos WHERE   (p.ID > 1 or p.status = 'active') or (true AND pos.secId ='IBM')", 
-      //"SELECT DISTINCT * FROM /root/exampleRegion p, positions.values pos WHERE   (p.ID > 1 or p.status = 'active') or (true AND pos.secId !='IBM')",
-      //"SELECT DISTINCT structset.sos, structset.key " 
-      //+ "FROM /root/exampleRegion p, p.positions.values outerPos, " 
-      //+ "(SELECT DISTINCT key: key, sos: pos.sharesOutstanding "
-      //+ "FROM /root/exampleRegion.entries pf, pf.value.positions.values pos "
-      //+ "where outerPos.secId != 'IBM' AND "
-      //+ "pf.key IN (SELECT DISTINCT * FROM pf.value.collectionHolderMap['0'].arr)) structset "
-      //+ "where structset.sos > 2000",
+      "SELECT DISTINCT * FROM /root/exampleRegion p, positions.values pos WHERE   (p.ID > 1 or p.status = 'active') or (true AND pos.secId ='IBM')", 
+      "SELECT DISTINCT * FROM /root/exampleRegion p, positions.values pos WHERE   (p.ID > 1 or p.status = 'active') or (true AND pos.secId !='IBM')",
+      "SELECT DISTINCT structset.sos, structset.key " 
+      + "FROM /root/exampleRegion p, p.positions.values outerPos, " 
+      + "(SELECT DISTINCT key: key, sos: pos.sharesOutstanding "
+      + "FROM /root/exampleRegion.entries pf, pf.value.positions.values pos "
+      + "where outerPos.secId != 'IBM' AND "
+      + "pf.key IN (SELECT DISTINCT * FROM pf.value.collectionHolderMap['0'].arr)) structset "
+      + "where structset.sos > 2000",
       "SELECT DISTINCT * "
       + "FROM /root/exampleRegion p, p.positions.values outerPos, "
       + "(SELECT DISTINCT key: key, sos: pos.sharesOutstanding "
@@ -107,8 +108,8 @@ public class QueryMonitorDUnitTest extends CacheTestCase {
       + "where outerPos.secId != 'IBM' AND " 
       + "pf.key IN (SELECT DISTINCT * FROM pf.value.collectionHolderMap['0'].arr)) structset "
       + "where structset.sos > 2000",
-      //"SELECT DISTINCT * FROM /root/exampleRegion p, p.positions.values position "
-      //+ "WHERE (true = null OR position.secId = 'SUN') AND true", 
+      "SELECT DISTINCT * FROM /root/exampleRegion p, p.positions.values position "
+      + "WHERE (true = null OR position.secId = 'SUN') AND true", 
   };
 
   String[]  prQueryStr = {
@@ -220,7 +221,6 @@ public class QueryMonitorDUnitTest extends CacheTestCase {
         } catch (Exception ex) {
           fail("While starting CacheServer", ex);
         }
-        pause(1000);
         Cache cache = getCache();
         GemFireCacheImpl.getInstance().TEST_MAX_QUERY_EXECUTION_TIME = queryMonitorTime;
         cache.getLogger().fine("#### RUNNING TEST : " + testName);
@@ -307,10 +307,10 @@ public class QueryMonitorDUnitTest extends CacheTestCase {
     VM client2 = host.getVM(2);
     VM client3 = host.getVM(3);
 
-    final int numberOfEntries = 800;
+    final int numberOfEntries = 100;
 
     // Start server
-    configServer(server, 40, "testQueryMonitorClientServer"); // All the queries taking more than 40ms should be canceled by Query monitor.
+    configServer(server, 20, "testQueryMonitorClientServer"); // All the queries taking more than 20ms should be canceled by Query monitor.
     createRegion(server);
     
     // Initialize server regions.
@@ -383,13 +383,13 @@ public class QueryMonitorDUnitTest extends CacheTestCase {
     VM client1 = host.getVM(2);
     VM client2 = host.getVM(3);
 
-    final int numberOfEntries = 800;
+    final int numberOfEntries = 100;
 
     // Start server
-    configServer(server1, 40, "testQueryMonitorMultiClientMultiServer"); // All the queries taking more than 40ms should be canceled by Query monitor.
+    configServer(server1, 20, "testQueryMonitorMultiClientMultiServer"); // All the queries taking more than 20ms should be canceled by Query monitor.
     createRegion(server1);
 
-    configServer(server2, 40, "testQueryMonitorMultiClientMultiServer"); // All the queries taking more than 40ms should be canceled by Query monitor.
+    configServer(server2, 20, "testQueryMonitorMultiClientMultiServer"); // All the queries taking more than 20ms should be canceled by Query monitor.
     createRegion(server2);
 
     // Initialize server regions.
@@ -470,13 +470,13 @@ public class QueryMonitorDUnitTest extends CacheTestCase {
     VM server1 = host.getVM(0);
     VM server2 = host.getVM(1);
 
-    final int numberOfEntries = 800;
+    final int numberOfEntries = 100;
 
     // Start server
-    configServer(server1, 40, "testQueryExecutionLocally"); // All the queries taking more than 40ms should be canceled by Query monitor.
+    configServer(server1, 20, "testQueryExecutionLocally"); // All the queries taking more than 20ms should be canceled by Query monitor.
     createRegion(server1);
 
-    configServer(server2, 40, "testQueryExecutionLocally"); // All the queries taking more than 40ms should be canceled by Query monitor.
+    configServer(server2, 20, "testQueryExecutionLocally"); // All the queries taking more than 20ms should be canceled by Query monitor.
     createRegion(server2);
 
     // Initialize server regions.
@@ -548,13 +548,13 @@ public class QueryMonitorDUnitTest extends CacheTestCase {
     VM server1 = host.getVM(0);
     VM server2 = host.getVM(1);
 
-    final int numberOfEntries = 8000;
+    final int numberOfEntries = 1000;
 
     // Start server
-    configServer(server1, 40, "testQueryExecutionLocally"); // All the queries taking more than 40ms should be canceled by Query monitor.
+    configServer(server1, 20, "testQueryExecutionLocally"); // All the queries taking more than 20ms should be canceled by Query monitor.
     createRegion(server1);
 
-    configServer(server2, 40, "testQueryExecutionLocally"); // All the queries taking more than 40ms should be canceled by Query monitor.
+    configServer(server2, 20, "testQueryExecutionLocally"); // All the queries taking more than 20ms should be canceled by Query monitor.
     createRegion(server2);
 
     // Initialize server regions.
@@ -636,16 +636,14 @@ public class QueryMonitorDUnitTest extends CacheTestCase {
     VM client1 = host.getVM(2);
     VM client2 = host.getVM(3);
 
-    final int numberOfEntries = 800;
+    final int numberOfEntries = 100;
 
     // Start server
-    configServer(server1, 200, "testQueryMonitorMultiClientMultiServerOnPR"); // All the queries taking more than 200ms should be canceled by Query monitor.
+    configServer(server1, 100, "testQueryMonitorMultiClientMultiServerOnPR"); // All the queries taking more than 100ms should be canceled by Query monitor.
     createPRRegion(server1);
 
-    configServer(server2, 50, "testQueryMonitorMultiClientMultiServerOnPR"); // All the queries taking more than 200ms should be canceled by Query monitor.
+    configServer(server2, 100, "testQueryMonitorMultiClientMultiServerOnPR"); // All the queries taking more than 100ms should be canceled by Query monitor.
     createPRRegion(server2);
-
-    pause(1000);
     
     // Initialize server regions.
     server1.invoke(new CacheSerializableRunnable("Create Bridge Server") {
@@ -719,16 +717,15 @@ public class QueryMonitorDUnitTest extends CacheTestCase {
     VM server1 = host.getVM(0);
     VM server2 = host.getVM(1);
 
-    final int numberOfEntries = 800;
+    final int numberOfEntries = 100;
 
     // Start server
-    configServer(server1, 200, "testQueryMonitorMultiClientMultiServerOnPR"); // All the queries taking more than 200ms should be canceled by Query monitor.
+    configServer(server1, 100, "testQueryMonitorMultiClientMultiServerOnPR"); // All the queries taking more than 100ms should be canceled by Query monitor.
     createPRRegion(server1);
 
-    configServer(server2, 50, "testQueryMonitorMultiClientMultiServerOnPR"); // All the queries taking more than 200ms should be canceled by Query monitor.
+    configServer(server2, 100, "testQueryMonitorMultiClientMultiServerOnPR"); // All the queries taking more than 100ms should be canceled by Query monitor.
     createPRRegion(server2);
 
-    pause(1000);
     
     // Initialize server regions.
     server1.invoke(new CacheSerializableRunnable("Create Bridge Server") {
@@ -793,16 +790,15 @@ public class QueryMonitorDUnitTest extends CacheTestCase {
     VM client1 = host.getVM(2);
     VM client2 = host.getVM(3);
 
-    final int numberOfEntries = 800;
+    final int numberOfEntries = 100;
 
     // Start server
-    configServer(server1, 5000, "testQueryMonitorRegionWithEviction"); // All the queries taking more than 120ms should be canceled by Query monitor.
+    configServer(server1, 20, "testQueryMonitorRegionWithEviction"); // All the queries taking more than 20ms should be canceled by Query monitor.
     createRegion(server1, true, "server1_testQueryMonitorRegionWithEviction");
 
-    configServer(server2, 5000, "testQueryMonitorRegionWithEviction"); // All the queries taking more than 120ms should be canceled by Query monitor.
+    configServer(server2, 20, "testQueryMonitorRegionWithEviction"); // All the queries taking more than 20ms should be canceled by Query monitor.
     createRegion(server2, true, "server2_testQueryMonitorRegionWithEviction");
 
-    pause(1000);
     
     // Initialize server regions.
     server1.invoke(new CacheSerializableRunnable("Create Bridge Server") {
@@ -878,16 +874,16 @@ public class QueryMonitorDUnitTest extends CacheTestCase {
     VM client1 = host.getVM(2);
     VM client2 = host.getVM(3);
 
-    final int numberOfEntries = 800;
+    final int numberOfEntries = 100;
 
     // Start server
-    configServer(server1, 40, "testQueryMonitorRegionWithIndex"); // All the queries taking more than 80ms should be canceled by Query monitor.
+    configServer(server1, 20, "testQueryMonitorRegionWithIndex"); // All the queries taking more than 20ms should be canceled by Query monitor.
     createRegion(server1);
 
-    configServer(server2, 40, "testQueryMonitorRegionWithIndex"); // All the queries taking more than 80ms should be canceled by Query monitor.
+    configServer(server2, 20, "testQueryMonitorRegionWithIndex"); // All the queries taking more than 20ms should be canceled by Query monitor.
     createRegion(server2);
 
-    pause(1000);
+//    pause(1000);
     
 
     // Initialize server regions.
@@ -1089,7 +1085,7 @@ public class QueryMonitorDUnitTest extends CacheTestCase {
     VM server3 = host.getVM(2);
     VM server4 = host.getVM(3);
     
-    final int numberOfEntries = 8000;
+    final int numberOfEntries = 1000;
 
     // Start server
     configServer(server1, 5, "testQueryExecutionLocally"); 
@@ -1274,7 +1270,7 @@ public class QueryMonitorDUnitTest extends CacheTestCase {
     public void doTestHook(String description) {
       if (description.equals("6")) {
         try {
-          Thread.sleep(timeout);
+          Thread.sleep(timeout * 2);
         }
         catch (InterruptedException ie) {
           Thread.currentThread().interrupt();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fdbab40/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
index 52c454f..6a8cfa9 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
@@ -32,17 +32,12 @@ import com.gemstone.gemfire.cache.DataPolicy;
 import com.gemstone.gemfire.cache.Declarable;
 import com.gemstone.gemfire.cache.DiskStore;
 import com.gemstone.gemfire.cache.EntryEvent;
-import com.gemstone.gemfire.cache.InterestResultPolicy;
 import com.gemstone.gemfire.cache.Operation;
 import com.gemstone.gemfire.cache.PartitionAttributesFactory;
 import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.Region.Entry;
 import com.gemstone.gemfire.cache.RegionDestroyedException;
 import com.gemstone.gemfire.cache.Scope;
-import com.gemstone.gemfire.cache.client.ClientCache;
-import com.gemstone.gemfire.cache.client.ClientCacheFactory;
-import com.gemstone.gemfire.cache.client.ClientRegionFactory;
-import com.gemstone.gemfire.cache.client.ClientRegionShortcut;
 import com.gemstone.gemfire.cache.client.PoolFactory;
 import com.gemstone.gemfire.cache.client.PoolManager;
 import com.gemstone.gemfire.cache.client.ServerConnectivityException;
@@ -62,15 +57,13 @@ import com.gemstone.gemfire.cache.query.RegionNotFoundException;
 import com.gemstone.gemfire.cache.query.SelectResults;
 import com.gemstone.gemfire.cache.query.Struct;
 import com.gemstone.gemfire.cache.server.CacheServer;
-import com.gemstone.gemfire.cache.server.CacheServer;
 import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
 import com.gemstone.gemfire.cache.util.CacheWriterAdapter;
-import com.gemstone.gemfire.cache30.ClientServerTestCase;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.AvailablePort;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
-import com.gemstone.gemfire.internal.cache.LocalRegion.NonTXEntry;
 import com.gemstone.gemfire.internal.cache.versions.VersionTag;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 
@@ -87,6 +80,7 @@ import dunit.VM;
  * @author Gester Zhou
  * @since 5.0.23
  */
+@SuppressWarnings("serial")
 public class PutAllCSDUnitTest extends ClientServerTestCase {
 
   final int numberOfEntries = 100;
@@ -417,8 +411,9 @@ public void testOneServer() throws CacheException, InterruptedException {
     VM client2 = host.getVM(3);
     final String regionName = getUniqueName();
     
-    final int serverPort1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
-    final int serverPort2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    int serverPorts[] = AvailablePortHelper.getRandomAvailableTCPPorts(2);
+    final int serverPort1 = serverPorts[0];
+    final int serverPort2 = serverPorts[1];
     final String serverHost = getServerHostName(server1.getHost());
   
     // set notifyBySubscription=false to test local-invalidates
@@ -487,8 +482,9 @@ public void testOneServer() throws CacheException, InterruptedException {
     VM client2 = host.getVM(3);
     final String regionName = getUniqueName();
     
-    final int serverPort1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
-    final int serverPort2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    int serverPorts[] = AvailablePortHelper.getRandomAvailableTCPPorts(2);
+    final int serverPort1 = serverPorts[0];
+    final int serverPort2 = serverPorts[1];
     final String serverHost = getServerHostName(server1.getHost());
 
     // set notifyBySubscription=false to test local-invalidates
@@ -1131,8 +1127,9 @@ public void testOneServer() throws CacheException, InterruptedException {
     VM client2 = host.getVM(3);
     final String regionName = getUniqueName();
 
-    final int serverPort1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
-    final int serverPort2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    int serverPorts[] = AvailablePortHelper.getRandomAvailableTCPPorts(2);
+    final int serverPort1 = serverPorts[0];
+    final int serverPort2 = serverPorts[1];
     final String serverHost = getServerHostName(server1.getHost());
 
     // set <true, false> means <PR=true, notifyBySubscription=false> to test local-invalidates
@@ -1279,8 +1276,9 @@ public void testOneServer() throws CacheException, InterruptedException {
     final VM client2 = host.getVM(3);
     final String regionName = getUniqueName();
     
-    final int serverPort1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
-    final int serverPort2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    int serverPorts[] = AvailablePortHelper.getRandomAvailableTCPPorts(2);
+    final int serverPort1 = serverPorts[0];
+    final int serverPort2 = serverPorts[1];
     final String serverHost = getServerHostName(server1.getHost());
 
     // set <true, false> means <PR=true, notifyBySubscription=false> to test local-invalidates
@@ -1383,8 +1381,9 @@ public void testOneServer() throws CacheException, InterruptedException {
     VM client2 = host.getVM(3);
     final String regionName = getUniqueName();
     
-    final int serverPort1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
-    final int serverPort2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    int serverPorts[] = AvailablePortHelper.getRandomAvailableTCPPorts(2);
+    final int serverPort1 = serverPorts[0];
+    final int serverPort2 = serverPorts[1];
     final String serverHost = getServerHostName(server1.getHost());
 
     // set <true, false> means <PR=true, notifyBySubscription=false> to test local-invalidates
@@ -1811,8 +1810,9 @@ public void testOneServer() throws CacheException, InterruptedException {
     final VM client2 = host.getVM(3);
     final String regionName = getUniqueName();
     
-    final int serverPort1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
-    final int serverPort2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    int serverPorts[] = AvailablePortHelper.getRandomAvailableTCPPorts(2);
+    final int serverPort1 = serverPorts[0];
+    final int serverPort2 = serverPorts[1];
     final String serverHost = getServerHostName(server1.getHost());
 
     // set <true, false> means <PR=true, notifyBySubscription=false> to test local-invalidates
@@ -2098,8 +2098,9 @@ public void testOneServer() throws CacheException, InterruptedException {
     VM client2 = host.getVM(3);
     final String regionName = getUniqueName();
     
-    final int serverPort1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
-    final int serverPort2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    int serverPorts[] = AvailablePortHelper.getRandomAvailableTCPPorts(2);
+    final int serverPort1 = serverPorts[0];
+    final int serverPort2 = serverPorts[1];
     final String serverHost = getServerHostName(server1.getHost());
 
     // set <true, false> means <PR=true, notifyBySubscription=false> to test local-invalidates
@@ -2277,8 +2278,9 @@ public void testOneServer() throws CacheException, InterruptedException {
     final VM client2 = host.getVM(3);
     final String regionName = getUniqueName();
     
-    final int serverPort1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
-    final int serverPort2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    int serverPorts[] = AvailablePortHelper.getRandomAvailableTCPPorts(2);
+    final int serverPort1 = serverPorts[0];
+    final int serverPort2 = serverPorts[1];
     final String serverHost = getServerHostName(server1.getHost());
 
     // set <true, false> means <PR=true, notifyBySubscription=false> to test local-invalidates
@@ -2508,8 +2510,9 @@ public void testOneServer() throws CacheException, InterruptedException {
     final VM client2 = host.getVM(3);
     final String regionName = getUniqueName();
     
-    final int serverPort1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
-    final int serverPort2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    int serverPorts[] = AvailablePortHelper.getRandomAvailableTCPPorts(2);
+    final int serverPort1 = serverPorts[0];
+    final int serverPort2 = serverPorts[1];
     final String serverHost = getServerHostName(server1.getHost());
 
     // set <true, false> means <PR=true, notifyBySubscription=false> to test local-invalidates
@@ -2666,9 +2669,7 @@ public void testOneServer() throws CacheException, InterruptedException {
     final VM client1 = host.getVM(3);
     final String regionName = getUniqueName();
     
-    final int serverPort1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
-    final int serverPort2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
-    final int serverPort3 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    final int[] serverPorts = AvailablePortHelper.getRandomAvailableTCPPorts(3);
     final String serverHost = getServerHostName(server1.getHost());
     
     final SharedCounter sc_server1 = new SharedCounter("server1");
@@ -2677,10 +2678,10 @@ public void testOneServer() throws CacheException, InterruptedException {
     final SharedCounter sc_client2 = new SharedCounter("client2");
 
     // set <true, false> means <PR=true, notifyBySubscription=false> to test local-invalidates
-    createBridgeServer(server1, regionName, serverPort1, true, 0, null);
-    createBridgeServer(server2, regionName, serverPort2, true, 0, null);
-    createBridgeServer(server3, regionName, serverPort3, true, 0, null);
-    createClient(client1, regionName, serverHost, new int[] {serverPort1, serverPort2, serverPort3}, -1, -1, false, true, true);
+    createBridgeServer(server1, regionName, serverPorts[0], true, 0, null);
+    createBridgeServer(server2, regionName, serverPorts[1], true, 0, null);
+    createBridgeServer(server3, regionName, serverPorts[2], true, 0, null);
+    createClient(client1, regionName, serverHost, serverPorts, -1, -1, false, true, true);
 
     {
       // Create local region
@@ -2695,7 +2696,7 @@ public void testOneServer() throws CacheException, InterruptedException {
       
       try {
         getCache();
-        ClientServerTestCase.configureConnectionPool(factory, serverHost, new int[] {serverPort1, serverPort2, serverPort3}, true, -1, -1, null);
+        ClientServerTestCase.configureConnectionPool(factory, serverHost, serverPorts, true, -1, -1, null);
         createRegion(regionName, factory.create());
         assertNotNull(getRootRegion().getSubregion(regionName));
       }
@@ -2812,8 +2813,9 @@ public void testOneServer() throws CacheException, InterruptedException {
     VM client2 = host.getVM(3);
     final String regionName = getUniqueName();
     
-    final int serverPort1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
-    final int serverPort2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    int serverPorts[] = AvailablePortHelper.getRandomAvailableTCPPorts(2);
+    final int serverPort1 = serverPorts[0];
+    final int serverPort2 = serverPorts[1];
     final String serverHost = getServerHostName(server1.getHost());
 
     // set notifyBySubscription=true to test register interest
@@ -2911,8 +2913,9 @@ public void testOneServer() throws CacheException, InterruptedException {
     VM client2 = host.getVM(3);
     final String regionName = getUniqueName();
     
-    final int serverPort1 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
-    final int serverPort2 = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    int serverPorts[] = AvailablePortHelper.getRandomAvailableTCPPorts(2);
+    final int serverPort1 = serverPorts[0];
+    final int serverPort2 = serverPorts[1];
     final String serverHost = getServerHostName(server1.getHost());
 
     // set notifyBySubscription=true to test register interest

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fdbab40/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
index d667b1d..03e5bcb 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
@@ -27,7 +27,10 @@ import com.gemstone.gemfire.cache.query.CqQuery;
 import com.gemstone.gemfire.cache.query.QueryService;
 import com.gemstone.gemfire.cache.query.RegionNotFoundException;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
-import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.internal.cache.ClientServerObserver;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
+import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
 import com.gemstone.gemfire.internal.cache.PoolFactoryImpl;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
 
@@ -1095,238 +1098,271 @@ public class DurableClientSimpleDUnitTest extends DurableClientTestCase {
   //This test method is disabled because it is failing
   //periodically and causing cruise control failures
   //See bug #47060
-  public void testReadyForEventsNotCalledImplicitlyWithCacheXML() {
-    final String cqName = "cqTest";
-    // Start a server
-    int serverPort = (Integer) this.server1VM.invoke(CacheServerTestUtil.class, "createCacheServerFromXml", new Object[]{ DurableClientTestCase.class.getResource("durablecq-server-cache.xml")});
-
-    // Start a durable client that is not kept alive on the server when it
-    // stops normally
-    final String durableClientId = getName() + "_client";
-    
-    //create client cache from xml
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClientFromXml", new Object[]{ DurableClientTestCase.class.getResource("durablecq-client-cache.xml"), "client", durableClientId, 45, Boolean.FALSE});
-
-    // verify that readyForEvents has not yet been called on all the client's pools
-    this.durableClientVM.invoke(new CacheSerializableRunnable("check readyForEvents not called") {
-      public void run2() throws CacheException {
-        for (Pool p: PoolManager.getAll().values()) {
-          assertEquals(false, ((PoolImpl)p).getReadyForEventsCalled());
+  public void testReadyForEventsNotCalledImplicitlyWithCacheXML() {
+    try {
+      setPeriodicACKObserver(durableClientVM);
+      final String cqName = "cqTest";
+      // Start a server
+      int serverPort = (Integer) this.server1VM.invoke(CacheServerTestUtil.class, "createCacheServerFromXml", new Object[]{ DurableClientTestCase.class.getResource("durablecq-server-cache.xml")});
+  
+      // Start a durable client that is not kept alive on the server when it
+      // stops normally
+      final String durableClientId = getName() + "_client";
+      
+      //create client cache from xml
+      this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClientFromXml", new Object[]{ DurableClientTestCase.class.getResource("durablecq-client-cache.xml"), "client", durableClientId, 45, Boolean.FALSE});
+  
+      // verify that readyForEvents has not yet been called on all the client's pools
+      this.durableClientVM.invoke(new CacheSerializableRunnable("check readyForEvents not called") {
+        public void run2() throws CacheException {
+          for (Pool p: PoolManager.getAll().values()) {
+            assertEquals(false, ((PoolImpl)p).getReadyForEventsCalled());
+          }
         }
-      }
-    });
-    
-    // Send clientReady message
-    this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
-      public void run2() throws CacheException {
-        CacheServerTestUtil.getCache().readyForEvents();
-      }
-    });
-    
-    //Durable client registers durable cq on server
-    this.durableClientVM.invoke(new CacheSerializableRunnable("Register Cq") {
-      public void run2() throws CacheException {
-        // Get the region
-        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
-        assertNotNull(region);
-        
-        // Create CQ Attributes.
-        CqAttributesFactory cqAf = new CqAttributesFactory();
-        
-        // Initialize and set CqListener.
-        CqListener[] cqListeners = { new CacheServerTestUtil.ControlCqListener() };
-        cqAf.initCqListeners(cqListeners);
-        CqAttributes cqa = cqAf.create();
-
-        // Create cq's
-        // Get the query service for the Pool
-        QueryService queryService = CacheServerTestUtil.getPool().getQueryService();
-
-        try { 
-          CqQuery query = queryService.newCq(cqName , "Select * from /" + regionName, cqa, true);
-          query.execute();
+      });
+      
+      // Send clientReady message
+      this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
+        public void run2() throws CacheException {
+          CacheServerTestUtil.getCache().readyForEvents();
         }
-        catch (CqExistsException e) {
-          fail("Failed due to " + e);
+      });
+      
+      //Durable client registers durable cq on server
+      this.durableClientVM.invoke(new CacheSerializableRunnable("Register Cq") {
+        public void run2() throws CacheException {
+          // Get the region
+          Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+          assertNotNull(region);
+          
+          // Create CQ Attributes.
+          CqAttributesFactory cqAf = new CqAttributesFactory();
+          
+          // Initialize and set CqListener.
+          CqListener[] cqListeners = { new CacheServerTestUtil.ControlCqListener() };
+          cqAf.initCqListeners(cqListeners);
+          CqAttributes cqa = cqAf.create();
+  
+          // Create cq's
+          // Get the query service for the Pool
+          QueryService queryService = CacheServerTestUtil.getPool().getQueryService();
+  
+          try { 
+            CqQuery query = queryService.newCq(cqName , "Select * from /" + regionName, cqa, true);
+            query.execute();
+          }
+          catch (CqExistsException e) {
+            fail("Failed due to " + e);
+          }
+          catch (CqException e) {
+            fail("Failed due to " + e);
+          }
+          catch (RegionNotFoundException e) {
+            fail("Could not find specified region:" + regionName + ":" + e);
+          }
         }
-        catch (CqException e) {
-          fail("Failed due to " + e);
+      });
+  
+      // Verify durable client on server1
+      this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+        public void run2() throws CacheException {
+          // Find the proxy
+          checkNumberOfClientProxies(1);
+          CacheClientProxy proxy = getClientProxy();
+          assertNotNull(proxy);
+  
+          // Verify that it is durable
+          assertTrue(proxy.isDurable());
+          assertEquals(durableClientId, proxy.getDurableId());
         }
-        catch (RegionNotFoundException e) {
-          fail("Could not find specified region:" + regionName + ":" + e);
+      });
+      
+      // Start normal publisher client
+      this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+          new Object[] {getClientPool(getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName});
+  
+      // Publish some entries
+      final int numberOfEntries = 10;
+      this.publisherClientVM.invoke(new CacheSerializableRunnable("publish updates") {
+        public void run2() throws CacheException {
+          // Get the region
+          Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+          assertNotNull(region);
+  
+          // Publish some entries
+          for (int i=0; i<numberOfEntries; i++) {
+            String keyAndValue = String.valueOf(i);
+            region.put(keyAndValue, keyAndValue);
+          }
         }
-      }
-    });
-
-    // Verify durable client on server1
-    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
-      public void run2() throws CacheException {
-        // Find the proxy
-        checkNumberOfClientProxies(1);
-        CacheClientProxy proxy = getClientProxy();
-        assertNotNull(proxy);
-
-        // Verify that it is durable
-        assertTrue(proxy.isDurable());
-        assertEquals(durableClientId, proxy.getDurableId());
-      }
-    });
-    
-    // Start normal publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName});
-
-    // Publish some entries
-    final int numberOfEntries = 10;
-    this.publisherClientVM.invoke(new CacheSerializableRunnable("publish updates") {
-      public void run2() throws CacheException {
-        // Get the region
-        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
-        assertNotNull(region);
-
-        // Publish some entries
-        for (int i=0; i<numberOfEntries; i++) {
-          String keyAndValue = String.valueOf(i);
-          region.put(keyAndValue, keyAndValue);
+      });
+      
+      // Verify the durable client received the updates
+      this.durableClientVM.invoke(new CacheSerializableRunnable("Verify updates") {
+        public void run2() throws CacheException {
+          // Get the region
+          Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+          assertNotNull(region);
+          
+          // Get the listener and wait for the appropriate number of events
+          QueryService queryService = CacheServerTestUtil.getPool().getQueryService();
+          CqQuery cqQuery = queryService.getCq(cqName);
+          CacheServerTestUtil.ControlCqListener cqlistener = (CacheServerTestUtil.ControlCqListener) cqQuery.getCqAttributes().getCqListener();
+          cqlistener.waitWhileNotEnoughEvents(30000, numberOfEntries);
+          assertEquals(numberOfEntries, cqlistener.events.size());
         }
+      });
+      
+       try {
+        Thread.sleep(10000);
       }
-    });
-    
-    // Verify the durable client received the updates
-    this.durableClientVM.invoke(new CacheSerializableRunnable("Verify updates") {
-      public void run2() throws CacheException {
-        // Get the region
-        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
-        assertNotNull(region);
-        
-        // Get the listener and wait for the appropriate number of events
-        QueryService queryService = CacheServerTestUtil.getPool().getQueryService();
-        CqQuery cqQuery = queryService.getCq(cqName);
-        CacheServerTestUtil.ControlCqListener cqlistener = (CacheServerTestUtil.ControlCqListener) cqQuery.getCqAttributes().getCqListener();
-        cqlistener.waitWhileNotEnoughEvents(30000, numberOfEntries);
-        assertEquals(numberOfEntries, cqlistener.events.size());
-      }
-    });
-    
-     try {
-      Thread.sleep(10000);
-    }
-    catch (InterruptedException e) {
-      fail("interrupted" + e);
-    }
-    
-    // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache", new Object[] {new Boolean(true)});
-    
-    // Verify the durable client still exists on the server
-    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
-      public void run2() throws CacheException {
-        // Find the proxy
-        CacheClientProxy proxy = getClientProxy();
-        assertNotNull(proxy);
+      catch (InterruptedException e) {
+        fail("interrupted" + e);
       }
-    });
-
-    // Publish some more entries
-    this.publisherClientVM.invoke(new CacheSerializableRunnable("Publish additional updates") {
-      public void run2() throws CacheException {
-        // Get the region
-        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
-        assertNotNull(region);
-
-        // Publish some entries
-        for (int i=0; i<numberOfEntries; i++) {
-          String keyAndValue = String.valueOf(i);
-          region.put(keyAndValue, keyAndValue + "lkj");
+      
+      // Stop the durable client
+      this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache", new Object[] {new Boolean(true)});
+      
+      // Verify the durable client still exists on the server
+      this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+        public void run2() throws CacheException {
+          // Find the proxy
+          CacheClientProxy proxy = getClientProxy();
+          assertNotNull(proxy);
         }
-      }
-    });
-    
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
-    
-    // Re-start the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClientFromXml", new Object[]{ DurableClientTestCase.class.getResource("durablecq-client-cache.xml"), "client", durableClientId, 45,  Boolean.FALSE});
-
-    
-    //Durable client registers durable cq on server
-    this.durableClientVM.invoke(new CacheSerializableRunnable("Register cq") {
-      public void run2() throws CacheException {
-        // Get the region
-        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
-        assertNotNull(region);
-
-        // Create CQ Attributes.
-        CqAttributesFactory cqAf = new CqAttributesFactory();
-        
-        // Initialize and set CqListener.
-        CqListener[] cqListeners = { new CacheServerTestUtil.ControlCqListener() };
-        cqAf.initCqListeners(cqListeners);
-        CqAttributes cqa = cqAf.create();
-
-        // Create cq's
-        // Get the query service for the Pool
-        QueryService queryService = CacheServerTestUtil.getPool().getQueryService();
-
-        try { 
-          CqQuery query = queryService.newCq(cqName , "Select * from /" + regionName, cqa, true);
-          query.execute();
+      });
+  
+      // Publish some more entries
+      this.publisherClientVM.invoke(new CacheSerializableRunnable("Publish additional updates") {
+        public void run2() throws CacheException {
+          // Get the region
+          Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+          assertNotNull(region);
+  
+          // Publish some entries
+          for (int i=0; i<numberOfEntries; i++) {
+            String keyAndValue = String.valueOf(i);
+            region.put(keyAndValue, keyAndValue + "lkj");
+          }
         }
-        catch (CqExistsException e) {
-          fail("Failed due to " + e);
+      });
+      
+      this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+      
+      // Re-start the durable client
+      this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClientFromXml", new Object[]{ DurableClientTestCase.class.getResource("durablecq-client-cache.xml"), "client", durableClientId, 45,  Boolean.FALSE});
+  
+      
+      //Durable client registers durable cq on server
+      this.durableClientVM.invoke(new CacheSerializableRunnable("Register cq") {
+        public void run2() throws CacheException {
+          // Get the region
+          Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+          assertNotNull(region);
+  
+          // Create CQ Attributes.
+          CqAttributesFactory cqAf = new CqAttributesFactory();
+          
+          // Initialize and set CqListener.
+          CqListener[] cqListeners = { new CacheServerTestUtil.ControlCqListener() };
+          cqAf.initCqListeners(cqListeners);
+          CqAttributes cqa = cqAf.create();
+  
+          // Create cq's
+          // Get the query service for the Pool
+          QueryService queryService = CacheServerTestUtil.getPool().getQueryService();
+  
+          try { 
+            CqQuery query = queryService.newCq(cqName , "Select * from /" + regionName, cqa, true);
+            query.execute();
+          }
+          catch (CqExistsException e) {
+            fail("Failed due to " + e);
+          }
+          catch (CqException e) {
+            fail("Failed due to " + e);
+          }
+          catch (RegionNotFoundException e) {
+            fail("Could not find specified region:" + regionName + ":" + e);
+          }
+         
         }
-        catch (CqException e) {
-          fail("Failed due to " + e);
+      });
+      
+      // Send clientReady message
+      this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
+        public void run2() throws CacheException {
+          CacheServerTestUtil.getCache().readyForEvents();
         }
-        catch (RegionNotFoundException e) {
-          fail("Could not find specified region:" + regionName + ":" + e);
+      });
+  
+      // Verify durable client on server
+      this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+        public void run2() throws CacheException {
+          // Find the proxy
+          checkNumberOfClientProxies(1);
+          CacheClientProxy proxy = getClientProxy();
+          assertNotNull(proxy);
+          
+          // Verify that it is durable and its properties are correct
+          assertTrue(proxy.isDurable());
+          assertEquals(durableClientId, proxy.getDurableId());
         }
-       
-      }
-    });
-    
-    // Send clientReady message
-    this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
-      public void run2() throws CacheException {
-        CacheServerTestUtil.getCache().readyForEvents();
-      }
-    });
-
-    // Verify durable client on server
-    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
-      public void run2() throws CacheException {
-        // Find the proxy
-        checkNumberOfClientProxies(1);
-        CacheClientProxy proxy = getClientProxy();
-        assertNotNull(proxy);
-        
-        // Verify that it is durable and its properties are correct
-        assertTrue(proxy.isDurable());
-        assertEquals(durableClientId, proxy.getDurableId());
-      }
-    });
-        
-    // Verify the durable client received the updates held for it on the server
-    this.durableClientVM.invoke(new CacheSerializableRunnable("Verify updates") {
-      public void run2() throws CacheException {
-        // Get the region
-        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
-        assertNotNull(region);
-
-        QueryService queryService = CacheServerTestUtil.getPool().getQueryService();
-
-        CqQuery cqQuery = queryService.getCq(cqName);
-        
-        CacheServerTestUtil.ControlCqListener cqlistener = (CacheServerTestUtil.ControlCqListener) cqQuery.getCqAttributes().getCqListener();
-        cqlistener.waitWhileNotEnoughEvents(30000, numberOfEntries);
-        assertEquals(numberOfEntries, cqlistener.events.size());
-      }
-    });
-    
-    // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
-
-    // Stop the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+      });
+          
+      // Verify the durable client received the updates held for it on the server
+      this.durableClientVM.invoke(new CacheSerializableRunnable("Verify updates") {
+        public void run2() throws CacheException {
+          // Get the region
+          Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+          assertNotNull(region);
+  
+          QueryService queryService = CacheServerTestUtil.getPool().getQueryService();
+  
+          CqQuery cqQuery = queryService.getCq(cqName);
+          
+          CacheServerTestUtil.ControlCqListener cqlistener = (CacheServerTestUtil.ControlCqListener) cqQuery.getCqAttributes().getCqListener();
+          cqlistener.waitWhileNotEnoughEvents(30000, numberOfEntries);
+          assertEquals(numberOfEntries, cqlistener.events.size());
+        }
+      });
+      
+      // Stop the durable client
+      this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+  
+      // Stop the server
+      this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    }finally{
+      unsetPeriodicACKObserver(durableClientVM);
+    }
+  }
+  
+  private void setPeriodicACKObserver(VM vm){
+    CacheSerializableRunnable cacheSerializableRunnable = new CacheSerializableRunnable("Set ClientServerObserver"){
+      @Override
+      public void run2() throws CacheException {
+        PoolImpl.BEFORE_SENDING_CLIENT_ACK_CALLBACK_FLAG = true;
+        ClientServerObserver origObserver = ClientServerObserverHolder.setInstance(new ClientServerObserverAdapter() {
+          public void beforeSendingClientAck()
+          {
+            getLogWriter().info("beforeSendingClientAck invoked");
+           
+          }
+        });
+        
+      }
+    };
+    vm.invoke(cacheSerializableRunnable);
+  }
+  
+  private void unsetPeriodicACKObserver(VM vm){
+    CacheSerializableRunnable cacheSerializableRunnable = new CacheSerializableRunnable("Unset ClientServerObserver"){
+      @Override
+      public void run2() throws CacheException {
+        PoolImpl.BEFORE_SENDING_CLIENT_ACK_CALLBACK_FLAG = false;        
+      }
+    };
+    vm.invoke(cacheSerializableRunnable);
   }
   
   public void testReadyForEventsNotCalledImplicitlyForRegisterInterestWithCacheXML() {
@@ -2831,115 +2867,117 @@ public class DurableClientSimpleDUnitTest extends DurableClientTestCase {
    * The client should be rejected until no cqs are currently being drained
    * @throws Exception
    */
-  public void testRejectClientWhenDrainingCq() throws Exception {
-    DistributedTestCase.addExpectedException(LocalizedStrings.CacheClientNotifier_COULD_NOT_CONNECT_DUE_TO_CQ_BEING_DRAINED.toLocalizedString());
-    DistributedTestCase.addExpectedException("Could not initialize a primary queue on startup. No queue servers available.");
-    
-    String greaterThan5Query = "select * from /" + regionName + " p where p.ID > 5";
-    String allQuery = "select * from /" + regionName + " p where p.ID > -1";
-    String lessThan5Query = "select * from /" + regionName + " p where p.ID < 5";
-        
-    // Start server 1
-    Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
-    final int serverPort = ports[0].intValue();
-
-    final String durableClientId = getName() + "_client";
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "disableShufflingOfEndpoints");
-  
-    startDurableClient(durableClientVM, durableClientId, serverPort, regionName);
+  public void testRejectClientWhenDrainingCq() throws Exception {
+    try {
+      DistributedTestCase.addExpectedException(LocalizedStrings.CacheClientNotifier_COULD_NOT_CONNECT_DUE_TO_CQ_BEING_DRAINED.toLocalizedString());
+      DistributedTestCase.addExpectedException("Could not initialize a primary queue on startup. No queue servers available.");
+      
+      String greaterThan5Query = "select * from /" + regionName + " p where p.ID > 5";
+      String allQuery = "select * from /" + regionName + " p where p.ID > -1";
+      String lessThan5Query = "select * from /" + regionName + " p where p.ID < 5";
+          
+      // Start server 1
+      Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
+          "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+      final int serverPort = ports[0].intValue();
   
-    //register durable cqs
-    createCq(durableClientVM, "GreaterThan5", greaterThan5Query, true);
-    createCq(durableClientVM, "All", allQuery, true);
-    createCq(durableClientVM, "LessThan5", lessThan5Query, true);
-    //send client ready
-    sendClientReady(durableClientVM);
-
-    verifyDurableClientOnServer(server1VM, durableClientId);
-
-    // Stop the durable client
-    this.disconnectDurableClient(true);
+      final String durableClientId = getName() + "_client";
+      this.durableClientVM.invoke(CacheServerTestUtil.class, "disableShufflingOfEndpoints");
     
-    // Start normal publisher client
-    startClient(publisherClientVM, serverPort, regionName);
+      startDurableClient(durableClientVM, durableClientId, serverPort, regionName);
+    
+      //register durable cqs
+      createCq(durableClientVM, "GreaterThan5", greaterThan5Query, true);
+      createCq(durableClientVM, "All", allQuery, true);
+      createCq(durableClientVM, "LessThan5", lessThan5Query, true);
+      //send client ready
+      sendClientReady(durableClientVM);
   
-    // Publish some entries
-    publishEntries(publisherClientVM, regionName, 10);
-            
-    this.server1VM.invokeAsync(new CacheSerializableRunnable(
-        "Close cq for durable client") {
-      public void run2() throws CacheException {
-
-        //Set the Test Hook!
-        //This test hook will pause during the drain process
-        CacheClientProxy.testHook = new RejectClientReconnectTestHook();
-
-        final CacheClientNotifier ccnInstance = CacheClientNotifier
-            .getInstance();
-        final CacheClientProxy clientProxy = ccnInstance
-            .getClientProxy(durableClientId);
-        ClientProxyMembershipID proxyId = clientProxy.getProxyID();
-
-        try {
-          ccnInstance.closeClientCq(durableClientId, "All");
-        }
-        catch (CqException e) {
-          throw new CacheException(e){};
-        }
-      }
-    });
-
-    // Restart the durable client
-    startDurableClient(durableClientVM, durableClientId, serverPort, regionName);
-
-    this.server1VM.invoke(new CacheSerializableRunnable(
-        "verify was rejected at least once") {
-      public void run2() throws CacheException {
-        WaitCriterion ev = new WaitCriterion() {
-          public boolean done() {
-            return (((RejectClientReconnectTestHook) CacheClientProxy.testHook).wasClientRejected());
+      verifyDurableClientOnServer(server1VM, durableClientId);
+  
+      // Stop the durable client
+      this.disconnectDurableClient(true);
+      
+      // Start normal publisher client
+      startClient(publisherClientVM, serverPort, regionName);
+    
+      // Publish some entries
+      publishEntries(publisherClientVM, regionName, 10);
+              
+      this.server1VM.invokeAsync(new CacheSerializableRunnable(
+          "Close cq for durable client") {
+        public void run2() throws CacheException {
+  
+          //Set the Test Hook!
+          //This test hook will pause during the drain process
+          CacheClientProxy.testHook = new RejectClientReconnectTestHook();
+  
+          final CacheClientNotifier ccnInstance = CacheClientNotifier
+              .getInstance();
+          final CacheClientProxy clientProxy = ccnInstance
+              .getClientProxy(durableClientId);
+          ClientProxyMembershipID proxyId = clientProxy.getProxyID();
+  
+          try {
+            ccnInstance.closeClientCq(durableClientId, "All");
           }
-          public String description() {
-            return null;
+          catch (CqException e) {
+            throw new CacheException(e){};
           }
-        };
-        DistributedTestCase.waitForCriterion(ev, 10 * 1000, 200, true);
-        assertTrue(((RejectClientReconnectTestHook) CacheClientProxy.testHook).wasClientRejected());
-      }
-    });
-    
-    checkPrimaryUpdater(durableClientVM);
-    
-    // After rejection, the client will retry and eventually connect
-    // Verify durable client on server2
-    verifyDurableClientOnServer(server1VM, durableClientId);
-  
-    createCq(durableClientVM, "GreaterThan5", "select * from /" + regionName + " p where p.ID > 5", true);
-    createCq(durableClientVM, "All", "select * from /" + regionName + " p where p.ID > -1", true);
-    createCq(durableClientVM, "LessThan5", "select * from /" + regionName + " p where p.ID < 5", true);
-    //send client ready
-    sendClientReady(durableClientVM);
-
-    checkCqListenerEvents(durableClientVM, "GreaterThan5", 4 /*numEventsExpected*/, 4/*numEventsToWaitFor*/, 15/*secondsToWait*/);
-    checkCqListenerEvents(durableClientVM, "LessThan5", 5 /*numEventsExpected*/, 5/*numEventsToWaitFor*/, 15/*secondsToWait*/);
-    checkCqListenerEvents(durableClientVM, "All", 0 /*numEventsExpected*/, 1/*numEventsToWaitFor*/, 5/*secondsToWait*/);
-    
-    this.server1VM.invoke(new CacheSerializableRunnable(
-        "unset test hook") {
-      public void run2() throws CacheException {
-        CacheClientProxy.testHook = null;
-      }
-    });
-
-    // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
-
-    // Stop the publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
-
-    // Stop the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+        }
+      });
+  
+      // Restart the durable client
+      startDurableClient(durableClientVM, durableClientId, serverPort, regionName);
+  
+      this.server1VM.invoke(new CacheSerializableRunnable(
+          "verify was rejected at least once") {
+        public void run2() throws CacheException {
+          WaitCriterion ev = new WaitCriterion() {
+            public boolean done() {
+              return  CacheClientProxy.testHook != null && (((RejectClientReconnectTestHook) CacheClientProxy.testHook).wasClientRejected());
+            }
+            public String description() {
+              return null;
+            }
+          };
+          DistributedTestCase.waitForCriterion(ev, 10 * 1000, 200, true);
+          assertTrue(((RejectClientReconnectTestHook) CacheClientProxy.testHook).wasClientRejected());
+        }
+      });
+      
+      checkPrimaryUpdater(durableClientVM);
+      
+      // After rejection, the client will retry and eventually connect
+      // Verify durable client on server2
+      verifyDurableClientOnServer(server1VM, durableClientId);
+    
+      createCq(durableClientVM, "GreaterThan5", "select * from /" + regionName + " p where p.ID > 5", true);
+      createCq(durableClientVM, "All", "select * from /" + regionName + " p where p.ID > -1", true);
+      createCq(durableClientVM, "LessThan5", "select * from /" + regionName + " p where p.ID < 5", true);
+      //send client ready
+      sendClientReady(durableClientVM);
+  
+      checkCqListenerEvents(durableClientVM, "GreaterThan5", 4 /*numEventsExpected*/, 4/*numEventsToWaitFor*/, 15/*secondsToWait*/);
+      checkCqListenerEvents(durableClientVM, "LessThan5", 5 /*numEventsExpected*/, 5/*numEventsToWaitFor*/, 15/*secondsToWait*/);
+      checkCqListenerEvents(durableClientVM, "All", 0 /*numEventsExpected*/, 1/*numEventsToWaitFor*/, 5/*secondsToWait*/);      
+  
+      // Stop the durable client
+      this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+  
+      // Stop the publisher client
+      this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+  
+      // Stop the server
+      this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    }finally{
+      this.server1VM.invoke(new CacheSerializableRunnable(
+          "unset test hook") {
+        public void run2() throws CacheException {
+          CacheClientProxy.testHook = null;
+        }
+      });
+    }
   }
   
   
@@ -2948,99 +2986,101 @@ public class DurableClientSimpleDUnitTest extends DurableClientTestCase {
    * being reactivated
    * @throws Exception
    */
-  public void testCqCloseExceptionDueToActivatingClient() throws Exception {
-    String greaterThan5Query = "select * from /" + regionName + " p where p.ID > 5";
-    String allQuery = "select * from /" + regionName + " p where p.ID > -1";
-    String lessThan5Query = "select * from /" + regionName + " p where p.ID < 5";
+  public void testCqCloseExceptionDueToActivatingClient() throws Exception {
+    try {
+      String greaterThan5Query = "select * from /" + regionName + " p where p.ID > 5";
+      String allQuery = "select * from /" + regionName + " p where p.ID > -1";
+      String lessThan5Query = "select * from /" + regionName + " p where p.ID < 5";
+          
+      // Start server 1
+      Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
+          "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+      final int serverPort = ports[0].intValue();
+      
+      final String durableClientId = getName() + "_client";
+    
+      startDurableClient(durableClientVM, durableClientId, serverPort, regionName);
+      //register durable cqs
+      createCq(durableClientVM, "GreaterThan5", greaterThan5Query, true);
+      createCq(durableClientVM, "All", allQuery, true);
+      createCq(durableClientVM, "LessThan5", lessThan5Query, true);
+      //send client ready
+      sendClientReady(durableClientVM);
         
-    // Start server 1
-    Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
-    final int serverPort = ports[0].intValue();
-    
-    final String durableClientId = getName() + "_client";
+      // Verify durable client on server
+      verifyDurableClientOnServer(server1VM, durableClientId);
+            
+      // Stop the durable client
+      this.disconnectDurableClient(true);
+      
+      // Start normal publisher client
+      startClient(publisherClientVM, serverPort, regionName);
   
-    startDurableClient(durableClientVM, durableClientId, serverPort, regionName);
-    //register durable cqs
-    createCq(durableClientVM, "GreaterThan5", greaterThan5Query, true);
-    createCq(durableClientVM, "All", allQuery, true);
-    createCq(durableClientVM, "LessThan5", lessThan5Query, true);
-    //send client ready
-    sendClientReady(durableClientVM);
+      // Publish some entries
+      publishEntries(publisherClientVM, regionName, 10);
+          
       
-    // Verify durable client on server
-    verifyDurableClientOnServer(server1VM, durableClientId);
+      AsyncInvocation async = this.server1VM.invokeAsync(new CacheSerializableRunnable(
+          "Close cq for durable client") {
+        public void run2() throws CacheException {
+  
+          //Set the Test Hook!
+          //This test hook will pause during the drain process
+          CacheClientProxy.testHook = new CqExceptionDueToActivatingClientTestHook();
           
-    // Stop the durable client
-    this.disconnectDurableClient(true);
-    
-    // Start normal publisher client
-    startClient(publisherClientVM, serverPort, regionName);
-
-    // Publish some entries
-    publishEntries(publisherClientVM, regionName, 10);
-        
-    
-    AsyncInvocation async = this.server1VM.invokeAsync(new CacheSerializableRunnable(
-        "Close cq for durable client") {
-      public void run2() throws CacheException {
-
-        //Set the Test Hook!
-        //This test hook will pause during the drain process
-        CacheClientProxy.testHook = new CqExceptionDueToActivatingClientTestHook();
-        
-        final CacheClientNotifier ccnInstance = CacheClientNotifier
-            .getInstance();
-        final CacheClientProxy clientProxy = ccnInstance
-            .getClientProxy(durableClientId);
-        ClientProxyMembershipID proxyId = clientProxy.getProxyID();
-
-        try {
-          ccnInstance.closeClientCq(durableClientId, "All");
-          fail("Should have thrown an exception due to activating client");
-        }
-        catch (CqException e) {
-          String expected = LocalizedStrings.CacheClientProxy_COULD_NOT_DRAIN_CQ_DUE_TO_RESTARTING_DURABLE_CLIENT.toLocalizedString("All", proxyId.getDurableId());
-          if (!e.getMessage().equals(expected)) {            
-           fail("Not the expected exception, was expecting " + (LocalizedStrings.CacheClientProxy_COULD_NOT_DRAIN_CQ_DUE_TO_RESTARTING_DURABLE_CLIENT.toLocalizedString("All", proxyId.getDurableId()) + " instead of exception: " + e.getMessage()));
+          final CacheClientNotifier ccnInstance = CacheClientNotifier
+              .getInstance();
+          final CacheClientProxy clientProxy = ccnInstance
+              .getClientProxy(durableClientId);
+          ClientProxyMembershipID proxyId = clientProxy.getProxyID();
+  
+          try {
+            ccnInstance.closeClientCq(durableClientId, "All");
+            fail("Should have thrown an exception due to activating client");
+          }
+          catch (CqException e) {
+            String expected = LocalizedStrings.CacheClientProxy_COULD_NOT_DRAIN_CQ_DUE_TO_RESTARTING_DURABLE_CLIENT.toLocalizedString("All", proxyId.getDurableId());
+            if (!e.getMessage().equals(expected)) {            
+             fail("Not the expected exception, was expecting " + (LocalizedStrings.CacheClientProxy_COULD_NOT_DRAIN_CQ_DUE_TO_RESTARTING_DURABLE_CLIENT.toLocalizedString("All", proxyId.getDurableId()) + " instead of exception: " + e.getMessage()));
+            }
           }
         }
-      }
-    });
-    
-    //Restart the durable client
-    startDurableClient(durableClientVM, durableClientId, serverPort, regionName);
-  
-    //Reregister durable cqs
-    createCq(durableClientVM, "GreaterThan5", "select * from /" + regionName + " p where p.ID > 5", true);
-    createCq(durableClientVM, "All", "select * from /" + regionName + " p where p.ID > -1", true);
-    createCq(durableClientVM, "LessThan5", "select * from /" + regionName + " p where p.ID < 5", true);
-    //send client ready
-    sendClientReady(durableClientVM);
-    
-    async.join();
-    assertEquals(async.getException() != null ? async.getException().toString(): "No error" ,false,  async.exceptionOccurred());
-    
-    //verify cq listener events
-    checkCqListenerEvents(durableClientVM, "GreaterThan5", 4 /*numEventsExpected*/, 4/*numEventsToWaitFor*/, 15/*secondsToWait*/);
-    checkCqListenerEvents(durableClientVM, "LessThan5", 5 /*numEventsExpected*/, 5/*numEventsToWaitFor*/, 15/*secondsToWait*/);
-    checkCqListenerEvents(durableClientVM, "All", 10 /*numEventsExpected*/, 10/*numEventsToWaitFor*/, 15/*secondsToWait*/);
-    
-    this.server1VM.invoke(new CacheSerializableRunnable(
-        "unset test hook") {
-      public void run2() throws CacheException {
-        CacheClientProxy.testHook = null;
-      }
-    });
-
-    // Stop the durable client
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
-
-    // Stop the publisher client
-    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
-
-    // Stop the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+      });
+      
+      //Restart the durable client
+      startDurableClient(durableClientVM, durableClientId, serverPort, regionName);
+    
+      //Reregister durable cqs
+      createCq(durableClientVM, "GreaterThan5", "select * from /" + regionName + " p where p.ID > 5", true);
+      createCq(durableClientVM, "All", "select * from /" + regionName + " p where p.ID > -1", true);
+      createCq(durableClientVM, "LessThan5", "select * from /" + regionName + " p where p.ID < 5", true);
+      //send client ready
+      sendClientReady(durableClientVM);
+      
+      async.join();
+      assertEquals(async.getException() != null ? async.getException().toString(): "No error" ,false,  async.exceptionOccurred());
+      
+      //verify cq listener events
+      checkCqListenerEvents(durableClientVM, "GreaterThan5", 4 /*numEventsExpected*/, 4/*numEventsToWaitFor*/, 15/*secondsToWait*/);
+      checkCqListenerEvents(durableClientVM, "LessThan5", 5 /*numEventsExpected*/, 5/*numEventsToWaitFor*/, 15/*secondsToWait*/);
+      checkCqListenerEvents(durableClientVM, "All", 10 /*numEventsExpected*/, 10/*numEventsToWaitFor*/, 15/*secondsToWait*/);           
+  
+      // Stop the durable client
+      this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+  
+      // Stop the publisher client
+      this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+  
+      // Stop the server
+      this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    }finally {
+      this.server1VM.invoke(new CacheSerializableRunnable(
+          "unset test hook") {
+        public void run2() throws CacheException {
+          CacheClientProxy.testHook = null;
+        }
+      });
+    }
   }
   
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fdbab40/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
index 583ef81..ec621de 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
@@ -7,8 +7,14 @@
  */
 package com.gemstone.gemfire.internal.cache.tier.sockets;
 
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
@@ -83,6 +89,8 @@ public class DurableClientTestCase extends DistributedTestCase {
     this.regionName = getName() + "_region";
     //Clients see this when the servers disconnect
     addExpectedException("Could not find any server");
+    testName = getName();
+    System.out.println("\n\n[setup] START TEST " + getClass().getSimpleName()+"."+ testName+"\n\n");
   }
   
   public void tearDown2() throws Exception {
@@ -148,70 +156,67 @@ public class DurableClientTestCase extends DistributedTestCase {
    * In this test we will set gemfire.SPECIAL_DURABLE property to true and will
    * see durableID appended by poolname or not
    */
-  public void testSimpleDurableClient2() {    
-    // Start a server
-    int serverPort = ((Integer) this.server1VM.invoke(CacheServerTestUtil.class,
-        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
-        .intValue();
-
-    // Start a durable client that is not kept alive on the server when it
-    // stops normally
-    final String durableClientId = getName() + "_client";
+  public void testSimpleDurableClient2() {
     final Properties jp = new Properties();
     jp.setProperty("gemfire.SPECIAL_DURABLE", "true");
-    
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
-        new Object[] {getClientPool(getServerHostName(durableClientVM.getHost()), serverPort, true)
-    									, regionName
-    									, getClientDistributedSystemProperties(durableClientId)
-    									, new Boolean(false)
-    									, jp});
 
-    // Send clientReady message
-    this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
-      public void run2() throws CacheException {
-        CacheServerTestUtil.getCache().readyForEvents();
-      }
-    });
+    try {
+      // Start a server
+      int serverPort = ((Integer) this.server1VM.invoke(CacheServerTestUtil.class, "createCacheServer", new Object[] { regionName, new Boolean(true) })).intValue();
 
-    // Verify durable client on server
-    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
-      public void run2() throws CacheException {
-        // Find the proxy
-        checkNumberOfClientProxies(1);
-        CacheClientProxy proxy = getClientProxy();
-        assertNotNull(proxy);
-        
-        // Verify that it is durable and its properties are correct
-        assertTrue(proxy.isDurable());
-        assertNotSame(durableClientId, proxy.getDurableId());
-        
-        /* new durable id will be like this
-         * durableClientId
-         * _gem_ //separartor
-         * client pool name
-         */
-        String dId = durableClientId + "_gem_" + "CacheServerTestUtil";
-        
-        assertEquals(dId, proxy.getDurableId());
-        assertEquals(DistributionConfig.DEFAULT_DURABLE_CLIENT_TIMEOUT, proxy.getDurableTimeout());
-        //assertEquals(DistributionConfig.DEFAULT_DURABLE_CLIENT_KEEP_ALIVE, proxy.getDurableKeepAlive());
-      }
-    });
-    
-    // Stop the durable client
-    this.disconnectDurableClient();
-    
-    // Verify the durable client is present on the server for closeCache=false case.
-    this.verifySimpleDurableClient();
-    
-    // Stop the server
-    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+      // Start a durable client that is not kept alive on the server when it
+      // stops normally
+      final String durableClientId = getName() + "_client";
 
-    this.closeDurableClient();
-    
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "unsetJavaSystemProperties", 
+      this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient",
+          new Object[] { getClientPool(getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId), new Boolean(false), jp });
+
+      // Send clientReady message
+      this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
+        public void run2() throws CacheException {
+          CacheServerTestUtil.getCache().readyForEvents();
+        }
+      });
+
+      // Verify durable client on server
+      this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+        public void run2() throws CacheException {
+          // Find the proxy
+          checkNumberOfClientProxies(1);
+          CacheClientProxy proxy = getClientProxy();
+          assertNotNull(proxy);
+
+          // Verify that it is durable and its properties are correct
+          assertTrue(proxy.isDurable());
+          assertNotSame(durableClientId, proxy.getDurableId());
+
+          /* new durable id will be like this
+           * durableClientId
+           * _gem_ //separartor
+           * client pool name */
+          String dId = durableClientId + "_gem_" + "CacheServerTestUtil";
+
+          assertEquals(dId, proxy.getDurableId());
+          assertEquals(DistributionConfig.DEFAULT_DURABLE_CLIENT_TIMEOUT, proxy.getDurableTimeout());
+          // assertEquals(DistributionConfig.DEFAULT_DURABLE_CLIENT_KEEP_ALIVE, proxy.getDurableKeepAlive());
+        }
+      });
+
+      // Stop the durable client
+      this.disconnectDurableClient();
+
+      // Verify the durable client is present on the server for closeCache=false case.
+      this.verifySimpleDurableClient();
+
+      // Stop the server
+      this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+
+      this.closeDurableClient();
+    } finally {
+ 
+      this.durableClientVM.invoke(CacheServerTestUtil.class, "unsetJavaSystemProperties", 
         new Object[] {jp});
+    }
     
   }
   
@@ -226,9 +231,49 @@ public class DurableClientTestCase extends DistributedTestCase {
 
   public void disconnectDurableClient(boolean keepAlive)
   {
-    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache",new Object[] {new Boolean(keepAlive)});    
+    printClientProxyState("Before");
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache",new Object[] {new Boolean(keepAlive)});
+    pause(1000);
+    printClientProxyState("after");
   }
 
+  public void printClientProxyState(String st) {
+    CacheSerializableRunnable s = new CacheSerializableRunnable("Loggiog CCCP and ServerConnetcion state"){
+      @Override
+      public void run2() throws CacheException {
+        // TODO Auto-generated method stub
+        CacheServerTestUtil.getCache().getLogger().info(st + " CCP states: " + getAllClientProxyState());
+        CacheServerTestUtil.getCache().getLogger().info(st + " CHM states: " + printMap(ClientHealthMonitor._instance.getConnectedClients(null)));
+      }
+    };
+    server1VM.invoke(s);
+  }
+  
+  private String printMap(Map m) {
+    Iterator<Map.Entry> itr = m.entrySet().iterator();
+    StringBuffer sb = new StringBuffer();
+    while(itr.hasNext()){
+      sb.append("{");
+      Map.Entry entry = itr.next();
+      sb.append(entry.getKey());
+      sb.append(", ");
+      printMapValue(entry.getValue(), sb);
+      sb.append("}");
+    }
+    return sb.toString();    
+  }
+  
+  private void printMapValue(Object value, StringBuffer sb) {
+    if(value.getClass().isArray()) {
+      
+      sb.append("{");
+      sb.append(Arrays.toString((Object[])value));
+      sb.append("}");
+    } else {
+      sb.append(value);
+    }
+  }
+  
   public void verifySimpleDurableClient()
   {
     this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
@@ -1431,7 +1476,7 @@ public class DurableClientTestCase extends DistributedTestCase {
   public class RejectClientReconnectTestHook implements CacheClientProxy.TestHook {
       CountDownLatch reconnectLatch = new CountDownLatch(1);
       CountDownLatch continueDrain = new CountDownLatch(1);
-      boolean clientWasRejected = false;
+      volatile boolean clientWasRejected = false;
       CountDownLatch clientConnected = new CountDownLatch(1);
       
       public void doTestHook(String spot) {
@@ -1579,13 +1624,39 @@ public class DurableClientTestCase extends DistributedTestCase {
     return proxy;
   }
   
+  protected static String getAllClientProxyState() {
+    // Get the CacheClientNotifier
+    CacheClientNotifier notifier = getBridgeServer().getAcceptor()
+        .getCacheClientNotifier();
+    
+    // Get the CacheClientProxy or not (if proxy set is empty)
+    CacheClientProxy proxy = null;
+    Iterator<CacheClientProxy> i = notifier.getClientProxies().iterator();
+    StringBuffer sb = new StringBuffer();
+    while(i.hasNext()) {
+      sb.append(" [");
+      sb.append(i.next().getState());
+      sb.append(" ]");
+    }
+    return sb.toString();
+  }
+  
   protected static void checkNumberOfClientProxies(final int expected) {
     WaitCriterion ev = new WaitCriterion() {
       public boolean done() {
         return expected == getNumberOfClientProxies();
       }
       public String description() {
-        return null;
+        /*String result =  "";
+        if(ClientHealthMonitor._instance != null && ClientHealthMonitor._instance.getCleanupProxyIdTable() != null)
+          result = ClientHealthMonitor._instance.getCleanupProxyIdTable().toString(); 
+        
+        
+        CacheClientProxy ccp = getClientProxy();
+        
+        if(ccp != null)
+          result += " ccp: " + ccp.toString();*/
+        return getAllClientProxyState();
       }
     };
     DistributedTestCase.waitForCriterion(ev, 50 * 1000, 200, true);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fdbab40/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
index 353d7fa..95b5301 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
@@ -95,9 +95,15 @@ public class DurableClientCommandsDUnitTest extends CliCommandTestBase {
     CommandStringBuilder csb = new CommandStringBuilder(CliStrings.CLOSE_DURABLE_CLIENTS);
     csb.addOption(CliStrings.CLOSE_DURABLE_CLIENTS__CLIENT__ID, clientName);
     String commandString = csb.toString();
-    writeToLog("Command String : ", commandString);
-    CommandResult commandResult = executeCommand(commandString);
-    String resultAsString = commandResultToString(commandResult);
+    long giveUpTime = System.currentTimeMillis() + 20000;
+    CommandResult commandResult = null;
+    String resultAsString = null;
+    do {
+      writeToLog("Command String : ", commandString);
+      commandResult = executeCommand(commandString);
+      resultAsString = commandResultToString(commandResult);
+    } while (resultAsString.contains("Cannot close a running durable client")
+        && giveUpTime > System.currentTimeMillis());
     writeToLog("Command Result :\n", resultAsString);
     assertTrue(Status.OK.equals(commandResult.getStatus()));
     
@@ -140,6 +146,16 @@ public class DurableClientCommandsDUnitTest extends CliCommandTestBase {
     
   }
     
+//  public void testRepeat() throws Exception {
+//    long endTime = System.currentTimeMillis() + (75 * 60000);
+//    while (endTime > System.currentTimeMillis()) {
+//      testCountSubscriptionQueueSize();
+//      tearDown();
+//      setUp();
+//    }
+//    testCountSubscriptionQueueSize();
+//  }
+//  
   public void testCountSubscriptionQueueSize() throws Exception {
     setupSystem();
     setupCqs();
@@ -199,11 +215,17 @@ public class DurableClientCommandsDUnitTest extends CliCommandTestBase {
     csb = new CommandStringBuilder(CliStrings.CLOSE_DURABLE_CLIENTS);
     csb.addOption(CliStrings.CLOSE_DURABLE_CLIENTS__CLIENT__ID, clientName);
     commandString = csb.toString();
-    writeToLog("Command String : ", commandString);
-    commandResult = executeCommand(commandString);
-    resultAsString = commandResultToString(commandResult);
+    // since it can take the server a bit to know that the client has disconnected
+    // we loop here
+    long giveUpTime = System.currentTimeMillis() + 20000;
+    do {
+      writeToLog("Command String : ", commandString);
+      commandResult = executeCommand(commandString);
+      resultAsString = commandResultToString(commandResult);
+    } while (resultAsString.contains("Cannot close a running durable client")
+        && giveUpTime > System.currentTimeMillis());
     writeToLog("Command Result :\n", resultAsString);
-    assertTrue(Status.OK.equals(commandResult.getStatus()));
+    assertTrue("failed executing" + commandString + "; result = "+resultAsString, Status.OK.equals(commandResult.getStatus()));
     
     csb = new CommandStringBuilder(CliStrings.COUNT_DURABLE_CQ_EVENTS);
     csb.addOption(CliStrings.COUNT_DURABLE_CQ_EVENTS__DURABLE__CLIENT__ID, clientName);
@@ -217,8 +239,7 @@ public class DurableClientCommandsDUnitTest extends CliCommandTestBase {
   }
   
   private void writeToLog(String text, String resultAsString) {
-    getLogWriter().info(testName + "\n");
-    getLogWriter().info(resultAsString);
+    getLogWriter().info(getUniqueName() + ": " + text + "\n" + resultAsString);
   }
   
   private void setupSystem() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8fdbab40/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
index 4a4446c..a41a246 100644
--- a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/GatewaySenderEventRemoteDispatcher.java
@@ -630,12 +630,12 @@ public class GatewaySenderEventRemoteDispatcher implements
           logger.fatal(LocalizedMessage.create(
               LocalizedStrings.GatewayEventRemoteDispatcher_STOPPING_THE_PROCESSOR_BECAUSE_THE_FOLLOWING_EXCEPTION_OCCURRED_WHILE_PROCESSING_A_BATCH) ,e);
         }
-        sender.lifeCycleLock.writeLock().lock();
+        sender.getLifeCycleLock().writeLock().lock();
         try {
           processor.stopProcessing();
           sender.clearTempEventsAfterSenderStopped();
         } finally {
-          sender.lifeCycleLock.writeLock().unlock();
+          sender.getLifeCycleLock().writeLock().unlock();
         }
         // destroyConnection();
       } finally {



[66/70] incubator-geode git commit: GEODE-865: CI Failure: ConcurrentParallelGatewaySenderOperation_2_DUnitTest.testParallelGatewaySenders_SingleNode_UserPR_localDestroy_RecreateRegion

Posted by up...@apache.org.
GEODE-865: CI Failure: ConcurrentParallelGatewaySenderOperation_2_DUnitTest.testParallelGatewaySenders_SingleNode_UserPR_localDestroy_RecreateRegion


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/68a85fed
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/68a85fed
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/68a85fed

Branch: refs/heads/develop
Commit: 68a85fed991d7ebd9519c0f77b5b5b564b965a56
Parents: 09bd530
Author: Barry Oglesby <bo...@pivotal.io>
Authored: Tue Jan 26 13:43:21 2016 -0800
Committer: Barry Oglesby <bo...@pivotal.io>
Committed: Wed Jan 27 18:02:19 2016 -0800

----------------------------------------------------------------------
 .../gemfire/internal/cache/wan/WANTestBase.java |  14 +-
 ...allelGatewaySenderOperation_2_DUnitTest.java | 841 +++++--------------
 2 files changed, 234 insertions(+), 621 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/68a85fed/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
index 0c32d1f..3dd4742 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
@@ -2395,7 +2395,7 @@ public class WANTestBase extends DistributedTestCase{
   public static void createConcurrentSender(String dsName, int remoteDsId,
       boolean isParallel, Integer maxMemory, Integer batchSize,
       boolean isConflation, boolean isPersistent, GatewayEventFilter filter,
-      boolean isManulaStart, int concurrencyLevel, OrderPolicy policy) {
+      boolean isManualStart, int concurrencyLevel, OrderPolicy policy) {
 
     File persistentDirectory = new File(dsName + "_disk_"
         + System.currentTimeMillis() + "_" + VM.getCurrentVMNum());
@@ -2408,7 +2408,7 @@ public class WANTestBase extends DistributedTestCase{
       gateway.setParallel(true);
       gateway.setMaximumQueueMemory(maxMemory);
       gateway.setBatchSize(batchSize);
-      gateway.setManualStart(isManulaStart);
+      gateway.setManualStart(isManualStart);
       ((InternalGatewaySenderFactory) gateway)
           .setLocatorDiscoveryCallback(new MyLocatorCallback());
       if (filter != null) {
@@ -2430,7 +2430,7 @@ public class WANTestBase extends DistributedTestCase{
       GatewaySenderFactory gateway = cache.createGatewaySenderFactory();
       gateway.setMaximumQueueMemory(maxMemory);
       gateway.setBatchSize(batchSize);
-      gateway.setManualStart(isManulaStart);
+      gateway.setManualStart(isManualStart);
       ((InternalGatewaySenderFactory) gateway)
           .setLocatorDiscoveryCallback(new MyLocatorCallback());
       if (filter != null) {
@@ -4825,7 +4825,13 @@ public class WANTestBase extends DistributedTestCase{
       }
     }
   }
-  
+
+  protected Integer[] createLNAndNYLocators() {
+    Integer lnPort = (Integer) vm0.invoke(() -> createFirstLocatorWithDSId(1));
+    Integer nyPort = (Integer) vm1.invoke(() -> createFirstRemoteLocator(2, lnPort));
+    return new Integer[] { lnPort, nyPort };
+  }
+
   public static class MyLocatorCallback extends
       LocatorDiscoveryCallbackAdapter {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/68a85fed/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
index f770062..694fc1f 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
@@ -23,6 +23,8 @@ import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
 import com.gemstone.gemfire.test.dunit.AsyncInvocation;
 import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.VM;
+
 /**
  * @author skumar
  *
@@ -46,239 +48,75 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
   // to test that when userPR is locally destroyed, shadow Pr is also locally
   // destroyed and on recreation usrePr , shadow Pr is also recreated.
   public void testParallelGatewaySender_SingleNode_UserPR_localDestroy_RecreateRegion() throws Exception {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer[] locatorPorts = createLNAndNYLocators();
+    Integer lnPort = locatorPorts[0];
+    Integer nyPort = locatorPorts[1];
 
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    
     try {
-      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
-          new Object[] { lnPort });
-
-      vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
-          "ln", 2, true, 100, 10, false, false, null, false, 5, OrderPolicy.KEY });
-
-      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-      vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
-      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", "ln", 1, 10, isOffHeap() });
-
-      getLogWriter().info("Created PRs on local site");
-
-      vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", null, 1, 10, isOffHeap() });
-
-      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
-          10 });
-
-      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 10 });
+      createAndStartSender(vm4, lnPort, 5, false, true);
 
-      // since sender is paused, no dispatching
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 0 });
+      createReceiverAndDoPutsInPausedSender(nyPort);
 
-      vm4.invoke(WANTestBase.class, "localDestroyRegion",
-          new Object[] { testName + "_PR" });
+      vm4.invoke(() -> localDestroyRegion(testName + "_PR"));
 
-      // since shodowPR is locally destroyed, so no data to dispatch
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 0 });
-
-      vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-
-      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", "ln", 1, 10, isOffHeap() });
-
-      vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
-          testName + "_PR", 10, 20 });
-
-      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 10 });
-
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 10 });
+      recreatePRDoPutsAndValidateRegionSizes(0, true);
     } finally {
-      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+      vm4.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
     }
   }
   
   public void testParallelGatewaySender_SingleNode_UserPR_Destroy_RecreateRegion() throws Exception {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer[] locatorPorts = createLNAndNYLocators();
+    Integer lnPort = locatorPorts[0];
+    Integer nyPort = locatorPorts[1];
 
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
     try {
-      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
-          new Object[] { lnPort });
+      createAndStartSender(vm4, lnPort, 4, false, true);
 
-      vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
-          "ln", 2, true, 100, 10, false, false, null, false, 4, OrderPolicy.KEY });
+      createReceiverAndDoPutsInPausedSender(nyPort);
 
-      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+      vm4.invoke(() -> resumeSender("ln"));
 
-      vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+      vm4.invoke(() -> validateParallelSenderQueueAllBucketsDrained("ln"));
 
-      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", "ln", 1, 10, isOffHeap() });
-
-      getLogWriter().info("Created PRs on local site");
+      vm4.invoke(() -> localDestroyRegion(testName + "_PR"));
 
-      vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", null, 1, 10, isOffHeap() });
-
-      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
-          10 });
-
-      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 10 });
-
-      // since resume is paused, no dispatching
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 0 });
-
-      vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+      recreatePRDoPutsAndValidateRegionSizes(10, false);
+    } finally {
+      vm4.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
+    }
+  }
 
-      vm4.invoke(WANTestBase.class, "destroyRegion", new Object[] { testName
-          + "_PR" });
+  public void testParallelGatewaySender_SingleNode_UserPR_Close_RecreateRegion() throws Exception {
+    Integer[] locatorPorts = createLNAndNYLocators();
+    Integer lnPort = locatorPorts[0];
+    Integer nyPort = locatorPorts[1];
 
-      // before destoy, there is wait for queue to drain, so data will be
-      // dispatched
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 10 });
+    createAndStartSender(vm4, lnPort, 7, false, true);
 
-      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", "ln", 1, 10, isOffHeap() });
+    createReceiverAndDoPutsInPausedSender(nyPort);
 
-      vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
-          testName + "_PR", 10, 20 });
+    vm4.invoke(() -> closeRegion(testName + "_PR"));
 
-      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 10 });
+    vm4.invoke(() -> resumeSender("ln"));
 
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 20 });
-    } finally {
-      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-        "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
-    }
-  }
-  
-  
-  public void testParallelGatewaySender_SingleNode_UserPR_Close_RecreateRegion() throws Exception {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    pause(500); //paused if there is any element which is received on remote site
 
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    recreatePRDoPutsAndValidateRegionSizes(0, false);
 
-    vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class, "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME", new Object[] { lnPort });
-    
-    getLogWriter().info("Created cache on local site");
-    
-    getLogWriter().info("Created senders on local site");
-    
-    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
-      true, 100, 10, false, false, null, false, 7, OrderPolicy.KEY });
-  
-    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-    
-    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-    
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      testName + "_PR", "ln", 1, 10, isOffHeap()});
-    
-    getLogWriter().info("Created PRs on local site");
-    
-    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-        testName + "_PR", null, 1, 10, isOffHeap() });
-   
-    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 10 });
-    
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      testName + "_PR", 10 });
-    
-    //since resume is paused, no dispatching
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      testName + "_PR", 0 });
-    
-    vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class, "closeRegion", new Object[] { testName + "_PR" });
-    
-    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-    
-    pause(500); //paused if there is any element which is received on remote site
-    
-    //before close, there is wait for queue to drain, so data will be dispatched
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      testName + "_PR", 0 });
-    
-    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-      testName + "_PR", "ln", 1, 10, isOffHeap() });
-    
-    vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] { testName + "_PR", 10, 20 });
-    
-    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      testName + "_PR", 10 });
-    
-    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-      testName + "_PR", 10 });
-    
-    vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-        "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+    vm4.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
   }
   
   //to test that while localDestroy is in progress, put operation does not successed
   public void testParallelGatewaySender_SingleNode_UserPR_localDestroy_SimultenuousPut_RecreateRegion() throws Exception {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    Integer[] locatorPorts = createLNAndNYLocators();
+    Integer lnPort = locatorPorts[0];
+    Integer nyPort = locatorPorts[1];
 
     try {
-      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
-          new Object[] { lnPort });
-
-      getLogWriter().info("Created cache on local site");
+      createAndStartSender(vm4, lnPort, 5, false, true);
 
-      getLogWriter().info("Created senders on local site");
-
-      vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
-          "ln", 2, true, 100, 10, false, false, null, false, 5, OrderPolicy.KEY });
-
-      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-      vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
-      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", "ln", 1, 10, isOffHeap() });
-
-      getLogWriter().info("Created PRs on local site");
-
-      vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", null, 1, 10, isOffHeap() });
-
-      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
-          10 });
-
-      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 10 });
-
-      // since resume is paused, no dispatching
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 0 });
+      createReceiverAndDoPutsInPausedSender(nyPort);
 
       AsyncInvocation putAsync = vm4.invokeAsync(WANTestBase.class,
           "doPutsFrom", new Object[] { testName + "_PR", 100, 2000 });
@@ -302,73 +140,30 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
             putAsync.getException());
       }
 
-      vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+      vm4.invoke(() -> resumeSender("ln"));
 
       pause(500); // paused if there is any element which is received on remote
                   // site
 
-      // since shodowPR is locally destroyed, so no data to dispatch
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 0 });
-
-      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", "ln", 1, 10, isOffHeap() });
-
-      vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
-          testName + "_PR", 10, 20 });
-
-      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 10 });
-
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 10 });
+      recreatePRDoPutsAndValidateRegionSizes(0, false);
     } finally {
-      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+      vm4.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
     }
   }
   
   public void testParallelGatewaySender_SingleNode_UserPR_Destroy_SimultenuousPut_RecreateRegion() throws Exception {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    Integer[] locatorPorts = createLNAndNYLocators();
+    Integer lnPort = locatorPorts[0];
+    Integer nyPort = locatorPorts[1];
 
     try {
-      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
-          new Object[] { lnPort });
-
-      vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
-          "ln", 2, true, 100, 10, false, false, null, false, 6, OrderPolicy.KEY });
-
-      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-      vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
-      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", "ln", 1, 10, isOffHeap() });
-      vm4.invoke(WANTestBase.class, "addCacheListenerAndDestroyRegion", new Object[] {
-        testName + "_PR"});
-      
-      getLogWriter().info("Created PRs on local site");
-
-      vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", null, 1, 10, isOffHeap() });
-
-      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
-          10 });
+      createAndStartSender(vm4, lnPort, 6, false, true);
 
-      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 10 });
+      vm4.invoke(() -> addCacheListenerAndDestroyRegion(testName + "_PR"));
 
-      // since resume is paused, no dispatching
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 0 });
+      createReceiverAndDoPutsInPausedSender(nyPort);
 
-      vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+      vm4.invoke(() -> resumeSender("ln"));
 
       AsyncInvocation putAsync = vm4.invokeAsync(WANTestBase.class,
           "doPutsFrom", new Object[] { testName + "_PR", 10, 101 });
@@ -387,27 +182,18 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
 
       // before destroy, there is wait for queue to drain, so data will be
       // dispatched
-      vm2.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "validateRegionSizeWithinRange", new Object[] { testName + "_PR", 10,
-              101 }); // possible size is more than 10
+      vm2.invoke(() -> validateRegionSizeWithinRange(testName + "_PR", 10, 101)); // possible size is more than 10
 
-      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", "ln", 1, 10, isOffHeap() });
+      vm4.invoke(() -> createPartitionedRegion(testName + "_PR", "ln", 1, 10, isOffHeap()));
 
-      vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
-          testName + "_PR", 10, 20 });
+      vm4.invoke(() -> doPutsFrom(testName + "_PR", 10, 20));
 
-      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 10 });
+      vm4.invoke(() -> validateRegionSize(testName + "_PR", 10));
 
-      vm2.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "validateRegionSizeWithinRange", new Object[] { testName + "_PR", 20,
-              101 });// possible size is more than 20
+      vm2.invoke(() -> validateRegionSizeWithinRange(testName + "_PR", 20, 101)); // possible size is more than 20
     } finally {
-      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+      vm4.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
     }
-    
   }
   
   public void testParallelGatewaySender_SingleNode_UserPR_Destroy_NodeDown()
@@ -415,60 +201,16 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
     addExpectedException("Broken pipe");
     addExpectedException("Connection reset");
     addExpectedException("Unexpected IOException");
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    Integer[] locatorPorts = createLNAndNYLocators();
+    Integer lnPort = locatorPorts[0];
+    Integer nyPort = locatorPorts[1];
 
     try {
-      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
-          new Object[] { lnPort });
-      vm5.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
-          new Object[] { lnPort });
-      vm6.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
-          new Object[] { lnPort });
-
-      vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
-          "ln", 2, true, 100, 10, false, false, null, false, 5, OrderPolicy.KEY });
-      vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
-          "ln", 2, true, 100, 10, false, false, null, false, 5, OrderPolicy.KEY });
-      vm6.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
-          "ln", 2, true, 100, 10, false, false, null, false, 5, OrderPolicy.KEY });
-
-      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-      vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-      vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-      vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-      vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-      vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
-      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", "ln", 1, 10, isOffHeap() });
-      vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", "ln", 1, 10, isOffHeap() });
-      vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", "ln", 1, 10, isOffHeap() });
-
-      getLogWriter().info("Created PRs on local site");
-
-      vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", null, 1, 10, isOffHeap() });
-
-      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
-          10000 });
+      createAndStartSender(vm4, lnPort, 5, false, true);
+      createAndStartSender(vm5, lnPort, 5, false, true);
+      createAndStartSender(vm6, lnPort, 5, false, true);
 
-      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 10000 });
-
-      // since resume is paused, no dispatching
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 0 });
+      createReceiverAndDoPutsInPausedSender(nyPort);
 
       vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
       vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
@@ -488,60 +230,24 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
         fail("Interrupted the async invocation.");
       }
 
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 10000 });// possible size is more than 20
+      vm2.invoke(() -> validateRegionSize(testName + "_PR", 10));
     } finally {
-      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
-      vm5.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
-      vm6.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+      vm4.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
+      vm5.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
+      vm6.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
     }
 
   }
   
   public void testParallelGatewaySender_SingleNode_UserPR_Close_SimultenuousPut_RecreateRegion() throws Exception {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    Integer[] locatorPorts = createLNAndNYLocators();
+    Integer lnPort = locatorPorts[0];
+    Integer nyPort = locatorPorts[1];
 
     try {
-      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
-          new Object[] { lnPort });
-
-      getLogWriter().info("Created cache on local site");
-
-      getLogWriter().info("Created senders on local site");
+      createAndStartSender(vm4, lnPort, 5, false, true);
 
-      vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
-          "ln", 2, true, 100, 10, false, false, null, false, 5, OrderPolicy.KEY });
-
-      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-      vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
-
-      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", "ln", 1, 10, isOffHeap() });
-
-      getLogWriter().info("Created PRs on local site");
-
-      vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", null, 1, 10, isOffHeap() });
-
-      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
-          10 });
-
-      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 10 });
-
-      // since resume is paused, no dispatching
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 0 });
+      createReceiverAndDoPutsInPausedSender(nyPort);
 
       AsyncInvocation putAsync = vm4.invokeAsync(WANTestBase.class,
           "doPutsFrom", new Object[] { testName + "_PR", 10, 2000 });
@@ -556,140 +262,108 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
         fail("Interrupted the async invocation.");
       }
 
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 0 });
-
-      vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
-
-      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", "ln", 1, 10, isOffHeap() });
-
-      vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
-          testName + "_PR", 10, 20 });
+      recreatePRDoPutsAndValidateRegionSizes(0, true);
+    } finally {
+      vm4.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
+    }
+  }
 
-      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 10 });
+  private void createReceiverAndDoPutsInPausedSender(int port) {
+    // Note: This is a test-specific method used by several tests to do puts from vm4 to vm2.
+    String regionName = testName + "_PR";
+    vm2.invoke(() -> createReceiver(port));
+    vm2.invoke(() -> createPartitionedRegion(regionName, null, 1, 10, isOffHeap()));
+    vm4.invoke(() -> doPuts(regionName, 10));
+    vm4.invoke(() -> validateRegionSize(regionName, 10));
+    // since sender is paused, no dispatching
+    vm2.invoke(() -> validateRegionSize(regionName, 0));
+  }
 
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 10 });
-    } finally {
-      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+  private void recreatePRDoPutsAndValidateRegionSizes(int expectedRegionSize, boolean resumeSender) {
+    // Note: This is a test-specific method used by several test to recreate a partitioned region,
+    // do puts and validate region sizes in vm2 and vm4.
+    // since shadowPR is locally destroyed, so no data to dispatch
+    String regionName = testName + "_PR";
+    vm2.invoke(() -> validateRegionSize(regionName, expectedRegionSize));
+    if (resumeSender) {
+      vm4.invoke(() -> resumeSender("ln"));
     }
+    vm4.invoke(() -> createPartitionedRegion(regionName, "ln", 1, 10, isOffHeap()));
+    vm4.invoke(() -> doPutsFrom(regionName, 10, 20));
+    validateRegionSizes(regionName, 10, vm4, vm2);
   }
-  
+
   public void testParallelGatewaySenders_SingleNode_UserPR_localDestroy_RecreateRegion() throws Exception {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-    Integer tkPort = (Integer)vm2.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 3, lnPort });
-    Integer pnPort = (Integer)vm3.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 4, lnPort });
-    
-    vm4.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm5.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
-    vm6.invoke(WANTestBase.class, "createReceiver", new Object[] { pnPort });
+    Integer[] locatorPorts = createLNAndNYLocators();
+    Integer lnPort = locatorPorts[0];
+    Integer nyPort = locatorPorts[1];
+    Integer tkPort = (Integer)vm2.invoke(() -> createFirstRemoteLocator(3, lnPort));
+    Integer pnPort = (Integer)vm3.invoke(() -> createFirstRemoteLocator(4, lnPort));
+
+    vm4.invoke(() -> createReceiver(nyPort));
+    vm5.invoke(() -> createReceiver(tkPort));
+    vm6.invoke(() -> createReceiver(pnPort));
 
     try {
-      vm7.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
-          new Object[] { lnPort });
+      vm7.invoke(() -> createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME(lnPort));
 
       getLogWriter().info("Created cache on local site");
 
-      vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
-          "ln1", 2, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+      vm7.invoke(() -> createConcurrentSender("ln1", 2, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY));
+      vm7.invoke(() -> createConcurrentSender("ln2", 3, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY));
+      vm7.invoke(() -> createConcurrentSender("ln3", 4, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY));
 
-      vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
-          "ln2", 3, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+      vm7.invoke(() -> startSender("ln1"));
+      vm7.invoke(() -> startSender("ln2"));
+      vm7.invoke(() -> startSender("ln3"));
 
-      vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
-          "ln3", 4, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+      String regionName = testName + "_PR";
+      vm7.invoke(() -> createPartitionedRegion(regionName, "ln1,ln2,ln3", 1, 10, isOffHeap()));
 
-      vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
-      vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln2" });
-      vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln3" });
+      getLogWriter().info("Created PRs on local site");
 
-      vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", "ln1,ln2,ln3", 1, 10, isOffHeap() });
+      vm4.invoke(() -> createPartitionedRegion(regionName, null, 1, 10, isOffHeap()));
+      vm5.invoke(() -> createPartitionedRegion(regionName, null, 1, 10, isOffHeap()));
+      vm6.invoke(() -> createPartitionedRegion(regionName, null, 1, 10, isOffHeap()));
 
-      getLogWriter().info("Created PRs on local site");
+      vm7.invoke(() -> doPuts(regionName, 10));
 
-      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", null, 1, 10, isOffHeap() });
-      vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", null, 1, 10, isOffHeap() });
-      vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", null, 1, 10, isOffHeap() });
+      vm7.invoke(() -> validateParallelSenderQueueAllBucketsDrained("ln1"));
+      vm7.invoke(() -> validateParallelSenderQueueAllBucketsDrained("ln2"));
+      vm7.invoke(() -> validateParallelSenderQueueAllBucketsDrained("ln3"));
 
-      vm7.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
-          10 });
-      pause(1000);
-      vm7.invoke(WANTestBase.class, "localDestroyRegion",
-          new Object[] { testName + "_PR" });
+      vm7.invoke(() -> localDestroyRegion(regionName));
 
-      vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", "ln1,ln2,ln3", 1, 10, isOffHeap() });
+      vm7.invoke(() -> createPartitionedRegion(regionName, "ln1,ln2,ln3", 1, 10, isOffHeap()));
 
-      vm7.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
-          testName + "_PR", 10, 20 });
+      vm7.invoke(() -> doPutsFrom(regionName, 10, 20));
 
-      vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 10 });
+      vm7.invoke(() -> validateRegionSize(regionName, 10));
 
-      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 20 });
-      vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 20 });
-      vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 20 });
+      validateRegionSizes(regionName, 20, vm4, vm5, vm6);
     } finally {
-      vm7.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+      vm7.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
     }
   }
   
   public void testParallelGatewaySender_MultipleNode_UserPR_localDestroy_Recreate() throws Exception {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer[] locatorPorts = createLNAndNYLocators();
+    Integer lnPort = locatorPorts[0];
+    Integer nyPort = locatorPorts[1];
 
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm2.invoke(() -> createReceiver(nyPort));
 
     try {
-      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
-          new Object[] { lnPort });
-      vm5.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
-          new Object[] { lnPort });
-
-      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", "ln", 1, 100, isOffHeap() });
-      vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", "ln", 1, 100, isOffHeap() });
-
-      vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
-          "ln", 2, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
-      vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
-          "ln", 2, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
-
-      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-      vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-
-      getLogWriter().info("Created PRs on local site");
+      createAndStartSender(vm4, lnPort, 5, true, false);
+      createAndStartSender(vm5, lnPort, 5, true, false);
 
-      vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", null, 1, 100, isOffHeap() });
+      String regionName = testName + "_PR";
+      vm2.invoke(() -> createPartitionedRegion(regionName, null, 1, 10, isOffHeap()));
 
       AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
-          new Object[] { testName + "_PR", 1000 });
+          new Object[] { regionName, 10 });
       pause(1000);
-      vm5.invoke(WANTestBase.class, "localDestroyRegion",
-          new Object[] { testName + "_PR" });
+      vm5.invoke(() -> localDestroyRegion(regionName));
 
       try {
         inv1.join();
@@ -698,79 +372,45 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
         fail("Interrupted the async invocation.");
       }
 
-      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 1000 });
-
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 1000 });
 
-      vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", "ln", 1, 100, isOffHeap() });
+      validateRegionSizes(regionName, 10, vm4, vm2);
 
-      vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
-          testName + "_PR", 1000, 2000 });
+      vm5.invoke(() -> createPartitionedRegion(regionName, "ln", 1, 10, isOffHeap()));
 
-      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 2000 });
+      vm4.invoke(() -> doPutsFrom(regionName, 10, 20));
 
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 2000 });
+      validateRegionSizes(regionName, 20, vm4, vm2);
     } finally {
-      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
-      vm5.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+      vm4.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
+      vm5.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
     }
   }
   
   public void testParallelGatewaySenders_MultiplNode_UserPR_localDestroy_Recreate() throws Exception {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
-    Integer tkPort = (Integer)vm2.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 3, lnPort });
-    
-    vm6.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
-    vm7.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
-    
+    Integer[] locatorPorts = createLNAndNYLocators();
+    Integer lnPort = locatorPorts[0];
+    Integer nyPort = locatorPorts[1];
+    Integer tkPort = (Integer)vm2.invoke(() -> createFirstRemoteLocator(3, lnPort));
+
+    vm6.invoke(() -> createReceiver(nyPort));
+    vm7.invoke(() -> createReceiver(tkPort));
+
     try {
-      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
-          new Object[] { lnPort });
-      vm5.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
-          new Object[] { lnPort });
-
-      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", "ln1,ln2", 1, 100, isOffHeap() });
-      vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", "ln1,ln2", 1, 100, isOffHeap() });
-
-      vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
-          "ln1", 2, true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
-      vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
-          "ln2", 3, true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
-      vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
-          "ln1", 2, true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
-      vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
-          "ln2", 3, true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY });
-
-      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
-      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln2" });
-      vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
-      vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln2" });
+      createAndStartTwoSenders(vm4, lnPort);
+      createAndStartTwoSenders(vm5, lnPort);
 
+      String regionName = testName + "_PR";
       vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", null, 1, 100, isOffHeap() });
+          regionName, null, 1, 100, isOffHeap() });
       vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", null, 1, 100, isOffHeap() });
+          regionName, null, 1, 100, isOffHeap() });
 
       AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
-          new Object[] { testName + "_PR", 1000 });
+          new Object[] { regionName, 10 });
+
       pause(1000);
       vm5.invoke(WANTestBase.class, "localDestroyRegion",
-          new Object[] { testName + "_PR" });
+          new Object[] { regionName });
 
       try {
         inv1.join();
@@ -779,79 +419,52 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
         fail("Interrupted the async invocation.");
       }
 
-      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 1000 });
-
-      vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 1000 });
-      vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 1000 });
+      validateRegionSizes(regionName, 10, vm4, vm6, vm7);
 
       vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
-          testName + "_PR", "ln1,ln2", 1, 100, isOffHeap() });
+          regionName, "ln1,ln2", 1, 100, isOffHeap() });
 
       vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
-          testName + "_PR", 1000, 2000 });
+          regionName, 10, 20 });
 
-      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 2000 });
-
-      vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 2000 });
-      vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          testName + "_PR", 2000 });
+      validateRegionSizes(regionName, 20, vm4, vm6, vm7);
     } finally {
-      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
-      vm5.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+      vm4.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
+      vm5.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
     }
   }
-  
-  public void testParallelGatewaySender_ColocatedPartitionedRegions_localDestroy() throws Exception {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
 
-    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+  private void createAndStartTwoSenders(VM vm, int port) {
+    // Note: This is a test-specific method used to create and start 2 senders.
+    vm.invoke(() -> createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME(port));
+    vm.invoke(() -> createPartitionedRegion(testName + "_PR", "ln1,ln2", 1, 100, isOffHeap()));
+    vm.invoke(() -> createConcurrentSender("ln1", 2, true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY));
+    vm.invoke(() -> createConcurrentSender("ln2", 3, true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY));
+    vm.invoke(() -> startSender("ln1"));
+    vm.invoke(() -> startSender("ln2"));
+  }
 
-    try {
-      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
-          new Object[] { lnPort });
-      vm5.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
-          new Object[] { lnPort });
-
-      vm4.invoke(WANTestBase.class,
-          "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
-              "ln", 1, 100, isOffHeap() });
-      vm5.invoke(WANTestBase.class,
-          "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
-              "ln", 1, 100, isOffHeap() });
+  public void testParallelGatewaySender_ColocatedPartitionedRegions_localDestroy() throws Exception {
+    Integer[] locatorPorts = createLNAndNYLocators();
+    Integer lnPort = locatorPorts[0];
+    Integer nyPort = locatorPorts[1];
 
-      vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
-          "ln", 2, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
-      vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
-          "ln", 2, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY });
+    vm2.invoke(() -> createReceiver(nyPort));
 
-      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-      vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    try {
+      createAndStartSenderWithCustomerOrderShipmentRegion(vm4, lnPort, 5, true);
+      createAndStartSenderWithCustomerOrderShipmentRegion(vm5, lnPort, 5, true);
 
       getLogWriter().info("Created PRs on local site");
 
-      vm2.invoke(WANTestBase.class,
-          "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
-              null, 1, 100, isOffHeap() });
+      vm2.invoke(() -> createCustomerOrderShipmentPartitionedRegion(null, null, 1, 100, isOffHeap()));
 
       AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class,
-          "putcolocatedPartitionedRegion", new Object[] { 2000 });
+          "putcolocatedPartitionedRegion", new Object[] { 10 });
       pause(1000);
 
       try {
-        vm5.invoke(WANTestBase.class, "localDestroyRegion",
-            new Object[] { customerRegionName });
+        vm5.invoke(() -> localDestroyRegion(customerRegionName));
       } catch (Exception ex) {
         assertTrue(ex.getCause() instanceof UnsupportedOperationException);
       }
@@ -862,51 +475,29 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
         fail("Unexpected exception", e);
       }
 
-      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          customerRegionName, 2000 });
-      vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          customerRegionName, 2000 });
-      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
-          customerRegionName, 2000 });
+      validateRegionSizes(customerRegionName, 10, vm4, vm5, vm2);
     } finally {
-      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
-      vm5.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+      vm4.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
+      vm5.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
     }
-    
   }
-  
+
+  private void validateRegionSizes(String regionName, int expectedRegionSize, VM... vms) {
+    for (VM vm : vms) {
+      vm.invoke(() -> validateRegionSize(regionName, expectedRegionSize));
+    }
+  }
+
   public void testParallelGatewaySender_ColocatedPartitionedRegions_destroy() throws Exception {
-    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
-        "createFirstLocatorWithDSId", new Object[] { 1 });
-    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
-        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer[] locatorPorts = createLNAndNYLocators();
+    Integer lnPort = locatorPorts[0];
+    Integer nyPort = locatorPorts[1];
 
     vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
 
     try {
-      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
-          new Object[] { lnPort });
-      vm5.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
-          new Object[] { lnPort });
-
-      vm4.invoke(WANTestBase.class,
-          "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
-              "ln", 1, 100, isOffHeap() });
-      vm5.invoke(WANTestBase.class,
-          "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
-              "ln", 1, 100, isOffHeap() });
-
-      vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
-          "ln", 2, true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY });
-      vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] {
-          "ln", 2, true, 100, 10, false, false, null, true, 6, OrderPolicy.KEY });
-
-      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
-      vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+      createAndStartSenderWithCustomerOrderShipmentRegion(vm4, lnPort, 6, true);
+      createAndStartSenderWithCustomerOrderShipmentRegion(vm5, lnPort, 6, true);
 
       getLogWriter().info("Created PRs on local site");
 
@@ -927,13 +518,29 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes
       }
       fail("Excpeted UnsupportedOperationException");
     } finally {
-      vm4.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
-      vm5.invoke(ConcurrentParallelGatewaySenderOperation_2_DUnitTest.class,
-          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+      vm4.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
+      vm5.invoke(() -> clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME());
     }
   }
-  
+
+  private void createAndStartSenderWithCustomerOrderShipmentRegion(VM vm, int port, int concurrencyLevel, boolean manualStart) {
+    vm.invoke(() -> createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME(port));
+    vm.invoke(() -> createCustomerOrderShipmentPartitionedRegion(null, "ln", 1, 100, isOffHeap()));
+    vm.invoke(() -> createConcurrentSender("ln", 2, true, 100, 10, false, false, null, manualStart, concurrencyLevel, OrderPolicy.KEY));
+    vm.invoke(() -> startSender("ln"));
+  }
+
+  private void createAndStartSender(VM vm, int port, int concurrencyLevel, boolean manualStart, boolean pause) {
+    vm.invoke(() -> createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME(port));
+    vm.invoke(() -> createConcurrentSender("ln", 2, true, 100, 10, false, false, null, manualStart, concurrencyLevel, OrderPolicy.KEY));
+    vm.invoke(() -> startSender("ln"));
+    if (pause) {
+      vm.invoke(() -> pauseSender("ln"));
+    }
+    vm.invoke(() -> createPartitionedRegion(testName + "_PR", "ln", 1, 10, isOffHeap()));
+    getLogWriter().info("Created PRs on local site");
+  }
+
   public static void createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME(
       Integer locPort) {
     createCache(false, locPort);


[26/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
new file mode 100644
index 0000000..91df070
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
@@ -0,0 +1,390 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.security;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+import java.util.Random;
+
+import security.AuthzCredentialGenerator;
+import security.CredentialGenerator;
+import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode;
+import com.gemstone.gemfire.internal.AvailablePort;
+
+import dunit.Host;
+
+/**
+ * Tests for authorization from client to server. This tests for authorization
+ * with post-process callbacks in case return values of operations and for
+ * notifications along-with failover.
+ * 
+ * @author sumedh
+ * @since 5.5
+ */
+public class ClientPostAuthorizationDUnitTest extends
+    ClientAuthorizationTestBase {
+
+
+  /** constructor */
+  public ClientPostAuthorizationDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+
+    super.setUp();
+    final Host host = Host.getHost(0);
+    server1 = host.getVM(0);
+    server2 = host.getVM(1);
+    client1 = host.getVM(2);
+    client2 = host.getVM(3);
+
+    server1.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
+        new Object[] { serverExpectedExceptions });
+    server2.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
+        new Object[] { serverExpectedExceptions });
+    client2.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
+        new Object[] { clientExpectedExceptions });
+    SecurityTestUtil.registerExpectedExceptions(clientExpectedExceptions);
+  }
+
+  // Region: Tests
+
+  public void testAllPostOps() {
+
+    OperationWithAction[] allOps = {
+        // Test CREATE and verify with a GET
+        new OperationWithAction(OperationCode.PUT),
+        new OperationWithAction(OperationCode.GET, 2, OpFlags.CHECK_NOKEY, 4),
+        new OperationWithAction(OperationCode.GET, 3, OpFlags.CHECK_NOKEY
+            | OpFlags.CHECK_NOTAUTHZ, 4),
+
+        // OPBLOCK_END indicates end of an operation block that needs to
+        // be executed on each server when doing failover
+        OperationWithAction.OPBLOCK_END,
+
+        // Test UPDATE and verify with a GET
+        new OperationWithAction(OperationCode.PUT, 1, OpFlags.USE_OLDCONN
+            | OpFlags.USE_NEWVAL, 4),
+        new OperationWithAction(OperationCode.GET, 2, OpFlags.USE_OLDCONN
+            | OpFlags.USE_NEWVAL, 4),
+        new OperationWithAction(OperationCode.GET, 3,
+            OpFlags.USE_OLDCONN | OpFlags.CHECK_NOKEY | OpFlags.USE_NEWVAL
+                | OpFlags.CHECK_NOTAUTHZ, 4),
+
+        OperationWithAction.OPBLOCK_END,
+
+        // Test UPDATE and verify with a KEY_SET
+        new OperationWithAction(OperationCode.PUT, 1, OpFlags.USE_OLDCONN, 6),
+        new OperationWithAction(OperationCode.KEY_SET, 2, OpFlags.NONE, 6),
+        new OperationWithAction(OperationCode.KEY_SET, 3,
+            OpFlags.CHECK_NOTAUTHZ, 6),
+
+        OperationWithAction.OPBLOCK_END,
+
+        // Test UPDATE and verify with a QUERY
+        new OperationWithAction(OperationCode.PUT, 1, OpFlags.USE_OLDCONN
+            | OpFlags.USE_NEWVAL, 7),
+        new OperationWithAction(OperationCode.QUERY, 2, OpFlags.USE_NEWVAL, 7),
+        new OperationWithAction(OperationCode.QUERY, 3, OpFlags.USE_NEWVAL
+            | OpFlags.CHECK_NOTAUTHZ, 7),
+
+        OperationWithAction.OPBLOCK_END,
+
+        // Test UPDATE and verify with a EXECUTE_CQ initial results
+        new OperationWithAction(OperationCode.PUT, 1, OpFlags.USE_OLDCONN, 8),
+        new OperationWithAction(OperationCode.EXECUTE_CQ, 2, OpFlags.NONE, 8),
+        new OperationWithAction(OperationCode.EXECUTE_CQ, 3,
+            OpFlags.CHECK_NOTAUTHZ, 8),
+
+        OperationWithAction.OPBLOCK_END };
+
+    Iterator iter = getDummyGeneratorCombos().iterator();
+    while (iter.hasNext()) {
+      AuthzCredentialGenerator gen = (AuthzCredentialGenerator)iter.next();
+      CredentialGenerator cGen = gen.getCredentialGenerator();
+      Properties extraAuthProps = cGen.getSystemProperties();
+      Properties javaProps = cGen.getJavaProperties();
+      Properties extraAuthzProps = gen.getSystemProperties();
+      String authenticator = cGen.getAuthenticator();
+      String authInit = cGen.getAuthInit();
+      String accessor = gen.getAuthorizationCallback();
+      TestAuthzCredentialGenerator tgen = new TestAuthzCredentialGenerator(gen);
+
+      getLogWriter().info("testAllPostOps: Using authinit: " + authInit);
+      getLogWriter().info(
+          "testAllPostOps: Using authenticator: " + authenticator);
+      getLogWriter().info("testAllPostOps: Using accessor: " + accessor);
+
+      // Start servers with all required properties
+      Properties serverProps = buildProperties(authenticator, accessor, true,
+          extraAuthProps, extraAuthzProps);
+      // Get ports for the servers
+      Integer port1 = new Integer(AvailablePort
+          .getRandomAvailablePort(AvailablePort.SOCKET));
+      Integer port2 = new Integer(AvailablePort
+          .getRandomAvailablePort(AvailablePort.SOCKET));
+
+      // Close down any running servers
+      server1.invoke(SecurityTestUtil.class, "closeCache");
+      server2.invoke(SecurityTestUtil.class, "closeCache");
+
+      // Perform all the ops on the clients
+      List opBlock = new ArrayList();
+      Random rnd = new Random();
+      for (int opNum = 0; opNum < allOps.length; ++opNum) {
+        // Start client with valid credentials as specified in
+        // OperationWithAction
+        OperationWithAction currentOp = allOps[opNum];
+        if (currentOp.equals(OperationWithAction.OPBLOCK_END)
+            || currentOp.equals(OperationWithAction.OPBLOCK_NO_FAILOVER)) {
+          // End of current operation block; execute all the operations
+          // on the servers with failover
+          if (opBlock.size() > 0) {
+            // Start the first server and execute the operation block
+            server1.invoke(ClientAuthorizationTestBase.class,
+                "createCacheServer", new Object[] {
+                    SecurityTestUtil.getLocatorPort(), port1, serverProps,
+                    javaProps });
+            server2.invoke(SecurityTestUtil.class, "closeCache");
+            executeOpBlock(opBlock, port1, port2, authInit, extraAuthProps,
+                extraAuthzProps, tgen, rnd);
+            if (!currentOp.equals(OperationWithAction.OPBLOCK_NO_FAILOVER)) {
+              // Failover to the second server and run the block again
+              server2.invoke(ClientAuthorizationTestBase.class,
+                  "createCacheServer", new Object[] {
+                      SecurityTestUtil.getLocatorPort(), port2, serverProps,
+                      javaProps });
+              server1.invoke(SecurityTestUtil.class, "closeCache");
+              executeOpBlock(opBlock, port1, port2, authInit, extraAuthProps,
+                  extraAuthzProps, tgen, rnd);
+            }
+            opBlock.clear();
+          }
+        }
+        else {
+          currentOp.setOpNum(opNum);
+          opBlock.add(currentOp);
+        }
+      }
+    }
+  }
+
+  public void testAllOpsNotifications() {
+
+    OperationWithAction[] allOps = {
+        // Test CREATE and verify with a GET
+        new OperationWithAction(OperationCode.REGISTER_INTEREST,
+            OperationCode.GET, 2, OpFlags.USE_REGEX
+                | OpFlags.REGISTER_POLICY_NONE, 8),
+        new OperationWithAction(OperationCode.REGISTER_INTEREST,
+            OperationCode.GET, 3, OpFlags.USE_REGEX
+                | OpFlags.REGISTER_POLICY_NONE | OpFlags.USE_NOTAUTHZ, 8),
+        new OperationWithAction(OperationCode.PUT),
+        new OperationWithAction(OperationCode.GET, 2, OpFlags.USE_OLDCONN
+            | OpFlags.LOCAL_OP, 4),
+        new OperationWithAction(OperationCode.GET, 3, OpFlags.USE_OLDCONN
+            | OpFlags.LOCAL_OP | OpFlags.CHECK_FAIL, 4),
+
+        // OPBLOCK_END indicates end of an operation block that needs to
+        // be executed on each server when doing failover
+        OperationWithAction.OPBLOCK_END,
+
+        // Test UPDATE and verify with a GET
+        new OperationWithAction(OperationCode.REGISTER_INTEREST,
+            OperationCode.GET, 2, OpFlags.USE_REGEX
+                | OpFlags.REGISTER_POLICY_NONE, 8),
+        new OperationWithAction(OperationCode.REGISTER_INTEREST,
+            OperationCode.GET, 3, OpFlags.USE_REGEX
+                | OpFlags.REGISTER_POLICY_NONE | OpFlags.USE_NOTAUTHZ, 8),
+        new OperationWithAction(OperationCode.PUT, 1, OpFlags.USE_OLDCONN
+            | OpFlags.USE_NEWVAL, 4),
+        new OperationWithAction(OperationCode.GET, 2, OpFlags.USE_OLDCONN
+            | OpFlags.LOCAL_OP | OpFlags.USE_NEWVAL, 4),
+        new OperationWithAction(OperationCode.GET, 3, OpFlags.USE_OLDCONN
+            | OpFlags.LOCAL_OP | OpFlags.USE_NEWVAL | OpFlags.CHECK_FAIL, 4),
+
+        OperationWithAction.OPBLOCK_END,
+
+        // Test DESTROY and verify with GET that keys should not exist
+        new OperationWithAction(OperationCode.PUT, 3, OpFlags.NONE, 8),
+        new OperationWithAction(OperationCode.REGISTER_INTEREST,
+            OperationCode.GET, 2, OpFlags.USE_REGEX, 8),
+        new OperationWithAction(OperationCode.REGISTER_INTEREST, 3,
+            OpFlags.USE_REGEX | OpFlags.USE_OLDCONN | OpFlags.REGISTER_POLICY_NONE, 8),
+        // registerInterest now clears the keys, so a dummy put to add
+        // those keys back for the case when updates should not come
+        new OperationWithAction(OperationCode.PUT, 3, OpFlags.USE_OLDCONN, 8),
+        new OperationWithAction(OperationCode.DESTROY, 1, OpFlags.USE_OLDCONN,
+            4),
+        new OperationWithAction(OperationCode.GET, 2, OpFlags.USE_OLDCONN
+            | OpFlags.LOCAL_OP | OpFlags.CHECK_FAIL, 4),
+        new OperationWithAction(OperationCode.GET, 3, OpFlags.USE_OLDCONN
+            | OpFlags.LOCAL_OP, 4),
+        // Repopulate the region
+        new OperationWithAction(OperationCode.PUT, 1, OpFlags.USE_OLDCONN, 8),
+
+        OperationWithAction.OPBLOCK_END,
+
+        // Do REGION_CLEAR and check with GET
+        new OperationWithAction(OperationCode.PUT, 3, OpFlags.NONE, 8),
+        new OperationWithAction(OperationCode.REGISTER_INTEREST,
+            OperationCode.GET, 2, OpFlags.USE_ALL_KEYS, 1),
+        new OperationWithAction(OperationCode.REGISTER_INTEREST, 3,
+            OpFlags.USE_ALL_KEYS | OpFlags.USE_OLDCONN | OpFlags.REGISTER_POLICY_NONE, 1),
+        // registerInterest now clears the keys, so a dummy put to add
+        // those keys back for the case when updates should not come
+        new OperationWithAction(OperationCode.PUT, 3, OpFlags.USE_OLDCONN, 8),
+        new OperationWithAction(OperationCode.REGION_CLEAR, 1,
+            OpFlags.USE_OLDCONN, 1),
+        new OperationWithAction(OperationCode.GET, 2, OpFlags.USE_OLDCONN
+            | OpFlags.LOCAL_OP | OpFlags.CHECK_FAIL, 8),
+        new OperationWithAction(OperationCode.GET, 3, OpFlags.USE_OLDCONN
+            | OpFlags.LOCAL_OP, 8),
+        // Repopulate the region
+        new OperationWithAction(OperationCode.PUT, 1, OpFlags.USE_OLDCONN, 8),
+
+        OperationWithAction.OPBLOCK_END,
+
+        // Do REGION_CREATE and check with CREATE/GET
+        new OperationWithAction(OperationCode.REGISTER_INTEREST,
+            OperationCode.GET, 2, OpFlags.USE_ALL_KEYS | OpFlags.ENABLE_DRF, 1),
+        new OperationWithAction(OperationCode.REGISTER_INTEREST,
+            OperationCode.GET, 3, OpFlags.USE_ALL_KEYS | OpFlags.ENABLE_DRF
+                | OpFlags.USE_NOTAUTHZ | OpFlags.REGISTER_POLICY_NONE, 1),
+        new OperationWithAction(OperationCode.REGION_CREATE, 1,
+            OpFlags.ENABLE_DRF, 1),
+        new OperationWithAction(OperationCode.PUT, 1, OpFlags.USE_OLDCONN
+            | OpFlags.USE_SUBREGION, 4),
+        new OperationWithAction(OperationCode.GET, 2, OpFlags.USE_OLDCONN
+            | OpFlags.LOCAL_OP | OpFlags.USE_SUBREGION
+            | OpFlags.NO_CREATE_SUBREGION, 4),
+        new OperationWithAction(OperationCode.GET, 3, OpFlags.USE_OLDCONN
+            | OpFlags.LOCAL_OP | OpFlags.USE_SUBREGION
+            | OpFlags.NO_CREATE_SUBREGION | OpFlags.CHECK_NOREGION, 4),
+
+        // Do REGION_DESTROY of the sub-region and check with GET
+        new OperationWithAction(OperationCode.REGION_DESTROY, 1,
+            OpFlags.USE_OLDCONN | OpFlags.USE_SUBREGION, 1),
+        new OperationWithAction(OperationCode.GET, 2, OpFlags.USE_OLDCONN
+            | OpFlags.LOCAL_OP | OpFlags.USE_SUBREGION
+            | OpFlags.NO_CREATE_SUBREGION | OpFlags.CHECK_NOREGION, 4),
+        new OperationWithAction(OperationCode.GET, 2, OpFlags.USE_OLDCONN
+            | OpFlags.USE_SUBREGION | OpFlags.CHECK_NOKEY
+            | OpFlags.CHECK_EXCEPTION, 4),
+        new OperationWithAction(OperationCode.GET, 3, OpFlags.USE_OLDCONN
+            | OpFlags.LOCAL_OP | OpFlags.USE_SUBREGION
+            | OpFlags.NO_CREATE_SUBREGION | OpFlags.CHECK_NOREGION, 4),
+        new OperationWithAction(OperationCode.GET, 3, OpFlags.USE_OLDCONN
+            | OpFlags.USE_SUBREGION | OpFlags.CHECK_NOKEY
+            | OpFlags.CHECK_EXCEPTION, 4),
+
+        OperationWithAction.OPBLOCK_END,
+
+        // Do REGION_DESTROY of the region and check with GET
+        new OperationWithAction(OperationCode.PUT, 3, OpFlags.NONE, 8),
+        new OperationWithAction(OperationCode.REGISTER_INTEREST,
+            OperationCode.GET, 2, OpFlags.USE_ALL_KEYS, 1),
+        new OperationWithAction(OperationCode.REGISTER_INTEREST, 3,
+            OpFlags.USE_ALL_KEYS | OpFlags.USE_OLDCONN | OpFlags.REGISTER_POLICY_NONE, 1),
+        // registerInterest now clears the keys, so a dummy put to add
+        // those keys back for the case when updates should not come
+        new OperationWithAction(OperationCode.PUT, 3, OpFlags.USE_OLDCONN, 8),
+        new OperationWithAction(OperationCode.REGION_DESTROY, 1, OpFlags.NONE,
+            1),
+        new OperationWithAction(OperationCode.GET, 2, OpFlags.USE_OLDCONN
+            | OpFlags.LOCAL_OP | OpFlags.CHECK_NOREGION, 4),
+        new OperationWithAction(OperationCode.GET, 3, OpFlags.USE_OLDCONN
+            | OpFlags.LOCAL_OP, 4),
+
+        OperationWithAction.OPBLOCK_NO_FAILOVER };
+
+      AuthzCredentialGenerator gen = getXmlAuthzGenerator();
+      getLogWriter().info("Executing opblocks with credential generator " + gen);
+      CredentialGenerator cGen = gen.getCredentialGenerator();
+      Properties extraAuthProps = cGen.getSystemProperties();
+      Properties javaProps = cGen.getJavaProperties();
+      Properties extraAuthzProps = gen.getSystemProperties();
+      String authenticator = cGen.getAuthenticator();
+      String authInit = cGen.getAuthInit();
+      String accessor = gen.getAuthorizationCallback();
+      TestAuthzCredentialGenerator tgen = new TestAuthzCredentialGenerator(gen);
+
+      getLogWriter().info(
+          "testAllOpsNotifications: Using authinit: " + authInit);
+      getLogWriter().info(
+          "testAllOpsNotifications: Using authenticator: " + authenticator);
+      getLogWriter().info(
+          "testAllOpsNotifications: Using accessor: " + accessor);
+
+      // Start servers with all required properties
+      Properties serverProps = buildProperties(authenticator, accessor, true,
+          extraAuthProps, extraAuthzProps);
+      // Get ports for the servers
+      Integer port1 = new Integer(AvailablePort
+          .getRandomAvailablePort(AvailablePort.SOCKET));
+      Integer port2 = new Integer(AvailablePort
+          .getRandomAvailablePort(AvailablePort.SOCKET));
+
+      // Perform all the ops on the clients
+      List opBlock = new ArrayList();
+      Random rnd = new Random();
+      for (int opNum = 0; opNum < allOps.length; ++opNum) {
+        // Start client with valid credentials as specified in
+        // OperationWithAction
+        OperationWithAction currentOp = allOps[opNum];
+        if (currentOp.equals(OperationWithAction.OPBLOCK_END)
+            || currentOp.equals(OperationWithAction.OPBLOCK_NO_FAILOVER)) {
+          // End of current operation block; execute all the operations
+          // on the servers with failover
+          if (opBlock.size() > 0) {
+            // Start the first server and execute the operation block
+            server1.invoke(ClientAuthorizationTestBase.class,
+                "createCacheServer", new Object[] {
+                    SecurityTestUtil.getLocatorPort(), port1, serverProps,
+                    javaProps });
+            server2.invoke(SecurityTestUtil.class, "closeCache");
+            executeOpBlock(opBlock, port1, port2, authInit, extraAuthProps,
+                extraAuthzProps, tgen, rnd);
+            if (!currentOp.equals(OperationWithAction.OPBLOCK_NO_FAILOVER)) {
+              // Failover to the second server and run the block again
+              server2.invoke(ClientAuthorizationTestBase.class,
+                  "createCacheServer", new Object[] {
+                      SecurityTestUtil.getLocatorPort(), port2, serverProps,
+                      javaProps });
+              server1.invoke(SecurityTestUtil.class, "closeCache");
+              executeOpBlock(opBlock, port1, port2, authInit, extraAuthProps,
+                  extraAuthzProps, tgen, rnd);
+            }
+            opBlock.clear();
+          }
+        }
+        else {
+          currentOp.setOpNum(opNum);
+          opBlock.add(currentOp);
+        }
+      }
+  }
+
+  // End Region: Tests
+
+  public void tearDown2() throws Exception {
+
+    super.tearDown2();
+    // close the clients first
+    client1.invoke(SecurityTestUtil.class, "closeCache");
+    client2.invoke(SecurityTestUtil.class, "closeCache");
+    SecurityTestUtil.closeCache();
+    // then close the servers
+    server1.invoke(SecurityTestUtil.class, "closeCache");
+    server2.invoke(SecurityTestUtil.class, "closeCache");
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java
new file mode 100644
index 0000000..9c5d18a
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java
@@ -0,0 +1,382 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.security;
+
+import hydra.Log;
+
+import java.io.IOException;
+import java.util.Properties;
+
+import javax.net.ssl.SSLException;
+import javax.net.ssl.SSLHandshakeException;
+
+import security.CredentialGenerator;
+
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.client.Pool;
+import com.gemstone.gemfire.cache.execute.FunctionService;
+import com.gemstone.gemfire.cache.query.CqAttributesFactory;
+import com.gemstone.gemfire.cache.query.CqException;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.Query;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.cache.PoolManagerImpl;
+
+import dunit.Host;
+import dunit.VM;
+import security.DummyCredentialGenerator;
+
+public class MultiuserAPIDUnitTest extends ClientAuthorizationTestBase {
+
+  /** constructor */
+  public MultiuserAPIDUnitTest(String name) {
+    super(name);
+  }
+
+  private VM server1 = null;
+
+  private VM server2 = null;
+
+  private VM client1 = null;
+
+  private VM client2 = null;
+
+  private static final String[] serverExpectedExceptions = {
+      AuthenticationRequiredException.class.getName(),
+      AuthenticationFailedException.class.getName(),
+      GemFireSecurityException.class.getName(),
+      ClassNotFoundException.class.getName(), IOException.class.getName(),
+      SSLException.class.getName(), SSLHandshakeException.class.getName()};
+
+  private static final String[] clientExpectedExceptions = {
+      AuthenticationRequiredException.class.getName(),
+      AuthenticationFailedException.class.getName(),
+      SSLHandshakeException.class.getName()};
+
+  public void setUp() throws Exception {
+    super.setUp();
+    final Host host = Host.getHost(0);
+    server1 = host.getVM(0);
+    server2 = host.getVM(1);
+    client1 = host.getVM(2);
+    client2 = host.getVM(3);
+
+    server1.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
+        new Object[] {serverExpectedExceptions});
+    server2.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
+        new Object[] {serverExpectedExceptions});
+    client1.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
+        new Object[] {clientExpectedExceptions});
+    client2.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
+        new Object[] {clientExpectedExceptions});
+  }
+
+  public static Integer createCacheServer(Object dsPort, Object locatorString,
+      Object authenticator, Object extraProps, Object javaProps) {
+
+    Properties authProps;
+    if (extraProps == null) {
+      authProps = new Properties();
+    } else {
+      authProps = (Properties)extraProps;
+    }
+    if (authenticator != null) {
+      authProps.setProperty(
+          DistributionConfig.SECURITY_CLIENT_AUTHENTICATOR_NAME, authenticator
+              .toString());
+    }
+    return SecurityTestUtil.createCacheServer(authProps, javaProps,
+        (Integer)dsPort, (String)locatorString, null, new Integer(
+            SecurityTestUtil.NO_EXCEPTION));
+  }
+
+  private static void createCacheClient(Object authInit, Properties authProps,
+      Properties javaProps, Integer[] ports, Object numConnections,
+      Boolean multiUserMode, Integer expectedResult) {
+
+    String authInitStr = (authInit == null ? null : authInit.toString());
+    SecurityTestUtil.createCacheClient(authInitStr, authProps, javaProps,
+        ports, numConnections, multiUserMode.toString(), expectedResult);
+  }
+
+  public static void createCacheClient(Object authInit, Object authProps,
+      Object javaProps, Integer port1, Integer port2, Object numConnections,
+      Boolean multiUserMode, Integer expectedResult) {
+
+    createCacheClient(authInit, (Properties)authProps, (Properties)javaProps,
+        new Integer[] {port1, port2}, numConnections, multiUserMode,
+        expectedResult);
+  }
+
+  public static void registerAllInterest() {
+    Region region = SecurityTestUtil.getCache().getRegion(
+        SecurityTestUtil.regionName);
+    assertNotNull(region);
+    region.registerInterestRegex(".*");
+  }
+
+  private void setUpVMs(CredentialGenerator gen, Boolean multiUser) {
+    Properties extraProps = gen.getSystemProperties();
+    Properties javaProps = gen.getJavaProperties();
+    String authenticator = gen.getAuthenticator();
+    String authInit = gen.getAuthInit();
+
+    getLogWriter().info(
+        "testValidCredentials: Using scheme: " + gen.classCode());
+    getLogWriter().info(
+        "testValidCredentials: Using authenticator: " + authenticator);
+    getLogWriter().info("testValidCredentials: Using authinit: " + authInit);
+
+    // Start the servers
+    Integer locPort1 = SecurityTestUtil.getLocatorPort();
+    Integer locPort2 = SecurityTestUtil.getLocatorPort();
+    String locString = SecurityTestUtil.getLocatorString();
+    Integer port1 = (Integer)server1.invoke(MultiuserAPIDUnitTest.class,
+        "createCacheServer", new Object[] {locPort1, locString, authenticator,
+            extraProps, javaProps});
+    Integer port2 = (Integer)server2.invoke(MultiuserAPIDUnitTest.class,
+        "createCacheServer", new Object[] {locPort2, locString, authenticator,
+            extraProps, javaProps});
+
+    // Start the clients with valid credentials
+    Properties credentials1 = gen.getValidCredentials(1);
+    Properties javaProps1 = gen.getJavaProperties();
+    getLogWriter().info(
+        "testValidCredentials: For first client credentials: " + credentials1
+            + " : " + javaProps1);
+    Properties credentials2 = gen.getValidCredentials(2);
+    Properties javaProps2 = gen.getJavaProperties();
+    getLogWriter().info(
+        "testValidCredentials: For second client credentials: " + credentials2
+            + " : " + javaProps2);
+    client1.invoke(MultiuserAPIDUnitTest.class, "createCacheClient",
+        new Object[] {authInit, credentials1, javaProps1, port1, port2, null,
+            multiUser, new Integer(SecurityTestUtil.NO_EXCEPTION)});
+  }
+
+  public void testSingleUserUnsupportedAPIs() {
+      // Start servers
+      // Start clients with multiuser-authentication set to false
+      setUpVMs(new DummyCredentialGenerator(), Boolean.FALSE);
+      client1.invoke(MultiuserAPIDUnitTest.class, "verifyDisallowedOps",
+          new Object[] {Boolean.FALSE});
+  }
+
+  public void testMultiUserUnsupportedAPIs() {
+      // Start servers.
+      // Start clients with multiuser-authentication set to true.
+      setUpVMs(new DummyCredentialGenerator(), Boolean.TRUE);
+      client1.invoke(MultiuserAPIDUnitTest.class, "verifyDisallowedOps",
+          new Object[] {Boolean.TRUE});
+  }
+
+  public static void verifyDisallowedOps(Boolean multiuserMode) {
+    String op = "unknown";
+    boolean success = false;
+    if (!multiuserMode) {
+      success = false;
+      try {
+        // Attempt cache.createAuthenticatedCacheView() and expect an exception, fail otherwise
+        op = "Pool.createSecureUserCache()";
+        GemFireCacheImpl.getInstance().createAuthenticatedView(new Properties(), "testPool");
+      } catch (IllegalStateException uoe) {
+        Log.getLogWriter().info(op + ": Got expected exception: " + uoe);
+        success = true;
+      } catch (Exception e) {
+        fail("Got unexpected exception while doing " + op, e);
+      }
+      if (!success) {
+        fail("Did not get exception while doing " + op);
+      }
+    } else { // multiuser mode
+      Region realRegion = GemFireCacheImpl.getInstance().getRegion(
+          SecurityTestUtil.regionName);
+      Region proxyRegion = SecurityTestUtil.proxyCaches[0]
+          .getRegion(SecurityTestUtil.regionName);
+      Pool pool = PoolManagerImpl.getPMI().find("testPool");
+      for (int i = 0; i <= 27; i++) {
+        success = false;
+        try {
+          switch (i) {
+            // Attempt (real) Region.create/put/get/containsKeyOnServer/destroy/
+            // destroyRegion/clear/remove/registerInterest/unregisterInterest()
+            // and expect an exception, fail otherwise.
+            case 0:
+              op = "Region.create()";
+              realRegion.create("key", "value");
+              break;
+            case 1:
+              op = "Region.put()";
+              realRegion.put("key", "value");
+              break;
+            case 2:
+              op = "Region.get()";
+              realRegion.get("key");
+              break;
+            case 3:
+              op = "Region.containsKeyOnServer()";
+              realRegion.containsKeyOnServer("key");
+              break;
+            case 4:
+              op = "Region.remove()";
+              realRegion.remove("key");
+              break;
+            case 5:
+              op = "Region.destroy()";
+              realRegion.destroy("key");
+              break;
+            case 6:
+              op = "Region.destroyRegion()";
+              realRegion.destroyRegion();
+              break;
+            case 7:
+              op = "Region.registerInterest()";
+              realRegion.registerInterest("key");
+              break;
+            // case 8:
+            // op = "Region.unregisterInterest()";
+            // realRegion.unregisterInterest("key");
+            // break;
+            case 8:
+              op = "Region.clear()";
+              realRegion.clear();
+              break;
+            // Attempt ProxyRegion.createSubregion/forceRolling/
+            // getAttributesMutator/registerInterest/loadSnapShot/saveSnapshot/
+            // setUserAttribute/unregisterInterest/writeToDisk
+            // and expect an exception, fail otherwise.
+            case 9:
+              op = "ProxyRegion.createSubregion()";
+              proxyRegion.createSubregion("subregion",
+                  null);
+              break;
+            case 10:
+              op = "ProxyRegion.forceRolling()";
+              proxyRegion.forceRolling();
+              break;
+            case 11:
+              op = "ProxyRegion.getAttributesMutator()";
+              proxyRegion.getAttributesMutator();
+              break;
+            case 12:
+              op = "ProxyRegion.registerInterest()";
+              proxyRegion.registerInterest("key");
+              break;
+            case 13:
+              op = "ProxyRegion.loadSnapshot()";
+              proxyRegion.loadSnapshot(null);
+              break;
+            case 14:
+              op = "ProxyRegion.saveSnapshot()";
+              proxyRegion.saveSnapshot(null);
+              break;
+            case 15:
+              op = "ProxyRegion.setUserAttribute()";
+              proxyRegion.setUserAttribute(null);
+              break;
+            case 16:
+              op = "ProxyRegion.unregisterInterestRegex()";
+              proxyRegion.unregisterInterestRegex("*");
+              break;
+            // Attempt FunctionService.onRegion/onServer/s(pool) and expect an
+            // exception, fail otherwise.
+            case 17:
+              op = "FunctionService.onRegion()";
+              FunctionService.onRegion(realRegion);
+              break;
+            case 18:
+              op = "FunctionService.onServer(pool)";
+              FunctionService.onServer(pool);
+              break;
+            case 19:
+              op = "FunctionService.onServers(pool)";
+              FunctionService.onServers(pool);
+              break;
+            // Attempt
+            // QueryService.newQuery().execute()/newCq().execute/executeWithInitialResults()
+            case 20:
+              op = "QueryService.newQuery.execute()";
+              Query query = pool.getQueryService().newQuery(
+                  "SELECT * FROM /" + SecurityTestUtil.regionName);
+              query.execute();
+              break;
+            case 21:
+              op = "QueryService.newCq.execute()";
+              CqQuery cqQuery = pool.getQueryService().newCq(
+                  "SELECT * FROM /" + SecurityTestUtil.regionName,
+                  new CqAttributesFactory().create());
+              try {
+                cqQuery.execute();
+              } catch (CqException ce) {
+                throw (Exception)ce.getCause();
+              }
+              break;
+            case 22:
+              op = "QueryService.newCq.executeWithInitialResults()";
+              cqQuery = pool.getQueryService().newCq(
+                  "SELECT * FROM /" + SecurityTestUtil.regionName,
+                  new CqAttributesFactory().create());
+              try {
+                cqQuery.executeWithInitialResults();
+              } catch (CqException ce) {
+                throw (Exception)ce.getCause();
+              }
+              break;
+            // Attempt ProxyQueryService.getIndex/createIndex/removeIndex() and
+            // expect an exception, fail otherwise.
+            case 23:
+              op = "ProxyQueryService().getIndexes()";
+              SecurityTestUtil.proxyCaches[0].getQueryService()
+                  .getIndexes(null);
+              break;
+            case 24:
+              op = "ProxyQueryService().createIndex()";
+              SecurityTestUtil.proxyCaches[0].getQueryService().createIndex(
+                  null, null, null );
+              break;
+            case 25:
+              op = "ProxyQueryService().removeIndexes()";
+              SecurityTestUtil.proxyCaches[0].getQueryService().removeIndexes();
+              break;
+            case 26:
+              op = "ProxyRegion.localDestroy()";
+              proxyRegion.localDestroy("key");
+              break;
+            case 27:
+              op = "ProxyRegion.localInvalidate()";
+              proxyRegion.localInvalidate("key");
+              break;
+            default:
+              fail("Unknown op code: " + i);
+              break;
+          }
+        } catch (UnsupportedOperationException uoe) {
+          Log.getLogWriter().info(op + ": Got expected exception: " + uoe);
+          success = true;
+        } catch (Exception e) {
+          fail("Got unexpected exception while doing " + op, e);
+        }
+        if (!success) {
+          fail("Did not get exception while doing " + op);
+        }
+      }
+    }
+  }
+
+  public void tearDown2() throws Exception {
+    super.tearDown2();
+    // close the clients first
+    client1.invoke(SecurityTestUtil.class, "closeCache");
+    client2.invoke(SecurityTestUtil.class, "closeCache");
+    // then close the servers
+    server1.invoke(SecurityTestUtil.class, "closeCache");
+    server2.invoke(SecurityTestUtil.class, "closeCache");
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java
new file mode 100644
index 0000000..99c55b1
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java
@@ -0,0 +1,484 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+/**
+ * 
+ */
+package com.gemstone.gemfire.security;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Random;
+
+import security.AuthzCredentialGenerator;
+import security.CredentialGenerator;
+
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode;
+import com.gemstone.gemfire.cache.query.CqAttributes;
+import com.gemstone.gemfire.cache.query.CqAttributesFactory;
+import com.gemstone.gemfire.cache.query.CqListener;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.cache.query.SelectResults;
+import com.gemstone.gemfire.cache.query.cq.dunit.CqQueryTestListener;
+import com.gemstone.gemfire.cache.query.internal.cq.ClientCQImpl;
+import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.internal.AvailablePort;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.logging.InternalLogWriter;
+
+import dunit.Host;
+import dunit.SerializableRunnable;
+
+/**
+ * @author ashetkar
+ *
+ */
+public class MultiuserDurableCQAuthzDUnitTest extends
+    ClientAuthorizationTestBase {
+  
+  public static final Map<String, String> cqNameToQueryStrings = new HashMap<String, String>();
+
+  static {
+    cqNameToQueryStrings.put("CQ_0", "SELECT * FROM ");
+    cqNameToQueryStrings.put("CQ_1", "SELECT * FROM ");
+  }
+
+  public MultiuserDurableCQAuthzDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+    getSystem();
+    invokeInEveryVM(new SerializableRunnable("getSystem") {
+      public void run() {
+        getSystem();
+      }
+    });
+
+    final Host host = Host.getHost(0);
+    server1 = host.getVM(0);
+    server2 = host.getVM(1);
+    client1 = host.getVM(2);
+    client2 = host.getVM(3);
+
+    server1.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
+        new Object[] { serverExpectedExceptions });
+    server2.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
+        new Object[] { serverExpectedExceptions });
+    client2.invoke(SecurityTestUtil.class, "registerExpectedExceptions",
+        new Object[] { clientExpectedExceptions });
+    SecurityTestUtil.registerExpectedExceptions(clientExpectedExceptions);
+  }
+
+  public void testCQForDurableClientsWithDefaultClose() throws Exception {
+    /*
+     *  1. Start a server.
+     *  2. Start a durable client in mulituser secure mode.
+     *  3. Create two users registering unique durable CQs on server.
+     *  4. Invoke GemFireCache.close() at client.
+     *  5. Put some events on server satisfying both the CQs.
+     *  6. Up the client and the two users.
+     *  7. Confirm that the users receive the events which were enqueued at server while they were away.
+     *  8. Same for ProxyCache.close()
+     */
+    Integer numOfUsers = 2;
+    Integer numOfPuts = 5;
+    Boolean[] postAuthzAllowed = new Boolean[] {Boolean.TRUE, Boolean.TRUE};
+
+    doTest(numOfUsers, numOfPuts, postAuthzAllowed,
+          getXmlAuthzGenerator(), null);
+  }
+
+  public void testCQForDurableClientsWithCloseKeepAliveTrue() throws Exception {
+    /*
+     *  1. Start a server.
+     *  2. Start a durable client in mulituser secure mode.
+     *  3. Create two users registering unique durable CQs on server.
+     *  4. Invoke GemFireCache.close(false) at client.
+     *  5. Put some events on server satisfying both the CQs.
+     *  6. Up the client and the two users.
+     *  7. Observer the behaviour.
+     *  8. Same for ProxyCache.close(false)
+     */
+    Integer numOfUsers = 2;
+    Integer numOfPuts = 5;
+    Boolean[] postAuthzAllowed = new Boolean[] {Boolean.TRUE, Boolean.TRUE};
+
+    doTest(numOfUsers, numOfPuts, postAuthzAllowed,
+          getXmlAuthzGenerator(), Boolean.TRUE);
+  }
+
+  public void testCQForDurableClientsWithCloseKeepAliveFalse() throws Exception {
+    /*
+     *  1. Start a server.
+     *  2. Start a durable client in mulituser secure mode.
+     *  3. Create two users registering unique durable CQs on server.
+     *  4. Invoke GemFireCache.close(true) at client.
+     *  5. Put some events on server satisfying both the CQs.
+     *  6. Up the client and the two users.
+     *  7. Observer the behaviour.
+     *  8. Same for ProxyCache.close(true)
+     */
+    Integer numOfUsers = 2;
+    Integer numOfPuts = 5;
+    Boolean[] postAuthzAllowed = new Boolean[] {Boolean.TRUE, Boolean.TRUE};
+
+    doTest(numOfUsers, numOfPuts, postAuthzAllowed,
+              getXmlAuthzGenerator(), Boolean.FALSE);
+  }
+
+  private void doTest(Integer numOfUsers, Integer numOfPuts,
+      Boolean[] postAuthzAllowed, AuthzCredentialGenerator gen, Boolean keepAlive)
+      throws Exception {
+    CredentialGenerator cGen = gen.getCredentialGenerator();
+    Properties extraAuthProps = cGen.getSystemProperties();
+    Properties javaProps = cGen.getJavaProperties();
+    Properties extraAuthzProps = gen.getSystemProperties();
+    String authenticator = cGen.getAuthenticator();
+    String accessor = gen.getAuthorizationCallback();
+    String authInit = cGen.getAuthInit();
+    TestAuthzCredentialGenerator tgen = new TestAuthzCredentialGenerator(gen);
+
+    Properties serverProps = buildProperties(authenticator, accessor, true,
+        extraAuthProps, extraAuthzProps);
+
+    Properties opCredentials;
+    cGen = tgen.getCredentialGenerator();
+    Properties javaProps2 = null;
+    if (cGen != null) {
+      javaProps2 = cGen.getJavaProperties();
+    }
+
+    int[] indices = new int[numOfPuts];
+    for (int index = 0; index < numOfPuts; ++index) {
+      indices[index] = index;
+    }
+
+    Random rnd = new Random();
+    Properties[] authProps = new Properties[numOfUsers];
+    String durableClientId = "multiuser_durable_client_1";
+    Properties client2Credentials = null;
+    for (int i = 0; i < numOfUsers; i++) {
+      int rand = rnd.nextInt(100) + 1;
+      if (postAuthzAllowed[i]) {
+        opCredentials = tgen.getAllowedCredentials(new OperationCode[] {
+            OperationCode.EXECUTE_CQ, OperationCode.GET}, // For callback, GET should be allowed
+            new String[] {regionName}, indices, rand);
+      } else {
+        opCredentials = tgen.getDisallowedCredentials(new OperationCode[] {
+            OperationCode.GET}, // For callback, GET should be disallowed
+            new String[] {regionName}, indices, rand);
+      }
+      authProps[i] = SecurityTestUtil.concatProperties(new Properties[] {
+          opCredentials, extraAuthProps, extraAuthzProps});
+
+      if (client2Credentials == null) {
+        client2Credentials = tgen.getAllowedCredentials(new OperationCode[] {
+            OperationCode.PUT},
+            new String[] {regionName}, indices, rand);
+      }
+    }
+
+    // Get ports for the servers
+    Integer port1 = new Integer(AvailablePort
+        .getRandomAvailablePort(AvailablePort.SOCKET));
+    Integer port2 = new Integer(AvailablePort
+        .getRandomAvailablePort(AvailablePort.SOCKET));
+    Integer locatorPort = new Integer(AvailablePort
+        .getRandomAvailablePort(AvailablePort.SOCKET));
+    // Close down any running servers
+    server1.invoke(SecurityTestUtil.class, "closeCache");
+    server2.invoke(SecurityTestUtil.class, "closeCache");
+
+    server1.invoke(MultiuserDurableCQAuthzDUnitTest.class,
+        "createServerCache", new Object[] {serverProps, javaProps, locatorPort, port1});
+    client1.invoke(MultiuserDurableCQAuthzDUnitTest.class,
+        "createClientCache", new Object[] {javaProps2, authInit, authProps,
+            new Integer[] {port1, port2}, numOfUsers, durableClientId, postAuthzAllowed});
+
+//    client2.invoke(SecurityTestUtil.class, "createCacheClient",
+//        new Object[] {authInit, client2Credentials, javaProps2,
+//            new Integer[] {port1, port2}, null, SecurityTestUtil.NO_EXCEPTION});
+
+    client1.invoke(MultiuserDurableCQAuthzDUnitTest.class, "createCQ",
+        new Object[] {numOfUsers, Boolean.TRUE});
+    client1.invoke(MultiuserDurableCQAuthzDUnitTest.class, "executeCQ",
+        new Object[] {numOfUsers, new Boolean[] {false, false}, numOfPuts,
+            new String[numOfUsers]});
+    client1.invoke(MultiuserDurableCQAuthzDUnitTest.class, "readyForEvents");
+
+    if (keepAlive == null) {
+      client1.invoke(SecurityTestUtil.class, "closeCache");
+    } else {
+      client1.invoke(SecurityTestUtil.class, "closeCache",
+          new Object[] {keepAlive});
+    }
+
+    server1.invoke(MultiuserDurableCQAuthzDUnitTest.class, "doPuts",
+        new Object[] {numOfPuts, Boolean.TRUE/* put last key */});
+
+    client1.invoke(MultiuserDurableCQAuthzDUnitTest.class,
+        "createClientCache", new Object[] {javaProps2, authInit, authProps,
+            new Integer[] {port1, port2}, numOfUsers, durableClientId, postAuthzAllowed});
+    client1.invoke(MultiuserDurableCQAuthzDUnitTest.class, "createCQ",
+        new Object[] {numOfUsers, Boolean.TRUE});
+    client1.invoke(MultiuserDurableCQAuthzDUnitTest.class, "executeCQ",
+        new Object[] {numOfUsers, new Boolean[] {false, false}, numOfPuts,
+            new String[numOfUsers]});
+    client1.invoke(MultiuserDurableCQAuthzDUnitTest.class, "readyForEvents");
+
+    if (!postAuthzAllowed[0] || keepAlive == null || !keepAlive) {
+      // Don't wait as no user is authorized to receive cq events.
+      Thread.sleep(1000);
+    } else {
+      client1.invoke(MultiuserDurableCQAuthzDUnitTest.class, "waitForLastKey",
+          new Object[] {Integer.valueOf(0), Boolean.TRUE});
+    }
+    Integer numOfCreates = (keepAlive == null) ? 0
+        : (keepAlive) ? (numOfPuts + 1/* last key */) : 0;
+    client1.invoke(MultiuserDurableCQAuthzDUnitTest.class, "checkCQListeners",
+        new Object[] {numOfUsers, postAuthzAllowed, numOfCreates, 0});
+
+    client1.invoke(MultiuserDurableCQAuthzDUnitTest.class, "proxyCacheClose",
+        new Object[] {new Integer[] {0, 1}, keepAlive});
+
+    client1.invoke(SecurityTestUtil.class, "createProxyCache",
+        new Object[] {new Integer[] {0, 1}, authProps});
+
+    client1.invoke(MultiuserDurableCQAuthzDUnitTest.class, "createCQ",
+        new Object[] {numOfUsers, Boolean.TRUE});
+    client1.invoke(MultiuserDurableCQAuthzDUnitTest.class, "executeCQ",
+        new Object[] {numOfUsers, new Boolean[] {false, false}, numOfPuts,
+            new String[numOfUsers]});
+
+    server1.invoke(MultiuserDurableCQAuthzDUnitTest.class, "doPuts",
+        new Object[] {numOfPuts, Boolean.TRUE/* put last key */});
+
+    if (!postAuthzAllowed[0] || keepAlive == null || !keepAlive) {
+      // Don't wait as no user is authorized to receive cq events.
+      Thread.sleep(1000);
+    } else {
+      client1.invoke(MultiuserDurableCQAuthzDUnitTest.class, "waitForLastKey",
+          new Object[] {Integer.valueOf(0), Boolean.FALSE});
+    }
+    Integer numOfUpdates = numOfPuts + 1;
+    client1.invoke(MultiuserDurableCQAuthzDUnitTest.class, "checkCQListeners",
+        new Object[] {numOfUsers, postAuthzAllowed, 0, numOfUpdates});
+  }
+
+  public static void createServerCache(Properties serverProps,
+      Properties javaProps, Integer locatorPort, Integer serverPort) {
+    SecurityTestUtil.createCacheServer((Properties)serverProps, javaProps,
+        locatorPort, null, serverPort, Boolean.TRUE, new Integer(
+            SecurityTestUtil.NO_EXCEPTION));
+  }
+
+  public static void createClientCache(Properties javaProps,
+      String authInit, Properties[] authProps, Integer ports[],
+      Integer numOfUsers, Boolean[] postAuthzAllowed) {
+    SecurityTestUtil.createCacheClientForMultiUserMode(numOfUsers, authInit,
+        authProps, javaProps, ports, null, Boolean.FALSE,
+        SecurityTestUtil.NO_EXCEPTION);
+  }
+
+  public static void readyForEvents() {
+    GemFireCacheImpl.getInstance().readyForEvents();
+  }
+
+  public static void createClientCache(Properties javaProps,
+      String authInit, Properties[] authProps, Integer ports[],
+      Integer numOfUsers, String durableId, Boolean[] postAuthzAllowed) {
+    SecurityTestUtil.createCacheClientForMultiUserMode(numOfUsers, authInit,
+        authProps, javaProps, ports, null, Boolean.FALSE, durableId,
+        SecurityTestUtil.NO_EXCEPTION);
+  }
+
+  public static void createCQ(Integer num) {
+    createCQ(num, false);
+  }
+
+  public static void createCQ(Integer num, Boolean isDurable) {
+    for (int i = 0; i < num; i++) {
+      QueryService cqService = SecurityTestUtil.proxyCaches[i].getQueryService();
+      String cqName = "CQ_" + i;
+      String queryStr = cqNameToQueryStrings.get(cqName)
+          + SecurityTestUtil.proxyCaches[i].getRegion(regionName).getFullPath();
+      // Create CQ Attributes.
+      CqAttributesFactory cqf = new CqAttributesFactory();
+      CqListener[] cqListeners = {new CqQueryTestListener(getLogWriter())};
+      ((CqQueryTestListener)cqListeners[0]).cqName = cqName;
+
+      cqf.initCqListeners(cqListeners);
+      CqAttributes cqa = cqf.create();
+
+      // Create CQ.
+      try {
+        CqQuery cq1 = cqService.newCq(cqName, queryStr, cqa, isDurable);
+        assertTrue("newCq() state mismatch", cq1.getState().isStopped());
+      } catch (Exception ex) {
+        AssertionError err = new AssertionError("Failed to create CQ " + cqName
+            + " . ");
+        err.initCause(ex);
+        getLogWriter().info("CqService is :" + cqService, err);
+        throw err;
+      }
+    }
+  }
+
+  public static void executeCQ(Integer num, Boolean[] initialResults,
+      Integer expectedResultsSize, String[] expectedErr) {
+    InternalLogWriter logWriter = InternalDistributedSystem.getStaticInternalLogWriter();
+    for (int i = 0; i < num; i++) {
+      try {
+        if (expectedErr[i] != null) {
+          logWriter.info(
+              "<ExpectedException action=add>" + expectedErr[i]
+                  + "</ExpectedException>");
+        }
+        CqQuery cq1 = null;
+        String cqName = "CQ_" + i;
+        String queryStr = cqNameToQueryStrings.get(cqName)
+            + SecurityTestUtil.proxyCaches[i].getRegion(regionName)
+                .getFullPath();
+        QueryService cqService = SecurityTestUtil.proxyCaches[i]
+            .getQueryService();
+
+        // Get CqQuery object.
+        try {
+          cq1 = cqService.getCq(cqName);
+          if (cq1 == null) {
+            getLogWriter().info(
+                "Failed to get CqQuery object for CQ name: " + cqName);
+            fail("Failed to get CQ " + cqName);
+          } else {
+            getLogWriter().info("Obtained CQ, CQ name: " + cq1.getName());
+            assertTrue("newCq() state mismatch", cq1.getState().isStopped());
+          }
+        } catch (Exception ex) {
+          getLogWriter().info("CqService is :" + cqService);
+          getLogWriter().error(ex);
+          AssertionError err = new AssertionError("Failed to execute CQ "
+              + cqName);
+          err.initCause(ex);
+          throw err;
+        }
+
+        if (initialResults[i]) {
+          SelectResults cqResults = null;
+
+          try {
+            cqResults = cq1.executeWithInitialResults();
+          } catch (Exception ex) {
+            getLogWriter().info("CqService is: " + cqService);
+            ex.printStackTrace();
+            AssertionError err = new AssertionError("Failed to execute CQ "
+                + cqName);
+            err.initCause(ex);
+            throw err;
+          }
+          getLogWriter().info("initial result size = " + cqResults.size());
+          assertTrue("executeWithInitialResults() state mismatch", cq1
+              .getState().isRunning());
+          if (expectedResultsSize >= 0) {
+            assertEquals("unexpected results size", expectedResultsSize
+                .intValue(), cqResults.size());
+          }
+        } else {
+          try {
+            cq1.execute();
+          } catch (Exception ex) {
+            AssertionError err = new AssertionError("Failed to execute CQ "
+                + cqName);
+            err.initCause(ex);
+            if (expectedErr == null) {
+              getLogWriter().info("CqService is: " + cqService, err);
+            }
+            throw err;
+          }
+          assertTrue("execute() state mismatch", cq1.getState().isRunning());
+        }
+      } finally {
+        if (expectedErr[i] != null) {
+          logWriter.info(
+              "<ExpectedException action=remove>" + expectedErr[i]
+                  + "</ExpectedException>");
+        }
+      }
+    }
+  }
+
+  public static void doPuts(Integer num, Boolean putLastKey) {
+    Region region = GemFireCacheImpl.getInstance().getRegion(regionName);
+    for (int i = 0; i < num; i++) {
+      region.put("CQ_key"+i, "CQ_value"+i);
+    }
+    if (putLastKey) {
+      region.put("LAST_KEY", "LAST_KEY");
+    }
+  }
+
+  public static void putLastKey() {
+    Region region = GemFireCacheImpl.getInstance().getRegion(regionName);
+    region.put("LAST_KEY", "LAST_KEY");
+  }
+
+  public static void waitForLastKey(Integer cqIndex, Boolean isCreate) {
+    String cqName = "CQ_" + cqIndex;
+    QueryService qService = SecurityTestUtil.proxyCaches[cqIndex].getQueryService();
+    ClientCQImpl cqQuery = (ClientCQImpl)qService.getCq(cqName);
+    if (isCreate) {
+      ((CqQueryTestListener)cqQuery.getCqListeners()[cqIndex])
+          .waitForCreated("LAST_KEY");
+    } else {
+      ((CqQueryTestListener)cqQuery.getCqListeners()[cqIndex])
+          .waitForUpdated("LAST_KEY");
+    }
+  }
+
+  public static void checkCQListeners(Integer numOfUsers,
+      Boolean[] expectedListenerInvocation, Integer createEventsSize,
+      Integer updateEventsSize) {
+    for (int i = 0; i < numOfUsers; i++) {
+      String cqName = "CQ_" + i;
+      QueryService qService = SecurityTestUtil.proxyCaches[i].getQueryService();
+      ClientCQImpl cqQuery = (ClientCQImpl)qService.getCq(cqName);
+      if (expectedListenerInvocation[i]) {
+        for (CqListener listener : cqQuery.getCqListeners()) {
+          assertEquals(createEventsSize.intValue(),
+              ((CqQueryTestListener)listener).getCreateEventCount());
+          assertEquals(updateEventsSize.intValue(),
+              ((CqQueryTestListener)listener).getUpdateEventCount());
+        }
+      } else {
+        for (CqListener listener : cqQuery.getCqListeners()) {
+          assertEquals(0, ((CqQueryTestListener)listener).getTotalEventCount());
+        }
+      }
+    }
+  }
+
+  public static void proxyCacheClose(Integer[] userIndices) {
+    proxyCacheClose(userIndices, null);
+  }
+
+  public static void proxyCacheClose(Integer[] userIndices, Boolean keepAliveFlags) {
+    if (keepAliveFlags != null) {
+      for (int i : userIndices) {
+        SecurityTestUtil.proxyCaches[i].close(keepAliveFlags);
+      }
+    } else {
+      for (int i : userIndices) {
+        SecurityTestUtil.proxyCaches[i].close();
+      }
+    }
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/resources/.keepme
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/resources/.keepme b/gemfire-cq/src/test/resources/.keepme
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/resources/com/gemstone/gemfire/codeAnalysis/excludedClasses.txt
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/resources/com/gemstone/gemfire/codeAnalysis/excludedClasses.txt b/gemfire-cq/src/test/resources/com/gemstone/gemfire/codeAnalysis/excludedClasses.txt
new file mode 100644
index 0000000..c55df1d
--- /dev/null
+++ b/gemfire-cq/src/test/resources/com/gemstone/gemfire/codeAnalysis/excludedClasses.txt
@@ -0,0 +1,2 @@
+# e.g.,
+#com/gemstone/gemfire/cache/query/CqAttributesFactory

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/resources/com/gemstone/gemfire/codeAnalysis/openBugs.txt
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/resources/com/gemstone/gemfire/codeAnalysis/openBugs.txt b/gemfire-cq/src/test/resources/com/gemstone/gemfire/codeAnalysis/openBugs.txt
new file mode 100644
index 0000000..6c40e24
--- /dev/null
+++ b/gemfire-cq/src/test/resources/com/gemstone/gemfire/codeAnalysis/openBugs.txt
@@ -0,0 +1,21 @@
+# This is a list of classes excluded due to open bugs about their having
+# incompatible changes.  There should be no entries in this file at the
+# time of a product release.
+
+# Each entry should be a bug number followed by a comma and the
+# full class name.  The package components can be delimited with a period
+# or a comma.  Don't include ".class" or ".java" at the end of the name.
+
+# example:  50174,com/gemstone/gemfire/distributed/internal/StartupResponseWithVersionMessage
+# example:  50175,com.gemstone.org.jgroups.Message$Header
+
+
+# ~~~~~~~~~~~~~~~~~~~ DataSerializables ~~~~~~~~~~~~~~~~~~~~~~~~~
+# these are failures from testDataSerializables
+
+
+# ~~~~~~~~~~~~~~~~~~~ Serializables ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# these are failures from testSerializables
+
+
+

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt b/gemfire-cq/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
new file mode 100644
index 0000000..eb9d8d6
--- /dev/null
+++ b/gemfire-cq/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedDataSerializables.txt
@@ -0,0 +1,4 @@
+com/gemstone/gemfire/cache/query/internal/cq/ServerCQImpl,2
+fromData,64,2ab40046594dc22ab400462bb80099b6009ab6007f2cc3a700084e2cc32dbf2a2bb8009bb6009cb5009d2a2bb8009eb5005d2a2bb9009f0100b800a0b50008b1
+toData,47,2ab40046b60047b800a12bb800a22ab4009db8007c2bb800a32ab4005d2bb800a42b2ab40008b600a5b900a60300b1
+

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt b/gemfire-cq/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
new file mode 100755
index 0000000..ddd9718
--- /dev/null
+++ b/gemfire-cq/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
@@ -0,0 +1 @@
+com/gemstone/gemfire/cache/query/internal/cq/CqConflatable,true,-7215022132135862557,conflate:boolean,id:com/gemstone/gemfire/internal/cache/EventID,key:java/lang/Object,regionname:java/lang/String,value:java/lang/Object

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/resources/com/gemstone/gemfire/internal/cache/tier/sockets/durablecq-client-cache.xml
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/resources/com/gemstone/gemfire/internal/cache/tier/sockets/durablecq-client-cache.xml b/gemfire-cq/src/test/resources/com/gemstone/gemfire/internal/cache/tier/sockets/durablecq-client-cache.xml
new file mode 100644
index 0000000..afde78f
--- /dev/null
+++ b/gemfire-cq/src/test/resources/com/gemstone/gemfire/internal/cache/tier/sockets/durablecq-client-cache.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+ <!DOCTYPE client-cache PUBLIC
+    "-//GemStone Systems, Inc.//GemFire Declarative Caching 6.6//EN"
+    "http://www.gemstone.com/dtd/cache6_6.dtd">
+    
+
+<client-cache>
+    <pool 
+    name="client" 
+    subscription-enabled="true" 
+    load-conditioning-interval="60000"
+    read-timeout="30000" retry-attempts="5" >
+        <server host="localhost" port="10188" />
+    </pool>
+
+    <region name="testReadyForEventsNotCalledImplicitlyWithCacheXML_region" >
+    <region-attributes id="testReadyForEventsNotCalledImplicitlyWithCacheXML_region" statistics-enabled="true"  pool-name="client" refid="PROXY">
+        <cache-listener><class-name>com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil$ControlListener</class-name></cache-listener>
+    </region-attributes>
+    </region>
+</client-cache>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/resources/com/gemstone/gemfire/internal/cache/tier/sockets/durablecq-server-cache.xml
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/resources/com/gemstone/gemfire/internal/cache/tier/sockets/durablecq-server-cache.xml b/gemfire-cq/src/test/resources/com/gemstone/gemfire/internal/cache/tier/sockets/durablecq-server-cache.xml
new file mode 100644
index 0000000..2d58506
--- /dev/null
+++ b/gemfire-cq/src/test/resources/com/gemstone/gemfire/internal/cache/tier/sockets/durablecq-server-cache.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE cache PUBLIC
+    "-//GemStone Systems, Inc.//GemFire Declarative Caching 6.6//EN"
+    "http://www.gemstone.com/dtd/cache6_6.dtd">
+
+<cache is-server="true">
+    <!-- Define this cache server -->
+    <cache-server port="10188" >
+        <client-subscription eviction-policy="entry" capacity="1000"/>
+    </cache-server>
+    <region name="testReadyForEventsNotCalledImplicitlyWithCacheXML_region">
+        <region-attributes  data-policy="partition" enable-subscription-conflation="false">
+             <partition-attributes redundant-copies="0" total-num-buckets="113"/>
+        </region-attributes>
+    </region>
+</cache>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/resources/cq/statistics/cqStats.bt
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/resources/cq/statistics/cqStats.bt b/gemfire-cq/src/test/resources/cq/statistics/cqStats.bt
new file mode 100644
index 0000000..ea6685c
--- /dev/null
+++ b/gemfire-cq/src/test/resources/cq/statistics/cqStats.bt
@@ -0,0 +1,3 @@
+cq/statistics/cqStatsHCT.conf
+edgeHosts =1 edgeVMsPerHost = 1 edgeThreadsPerVM = 1
+bridgeHosts =1 bridgeVMsPerHost = 1 bridgeThreadsPerVM = 1

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/resources/cq/statistics/cqStatsHCT.conf
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/resources/cq/statistics/cqStatsHCT.conf b/gemfire-cq/src/test/resources/cq/statistics/cqStatsHCT.conf
new file mode 100644
index 0000000..4623a5d
--- /dev/null
+++ b/gemfire-cq/src/test/resources/cq/statistics/cqStatsHCT.conf
@@ -0,0 +1,100 @@
+hydra.Prms-testRequirement = "Test CQ with a variety of operations with careful validation and serial execution in a bridge configuration";
+hydra.Prms-testDescription = "
+This test executes operations on entries on a region and carefully
+validates for correctness in the CQs. 
+The test uses serial round robin; the first thread
+in the round does a random operation, then all other threads in the round
+verify their view of the operation. After the last thread in the round verifies,
+it then becomes the first in the next round, thus the thread doing the random
+operation changes for each round. 
+";
+
+INCLUDE $JTESTS/hydraconfig/hydraparams1.inc;
+INCLUDE $JTESTS/hydraconfig/topology_hct.inc;
+
+hydra.VmPrms-extraClassPaths =
+   fcn "hydra.TestConfigFcns.duplicate(\"$GEMFIRE/lib/antlr.jar\", ${bridgeHosts})" ncf;
+
+THREADGROUP bridgeThreads
+  totalThreads = fcn
+                 ${bridgeHosts} * ${bridgeVMsPerHost} * ${bridgeThreadsPerVM}
+                 ncf
+  clientNames  = fcn "hydra.TestConfigFcns.generateNames
+                      (\"bridge\", ${bridgeHosts}, true)"
+                 ncf;
+THREADGROUP edgeThreads
+  totalThreads = fcn
+                 ${edgeHosts} * ${edgeVMsPerHost} * ${edgeThreadsPerVM}
+                 ncf
+  clientNames  = fcn "hydra.TestConfigFcns.generateNames
+                      (\"edge\", ${edgeHosts}, true)"
+                 ncf;         
+
+INITTASK     taskClass   = cq.statistics.CQStatisticsTest  taskMethod = HydraTask_initializeBridgeServer
+             threadGroups = bridgeThreads
+             runMode = always;
+
+INITTASK     taskClass   = cq.statistics.CQStatisticsTest  taskMethod = HydraTask_initializeClient
+             threadGroups = edgeThreads
+             runMode = always;
+
+INITTASK         taskClass   = cq.statistics.CQStatisticsTest  taskMethod = HydraTask_verifyCqStatistics
+             threadGroups = edgeThreads;
+
+hydra.GemFirePrms-stopSystemsAfterTest = true;
+
+hydra.Prms-totalTaskTimeSec = 1200;
+hydra.Prms-maxResultWaitSec = 600;
+hydra.Prms-serialExecution = true;
+hydra.Prms-roundRobin = true;
+
+INCLUDE $JTESTS/util/randomValues.inc;
+util.RandomValuesPrms-objectType = byte[];
+util.RandomValuesPrms-elementSize = 1000;
+util.RandomValuesPrms-borderCasePercentage = 0;
+util.ValueHolderPrms-useExtraObject = true;
+hydra.GemFirePrms-conserveSockets = ONEOF true false FOENO;
+
+hydra.CachePrms-names           = cache1;
+hydra.CachePrms-searchTimeout   = 600;
+
+hydra.Prms-useFixedRandomInMaster= true;
+hydra.RegionPrms-names          = clientRegion            serverRegion;
+hydra.RegionPrms-regionName     = testRegion              testRegion;
+hydra.RegionPrms-scope          = local                   ack;
+hydra.RegionPrms-poolName       = edgeDescript            none;
+hydra.RegionPrms-dataPolicy     = normal                  replicate;
+hydra.RegionPrms-cacheListeners = util.SilenceListener,   hct.BridgeEventListener;
+hydra.RegionPrms-partitionName  = none                    none;
+
+cq.CQUtilPrms-numOpsPerTask = 100;
+
+util.CachePrms-useDeclarativeXmlFile = ONEOF true false FOENO;
+util.TestHelperPrms-minTaskGranularitySec = 30;
+
+cq.CQUtilPrms-serverEntryOperations = ONEOF add add update invalidate get destroy FOENO; 
+cq.CQUtilPrms-clientEntryOperations = ONEOF add add update get destroy FOENO; 
+cq.CQUtilPrms-upperThreshold = 500;
+cq.CQUtilPrms-upperThresholdServerOperations = ONEOF destroy FOENO;
+cq.CQUtilPrms-upperThresholdClientOperations = ONEOF destroy FOENO;
+cq.CQUtilPrms-lowerThreshold = 0;
+cq.CQUtilPrms-lowerThresholdServerOperations = add;
+cq.CQUtilPrms-lowerThresholdClientOperations = add;
+cq.CQUtilPrms-queryDepth = 7;
+cq.CQUtilPrms-numQueriesPerClientVM = 100; 
+cq.CQUtilPrms-QueryServicePoolName = qservice;
+cq.CQUtilPrms-QueryServiceUsingPool = ONEOF true false FOENO;
+
+// define the edge clients
+hydra.PoolPrms-names                       = edgeDescript qservice;
+hydra.PoolPrms-minConnections        = 2;
+hydra.PoolPrms-subscriptionEnabled = true;
+hydra.PoolPrms-threadLocalConnections         = true;
+hydra.PoolPrms-readTimeout                 = 800000;
+hydra.PoolPrms-subscriptionRedundancy             = RANGE 0
+                                                   fcn ${bridgeHosts} * ${bridgeVMsPerHost} ncf
+                                             EGNAR;
+
+// define the bridge servers
+hydra.BridgePrms-names                = bridge;
+

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/build.gradle
----------------------------------------------------------------------
diff --git a/gemfire-wan/build.gradle b/gemfire-wan/build.gradle
new file mode 100644
index 0000000..eba2539
--- /dev/null
+++ b/gemfire-wan/build.gradle
@@ -0,0 +1,5 @@
+dependencies {
+  provided project(':gemfire-core')
+  provided project(path: ':gemfire-core', configuration: 'testOutput')
+  provided project(path: ':gemfire-junit', configuration: 'testOutput')
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/main/java/.keepme
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/.keepme b/gemfire-wan/src/main/java/.keepme
new file mode 100644
index 0000000..e69de29

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/GatewaySenderBatchOp.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/GatewaySenderBatchOp.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/GatewaySenderBatchOp.java
new file mode 100644
index 0000000..15be615
--- /dev/null
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/GatewaySenderBatchOp.java
@@ -0,0 +1,304 @@
+/*=========================================================================
+ * Copyright (c) 2002-2014, Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.client.internal;
+
+import com.gemstone.gemfire.InternalGemFireError;
+import com.gemstone.gemfire.cache.client.ServerOperationException;
+import com.gemstone.gemfire.internal.Version;
+import com.gemstone.gemfire.internal.cache.EventID;
+import com.gemstone.gemfire.internal.cache.tier.MessageType;
+import com.gemstone.gemfire.internal.cache.tier.sockets.ChunkedMessage;
+import com.gemstone.gemfire.internal.cache.tier.sockets.Message;
+import com.gemstone.gemfire.internal.cache.tier.sockets.Part;
+import com.gemstone.gemfire.internal.cache.wan.BatchException70;
+import com.gemstone.gemfire.internal.cache.wan.GatewaySenderEventImpl;
+import com.gemstone.gemfire.internal.cache.wan.GatewaySenderEventRemoteDispatcher;
+import com.gemstone.gemfire.internal.cache.wan.GatewaySenderEventRemoteDispatcher.GatewayAck;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.internal.logging.LogService;
+
+import java.net.SocketTimeoutException;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.logging.log4j.Logger;
+
+public class GatewaySenderBatchOp {
+  
+  private static final Logger logger = LogService.getLogger();
+  
+  /**
+   * Send a list of gateway events to a server to execute
+   * using connections from the given pool
+   * to communicate with the server.
+   * @param con the connection to send the message on.
+   * @param pool the pool to use to communicate with the server.
+   * @param events list of gateway events
+   * @param batchId the ID of this batch
+   * @param removeFromQueueOnException true if the events should be processed even after some exception
+   */
+  public static void executeOn(Connection con, ExecutablePool pool, List events, int batchId, boolean removeFromQueueOnException, boolean isRetry)
+  {
+    AbstractOp op = null;
+    //System.out.println("Version: "+con.getWanSiteVersion());
+    if (Version.GFE_651.compareTo(con.getWanSiteVersion()) >= 0) {
+      op = new GatewaySenderGFEBatchOpImpl(events, batchId, removeFromQueueOnException, con.getDistributedSystemId(), isRetry);
+    } else {
+      // Default should create a batch of server version (ACCEPTOR.VERSION)
+      op = new GatewaySenderGFEBatchOpImpl(events, batchId, removeFromQueueOnException, con.getDistributedSystemId(), isRetry);     
+    }
+    pool.executeOn(con, op, true/*timeoutFatal*/);
+  }
+  
+  
+  public static Object executeOn(Connection con, ExecutablePool pool)
+  {
+    AbstractOp op = null;
+    //System.out.println("Version: "+con.getWanSiteVersion());
+    // [sumedh] both cases are now same; why switch-case?
+    if (Version.GFE_651.compareTo(con.getWanSiteVersion()) >= 0) {
+      op = new GatewaySenderGFEBatchOpImpl();
+    } else {
+      // Default should create a batch of server version (ACCEPTOR.VERSION)
+      op = new GatewaySenderGFEBatchOpImpl();
+    }
+    return pool.executeOn(con, op, true/*timeoutFatal*/);
+  }
+                                                               
+  private GatewaySenderBatchOp() {
+    // no instances allowed
+  }
+  
+  static class GatewaySenderGFEBatchOpImpl extends AbstractOp {
+    
+    /**
+     * @throws com.gemstone.gemfire.SerializationException if serialization fails
+     */
+    public GatewaySenderGFEBatchOpImpl(List events, int batchId, boolean removeFromQueueOnException, int dsId, boolean isRetry)  {
+      super(MessageType.GATEWAY_RECEIVER_COMMAND, calcPartCount(events));
+      if (isRetry) {
+        getMessage().setIsRetry();
+      }
+      getMessage().addIntPart(events.size());
+      getMessage().addIntPart(batchId);
+      getMessage().addIntPart(dsId);
+      getMessage().addBytesPart(
+          new byte[] { removeFromQueueOnException ? (byte)1 : (byte)0 });
+      // Add each event
+      for (Iterator i = events.iterator(); i.hasNext();) {
+        GatewaySenderEventImpl event = (GatewaySenderEventImpl)i.next();
+        // Add action
+        int action = event.getAction();
+        getMessage().addIntPart(action);
+        { // Add posDup flag
+          byte posDupByte = (byte)(event.getPossibleDuplicate()?0x01:0x00);
+          getMessage().addBytesPart(new byte[] {posDupByte});
+        }
+        if (action >= 0 && action <= 3) {
+          // 0 = create
+          // 1 = update
+          // 2 = destroy
+          String regionName = event.getRegionPath();
+          EventID eventId = event.getEventId();
+          Object key = event.getKey();
+          Object callbackArg = event.getSenderCallbackArgument();
+
+          // Add region name
+          getMessage().addStringPart(regionName);
+          // Add event id
+          getMessage().addObjPart(eventId);
+          // Add key
+          getMessage().addStringOrObjPart(key);
+          if (action < 2 /* it is 0 or 1 */) {
+            byte[] value = event.getSerializedValue();
+            byte valueIsObject = event.getValueIsObject();;
+            // Add value (which is already a serialized byte[])
+            getMessage().addRawPart(value, (valueIsObject == 0x01));
+          }
+          // Add callback arg if necessary
+          if (callbackArg == null) {
+            getMessage().addBytesPart(new byte[] {0x00});
+          } else {
+            getMessage().addBytesPart(new byte[] {0x01});
+            getMessage().addObjPart(callbackArg);
+          }
+          getMessage().addLongPart(event.getVersionTimeStamp());
+        }
+      }
+    }
+
+    public GatewaySenderGFEBatchOpImpl() {
+      super(MessageType.GATEWAY_RECEIVER_COMMAND, 0);
+    }
+
+    @Override
+    public Object attempt(Connection cnx) throws Exception {
+      if (getMessage().getNumberOfParts() == 0) {
+        return attemptRead(cnx);
+      }
+      this.failed = true;
+      this.timedOut = false;
+      long start = startAttempt(cnx.getStats());
+      try {
+        try {
+          attemptSend(cnx);
+          this.failed = false;
+        } finally {
+          endSendAttempt(cnx.getStats(), start);
+        }
+      } finally {
+        endAttempt(cnx.getStats(), start);
+      }
+      return this.failed;
+    }
+    
+    private Object attemptRead(Connection cnx) throws Exception {
+      this.failed = true;
+      try {
+        Object result = attemptReadResponse(cnx);
+        this.failed = false;
+        return result;
+      } catch (SocketTimeoutException ste) {
+        this.failed = false;
+        this.timedOut = true;
+        throw ste;
+      } catch (Exception e) {
+        throw e;
+      }
+    }
+    
+    
+    /**
+     * Attempts to read a response to this operation by reading it from the
+     * given connection, and returning it.
+     * @param cnx the connection to read the response from
+     * @return the result of the operation
+     *         or <code>null</code> if the operation has no result.
+     * @throws Exception if the execute failed
+     */
+    protected Object attemptReadResponse(Connection cnx) throws Exception {
+      Message msg = createResponseMessage();
+      if (msg != null) {
+        msg.setComms(cnx.getSocket(), cnx.getInputStream(),
+            cnx.getOutputStream(),
+            ((ConnectionImpl)cnx).getCommBufferForAsyncRead(), cnx.getStats());
+        if (msg instanceof ChunkedMessage) {
+          try {
+            return processResponse(msg, cnx);
+          } finally {
+            msg.unsetComms();
+            // TODO (ashetkar) Handle the case when we fail to read the
+            // connection id.
+            processSecureBytes(cnx, msg);
+          }
+        }
+
+        try {
+          msg.recv();
+        } finally {
+          msg.unsetComms();
+          processSecureBytes(cnx, msg);
+        }
+        return processResponse(msg, cnx);
+      }
+      
+      return null;
+    }
+    
+    
+    private static int calcPartCount(List events) {
+      int numberOfParts = 4; // for the number of events and the batchId
+      for (Iterator i = events.iterator(); i.hasNext();) {
+        GatewaySenderEventImpl event = (GatewaySenderEventImpl)i.next();
+        numberOfParts += event.getNumberOfParts();
+      }
+      return numberOfParts;
+    }
+
+    @Override
+    protected void processSecureBytes(Connection cnx, Message message)
+        throws Exception {
+    }
+
+    @Override
+    protected boolean needsUserId() {
+      return false;
+    }
+
+    @Override
+    protected void sendMessage(Connection cnx) throws Exception {
+      getMessage().setEarlyAck((byte)(getMessage().getEarlyAckByte() & Message.MESSAGE_HAS_SECURE_PART));
+      getMessage().send(false);
+    }
+
+    @Override
+    protected Object processResponse(Message msg) throws Exception {
+      GatewayAck ack = null;
+      try {
+        // Read the header which describes the type of message following
+        switch (msg.getMessageType()) {
+        case MessageType.REPLY:
+          // Read the chunk
+          int batchId = msg.getPart(0).getInt();
+          int numEvents = msg.getPart(1).getInt();
+          ack = new GatewayAck(batchId, numEvents);
+          break;
+        case MessageType.EXCEPTION:
+          Part part0 = msg.getPart(0);
+
+          Object obj = part0.getObject();
+          if (obj instanceof List) {
+            List<BatchException70> l = (List<BatchException70>)part0.getObject();
+
+            if (logger.isDebugEnabled()) {
+              logger.debug("We got an exception from the GatewayReceiver. MessageType : {} obj :{}", msg.getMessageType(), obj);
+            }
+            // don't throw Exception but set it in the Ack
+            BatchException70 be = new BatchException70(l);
+            ack = new GatewayAck(be, l.get(0).getBatchId());
+
+          } else if (obj instanceof Throwable) {
+            String s = ": While reading Ack from receiver "
+                + ((Throwable)obj).getMessage();
+            throw new ServerOperationException(s, (Throwable)obj);
+          }
+          break;
+        default:
+          throw new InternalGemFireError(
+              LocalizedStrings.Op_UNKNOWN_MESSAGE_TYPE_0
+                  .toLocalizedString(Integer.valueOf(msg.getMessageType())));
+        }
+      } finally {
+        msg.clear();
+      }
+      return ack;
+    }
+    
+    @Override
+    protected boolean isErrorResponse(int msgType) {
+      return false;
+    }
+    @Override
+    protected long startAttempt(ConnectionStats stats) {
+      return stats.startGatewayBatch();
+    }
+    @Override
+    protected void endSendAttempt(ConnectionStats stats, long start) {
+      stats.endGatewayBatchSend(start, hasFailed());
+    }
+    @Override
+    protected void endAttempt(ConnectionStats stats, long start) {
+      stats.endGatewayBatch(start, hasTimedOut(), hasFailed());
+    }
+    
+    @Override
+    public boolean isGatewaySenderOp() {
+      return true;
+    }
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/SenderProxy.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/SenderProxy.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/SenderProxy.java
new file mode 100644
index 0000000..d2030b3
--- /dev/null
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/cache/client/internal/SenderProxy.java
@@ -0,0 +1,34 @@
+/*=========================================================================
+ * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.client.internal;
+
+import java.util.List;
+
+import com.gemstone.gemfire.cache.query.SelectResults;
+import com.gemstone.gemfire.distributed.internal.ServerLocation;
+
+/**
+ * Used to send operations from a sender to a receiver.
+ * @author skumar
+ * @since 8.1
+ */
+public class SenderProxy extends ServerProxy{
+  public SenderProxy(InternalPool pool) {
+    super(pool);
+  }
+
+  public void dispatchBatch_NewWAN(Connection con, List events, int batchId, boolean removeFromQueueOnException, boolean isRetry)
+  {
+    GatewaySenderBatchOp.executeOn(con, this.pool, events, batchId, removeFromQueueOnException, isRetry);
+  }
+  
+  public Object receiveAckFromReceiver(Connection con)
+  {
+    return GatewaySenderBatchOp.executeOn(con, this.pool);
+  }
+}


[46/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
new file mode 100644
index 0000000..e87cb0f
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
@@ -0,0 +1,1559 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.query.cq.dunit;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import util.TestException;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.EvictionAttributes;
+import com.gemstone.gemfire.cache.MirrorType;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.client.Pool;
+import com.gemstone.gemfire.cache.client.PoolFactory;
+import com.gemstone.gemfire.cache.client.PoolManager;
+import com.gemstone.gemfire.cache.query.CqAttributes;
+import com.gemstone.gemfire.cache.query.CqAttributesFactory;
+import com.gemstone.gemfire.cache.query.CqEvent;
+import com.gemstone.gemfire.cache.query.CqException;
+import com.gemstone.gemfire.cache.query.CqExistsException;
+import com.gemstone.gemfire.cache.query.CqListener;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.cache.query.RegionNotFoundException;
+import com.gemstone.gemfire.cache.query.SelectResults;
+import com.gemstone.gemfire.cache.query.Struct;
+import com.gemstone.gemfire.cache.query.data.Portfolio;
+import com.gemstone.gemfire.cache.query.internal.cq.CqQueryImpl;
+import com.gemstone.gemfire.cache.query.internal.cq.CqQueryImpl.TestHook;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.cache30.CacheTestCase;
+import com.gemstone.gemfire.cache30.CertifiableTestCacheListener;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.internal.AvailablePortHelper;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.internal.cache.PoolFactoryImpl;
+import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
+
+import dunit.AsyncInvocation;
+import dunit.Host;
+import dunit.SerializableRunnable;
+import dunit.VM;
+
+/**
+ * This class tests the ContiunousQuery mechanism in GemFire.
+ * This includes the test with different data activities.
+ *
+ * @author anil
+ */
+public class CqDataUsingPoolDUnitTest extends CacheTestCase {
+
+  protected CqQueryUsingPoolDUnitTest cqDUnitTest = new CqQueryUsingPoolDUnitTest("CqDataUsingPoolDUnitTest");
+  
+  public CqDataUsingPoolDUnitTest(String name) {
+    super(name);
+  }
+  
+  public void setUp() throws Exception {
+    super.setUp();
+    // avoid IllegalStateException from HandShake by connecting all vms tor
+    // system before creating ConnectionPools
+    getSystem();
+    invokeInEveryVM(new SerializableRunnable("getSystem") {
+      public void run() {
+        getSystem();
+      }
+    });
+    
+  }
+    
+  /**
+   * Tests with client acting as feeder/publisher and registering cq.
+   * Added wrt bug 37161.
+   * In case of InterestList the events are not sent back to the client
+   * if its the originator, this is not true for cq.
+   * 
+   * @throws Exception
+   */
+  public void testClientWithFeederAndCQ() throws Exception
+  {
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+
+    cqDUnitTest.createServer(server);
+
+    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+
+    String poolName = "testClientWithFeederAndCQ";
+    cqDUnitTest.createPool(client, poolName, host0, port);
+    
+    // Create client.
+    cqDUnitTest.createClient(client, port, host0);
+
+
+    cqDUnitTest.createCQ(client, poolName, "testClientWithFeederAndCQ_0", cqDUnitTest.cqs[0]);
+    cqDUnitTest.executeCQ(client, "testClientWithFeederAndCQ_0", false, null);
+
+    final int size = 10;
+    cqDUnitTest.createValues(client, cqDUnitTest.regions[0], size);
+    cqDUnitTest.waitForCreated(client, "testClientWithFeederAndCQ_0", CqQueryUsingPoolDUnitTest.KEY+size);
+
+    cqDUnitTest.validateCQ(client, "testClientWithFeederAndCQ_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server);
+    
+  }
+
+  /**
+   * Test for CQ Fail over/HA with redundancy level set.
+   * @throws Exception
+   */
+  public void testCQHAWithState() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM server3 = host.getVM(2);
+    
+    VM client = host.getVM(3);
+    
+    cqDUnitTest.createServer(server1);
+    
+    final int port1 = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+    
+    final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(2);
+    
+    cqDUnitTest.createServer(server2, ports[0]);
+    final int port2 = server2.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+            
+    // Create client - With 3 server endpoints and redundancy level set to 2.
+    
+    // Create client with redundancyLevel 1
+    //cqDUnitTest.createClient(client, new int[] {port1, port2, ports[1]}, host0, "1");
+    
+    String poolName = "testCQHAWithState";
+    cqDUnitTest.createPool(client, poolName, new String[] {host0, host0, host0}, new int[] {port1, port2, ports[1]}, "1");
+
+    // Create CQs.
+    int numCQs = 1;
+    for (int i=0; i < numCQs; i++) {
+      // Create CQs.
+      cqDUnitTest.createCQ(client, poolName, "testCQHAWithState_" + i, cqDUnitTest.cqs[i]);
+      cqDUnitTest.executeCQ(client, "testCQHAWithState_" + i, false, null);
+    }
+    
+    pause(1 * 1000);
+    
+    int size = 10;
+    
+    // CREATE.
+    cqDUnitTest.createValues(server1, cqDUnitTest.regions[0], size);
+    cqDUnitTest.createValues(server1, cqDUnitTest.regions[1], size);
+    
+    for (int i=1; i <= size; i++) {
+      cqDUnitTest.waitForCreated(client, "testCQHAWithState_0", CqQueryUsingPoolDUnitTest.KEY + i);
+    }
+    
+    // Clients expected initial result.
+    int[] resultsCnt = new int[] {10, 1, 2};
+
+    for (int i=0; i < numCQs; i++) {
+      cqDUnitTest.validateCQ(client, "testCQHAWithState_" + i, CqQueryUsingPoolDUnitTest.noTest, resultsCnt[i], 0, 0);
+    }    
+
+    // Close server1.
+    // To maintain the redundancy; it will make connection to endpoint-3.
+    cqDUnitTest.closeServer(server1);
+    pause(3 * 1000);
+    
+    
+    // UPDATE-1.
+    cqDUnitTest.createValues(server2, cqDUnitTest.regions[0], 10);
+    cqDUnitTest.createValues(server2, cqDUnitTest.regions[1], 10);
+    
+    for (int i=1; i <= size; i++) {
+      cqDUnitTest.waitForUpdated(client, "testCQHAWithState_0", CqQueryUsingPoolDUnitTest.KEY + size);
+    }
+    
+    for (int i=0; i < numCQs; i++) {
+      cqDUnitTest.validateCQ(client, "testCQHAWithState_" + i, CqQueryUsingPoolDUnitTest.noTest, resultsCnt[i], resultsCnt[i], CqQueryUsingPoolDUnitTest.noTest);
+    }    
+
+    //Stop cq.
+    cqDUnitTest.stopCQ(client, "testCQHAWithState_0");
+    
+    pause(2 * 1000);
+    
+    // UPDATE with stop.
+    cqDUnitTest.createServer(server3, ports[1]);
+    server3.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    pause(2 * 1000);
+    
+    cqDUnitTest.clearCQListenerEvents(client, "testCQHAWithState_0");
+    
+    cqDUnitTest.createValues(server2, cqDUnitTest.regions[0], 10);    
+    cqDUnitTest.createValues(server2, cqDUnitTest.regions[1], 10);
+    
+    // Wait for events at client.
+    try {
+      cqDUnitTest.waitForUpdated(client, "testCQHAWithState_0", CqQueryUsingPoolDUnitTest.KEY + 1);
+      fail("Events not expected since CQ is in stop state.");
+    } catch (Exception ex) {
+      // Success.
+    }
+    
+    cqDUnitTest.executeCQ(client, "testCQHAWithState_0", false, null);
+
+    // Update - 2 
+    cqDUnitTest.createValues(server3, cqDUnitTest.regions[0], 10);    
+    cqDUnitTest.createValues(server3, cqDUnitTest.regions[1], 10);
+    
+    for (int i=1; i <= size; i++) {
+      cqDUnitTest.waitForUpdated(client, "testCQHAWithState_0", CqQueryUsingPoolDUnitTest.KEY + size);
+    }
+
+    for (int i=0; i < numCQs; i++) {
+      cqDUnitTest.validateCQ(client, "testCQHAWithState_" + i, CqQueryUsingPoolDUnitTest.noTest, resultsCnt[i], resultsCnt[i] * 2, CqQueryUsingPoolDUnitTest.noTest);
+    }    
+    
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server2);
+    cqDUnitTest.closeServer(server3);
+  }
+
+  
+  
+  /**
+   * Tests propogation of invalidates and destorys to the clients. Bug 37242.
+   * 
+   * @throws Exception
+   */
+  public void testCQWithDestroysAndInvalidates() throws Exception
+  {
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    VM producer = host.getVM(2);
+    cqDUnitTest.createServer(server, 0, true);
+    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+
+    String poolName = "testCQWithDestroysAndInvalidates";
+    cqDUnitTest.createPool(client, poolName, host0, port);
+
+    // Create client.
+    //cqDUnitTest.createClient(client, port, host0);
+    
+    // producer is not doing any thing.
+    cqDUnitTest.createClient(producer, port, host0);
+
+    final int size = 10;
+    final String name = "testQuery_4";
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], size);
+
+    cqDUnitTest.createCQ(client, poolName, name, cqDUnitTest.cqs[4]);
+    cqDUnitTest.executeCQ(client, name, true, null);
+    
+    // do destroys and invalidates.
+    server.invoke(new CacheSerializableRunnable("Create values") {
+      public void run2() throws CacheException
+      {
+        Region region1 = getRootRegion().getSubregion(cqDUnitTest.regions[0]);
+        for (int i = 1; i <= 5; i++) {
+          region1.destroy( CqQueryUsingPoolDUnitTest.KEY + i);
+        }
+      }
+    });
+    for (int i = 1; i <= 5; i++) {
+      cqDUnitTest.waitForDestroyed(client, name , CqQueryUsingPoolDUnitTest.KEY+i);
+    }
+    // recreate the key values from 1 - 5
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], 5);
+    // wait for all creates to arrive.
+    for (int i = 1; i <= 5; i++) {
+      cqDUnitTest.waitForCreated(client, name , CqQueryUsingPoolDUnitTest.KEY+i);
+    }
+    
+    // do more puts to push first five key-value to disk.
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], 10);
+    // do invalidates on fisrt five keys.
+    server.invoke(new CacheSerializableRunnable("Create values") {
+      public void run2() throws CacheException
+      {
+        Region region1 = getRootRegion().getSubregion(cqDUnitTest.regions[0]);
+        for (int i = 1; i <= 5; i++) {
+          region1.invalidate( CqQueryUsingPoolDUnitTest.KEY + i);
+        }
+      }
+    });
+    // wait for invalidates now.
+    for (int i = 1; i <= 5; i++) {
+      cqDUnitTest.waitForInvalidated(client, name , CqQueryUsingPoolDUnitTest.KEY+i);
+    }
+        
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server);
+  
+  }
+  
+  /**
+   * Tests make sure that the second client doesnt get more
+   * events then there should be. This will test the fix for 
+   * bug 37295.
+   * 
+   * @author rdubey
+   */
+  public void testCQWithMultipleClients() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client1 = host.getVM(1);
+    VM client2 = host.getVM(2);
+    VM client3 = host.getVM(3);
+    
+    /* Create Server and Client */
+    cqDUnitTest.createServer(server);
+    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+
+    String poolName1 = "testCQWithMultipleClients1";
+    String poolName2 = "testCQWithMultipleClients2";
+
+    cqDUnitTest.createPool(client1, poolName1, host0, port);
+    cqDUnitTest.createPool(client2, poolName2, host0, port);
+    
+    //cqDUnitTest.createClient(client1, port, host0);
+    //cqDUnitTest.createClient(client2, port, host0);
+    
+    /* Create CQs. and initialize the region */
+    // this should statisfy every thing since id is always greater than 
+    // zero.
+    cqDUnitTest.createCQ(client1, poolName1, "testCQWithMultipleClients_0", cqDUnitTest.cqs[0]);
+    cqDUnitTest.executeCQ(client1, "testCQWithMultipleClients_0", false, null);
+    // should only satisfy one key-value pair in the region.
+    cqDUnitTest.createCQ(client2, poolName2, "testCQWithMultipleClients_0", cqDUnitTest.cqs[1]);
+    cqDUnitTest.executeCQ(client2, "testCQWithMultipleClients_0", false, null);
+    
+    int size = 10;
+    
+    // Create Values on Server.
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], size);
+    
+    
+    cqDUnitTest.waitForCreated(client1, "testCQWithMultipleClients_0", CqQueryUsingPoolDUnitTest.KEY + 10);
+    
+    
+    /* Validate the CQs */
+    cqDUnitTest.validateCQ(client1, "testCQWithMultipleClients_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    
+    cqDUnitTest.waitForCreated(client2, "testCQWithMultipleClients_0", CqQueryUsingPoolDUnitTest.KEY + 2 );
+    
+    
+    cqDUnitTest.validateCQ(client2, "testCQWithMultipleClients_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ 1,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ 1,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ 1);
+         
+        
+    /* Close Server and Client */
+    cqDUnitTest.closeClient(client2);
+    cqDUnitTest.closeClient(client3);
+    cqDUnitTest.closeServer(server);
+  }
+
+  /**
+   * Test for CQ when region is populated with net load.
+   * @throws Exception
+   */
+  public void testCQWithLoad() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    
+    VM client = host.getVM(2);
+    
+    cqDUnitTest.createServer(server1, 0, false, MirrorType.KEYS_VALUES);
+    cqDUnitTest.createServer(server2, 0, false, MirrorType.KEYS);
+        
+    final int port1 = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+    
+    String poolName = "testCQWithLoad";
+    cqDUnitTest.createPool(client, poolName, host0, port1);
+
+    //cqDUnitTest.createClient(client, port1, host0);
+    
+    // Create CQs.
+    cqDUnitTest.createCQ(client, poolName, "testCQWithLoad_0", cqDUnitTest.cqs[0]);  
+    cqDUnitTest.executeCQ(client, "testCQWithLoad_0", false, null); 
+    
+    pause(1 * 1000);
+    
+    final int size = 10;
+    
+    // CREATE VALUES.
+    cqDUnitTest.createValues(server2, cqDUnitTest.regions[0], size);
+    
+    server1.invoke(new CacheSerializableRunnable("Load from second server") {
+      public void run2() throws CacheException {
+        Region region1 = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        for (int i=1; i <= size; i++){
+          region1.get(CqQueryUsingPoolDUnitTest.KEY + i);
+        }
+      }
+    });
+    
+    for (int i=1; i <= size; i++) {
+      cqDUnitTest.waitForCreated(client, "testCQWithLoad_0", CqQueryUsingPoolDUnitTest.KEY + i);
+    }
+        
+    cqDUnitTest.validateCQ(client, "testCQWithLoad_0", CqQueryUsingPoolDUnitTest.noTest, size, 0, 0);
+        
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server1);
+    cqDUnitTest.closeServer(server2);
+  }
+
+  /**
+   * Test for CQ when entries are evicted from region.
+   * @throws Exception
+   */
+  public void testCQWithEviction() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    
+    VM client = host.getVM(2);
+    
+    //cqDUnitTest.createServer(server1, 0, false, MirrorType.NONE);
+
+    final int evictionThreshold = 5;
+    server1.invoke(new CacheSerializableRunnable("Create Cache Server") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Create Cache Server. ###");
+        AttributesFactory factory = new AttributesFactory();
+        factory.setScope(Scope.DISTRIBUTED_ACK);
+        factory.setMirrorType(MirrorType.NONE);
+
+        // setting the eviction attributes.
+        factory.setEvictionAttributes(EvictionAttributes.createLRUEntryAttributes(evictionThreshold));
+        for (int i = 0; i < cqDUnitTest.regions.length; i++) { 
+          Region region = createRegion(cqDUnitTest.regions[i], factory.createRegionAttributes());
+          // Set CacheListener.
+          region.getAttributesMutator().setCacheListener(new CertifiableTestCacheListener(getLogWriter()));  
+        } 
+        pause(2000);
+        
+        try {
+          cqDUnitTest.startBridgeServer(0, true);
+        } catch (Exception ex) {
+          fail("While starting CacheServer", ex);
+        }
+        pause(2000);
+
+      }
+    });
+
+    cqDUnitTest.createServer(server2, 0, false, MirrorType.NONE);
+        
+    final int port1 = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+      
+    String poolName = "testCQWithEviction";
+    cqDUnitTest.createPool(client, poolName, host0, port1);
+
+    //cqDUnitTest.createClient(client, port1, host0);
+    
+    // Create CQs.
+    cqDUnitTest.createCQ(client, poolName, "testCQWithEviction_0", cqDUnitTest.cqs[0]);  
+
+    // This should fail as Region is not replicated.
+    // There is a bug37966 filed on this.
+    try {
+      cqDUnitTest.executeCQ(client, "testCQWithEviction_0", false, "CqException"); 
+      fail("Should have thrown exception, cq not supported on Non-replicated region.");
+    } catch (Exception ex) {
+      // Ignore  expected.
+    }
+    
+    pause(1 * 1000);
+    
+    final int size = 10;
+    
+    // CREATE VALUES.
+    cqDUnitTest.createValues(server2, cqDUnitTest.regions[0], size);
+    
+    server1.invoke(new CacheSerializableRunnable("Load from second server") {
+      public void run2() throws CacheException {
+        Region region1 = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        for (int i=1; i <= size; i++){
+          region1.get(CqQueryUsingPoolDUnitTest.KEY + i);
+        }
+      }
+    });
+    
+    //for (int i=1; i <= size; i++) {
+    //  cqDUnitTest.waitForCreated(client, "testCQWithEviction_0", cqDUnitTest.KEY + i);
+    //}
+        
+    pause(2 * 1000);
+    
+    server1.invoke(new CacheSerializableRunnable("validate destroy") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(cqDUnitTest.regions[0]);
+        assertNotNull(region);
+        
+        Set keys = region.entrySet();
+        int keyCnt= size - evictionThreshold;
+        assertEquals("Mismatch, number of keys in local region is not equal to the expected size", 
+          keyCnt, keys.size());
+        
+        CertifiableTestCacheListener ctl = (CertifiableTestCacheListener) region.getAttributes().getCacheListener();
+        for (int i = 1; i <= keyCnt; i++) {
+          ctl.waitForDestroyed(CqQueryUsingPoolDUnitTest.KEY+i);
+          assertNull(region.getEntry(CqQueryUsingPoolDUnitTest.KEY+i));
+        }
+      }
+    });
+
+    // There should not be any destroy events.
+    //cqDUnitTest.validateCQ(client, "testCQWithEviction_0", cqDUnitTest.noTest, size, 0, 0);
+        
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server1);
+    cqDUnitTest.closeServer(server2);
+  }
+  
+  
+  /**
+   * Test for CQ with establishCallBackConnection.
+   * @throws Exception
+   */
+  public void testCQWithEstablishCallBackConnection() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM client = host.getVM(1);
+
+    cqDUnitTest.createServer(server1, 0, false, MirrorType.KEYS_VALUES);
+
+    final int port1 = server1.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String serverHost = getServerHostName(server1.getHost());
+
+//    final String[] regions = cqDUnitTest.regions;
+//    final int[] serverPorts = new int[] {port1};
+
+    final String poolName = "testCQWithEstablishCallBackConnection";
+
+    client.invoke(new CacheSerializableRunnable("createPool :" + poolName) {
+      public void run2() throws CacheException {
+        // Create Cache.
+        getCache();
+        
+        PoolFactory cpf = PoolManager.createFactory();
+        cpf.setSubscriptionEnabled(false);        
+        cpf.addServer(serverHost, port1);
+        cpf.create(poolName);
+      }
+    });   
+
+    // Create CQs.
+    cqDUnitTest.createCQ(client, poolName, "testCQWithEstablishCallBackConnection_0", cqDUnitTest.cqs[0]);  
+
+    // This should fail.
+    try {
+      cqDUnitTest.executeCQ(client, "testCQWithEstablishCallBackConnection_0", false, "CqException");
+      fail("Test should have failed with connection with establishCallBackConnection not found.");
+    } catch (Exception ex) {
+      // Expected.
+    }
+
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server1);
+  }
+  
+  /**
+   * Test for:
+   * Region destroy, calls close on the server.
+   * Region clear triggers cqEvent with query op region clear.
+   * Region invalidate triggers cqEvent with query op region invalidate.
+   * @throws Exception
+   */
+  public void testRegionEvents() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    
+    cqDUnitTest.createServer(server);
+    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    
+    String poolName = "testRegionEvents";
+    cqDUnitTest.createPool(client, poolName, host0, port);
+
+    //cqDUnitTest.createClient(client, port, host0);
+    
+    // Create CQ on regionA
+    cqDUnitTest.createCQ(client, poolName, "testRegionEvents_0", cqDUnitTest.cqs[0]);
+    cqDUnitTest.executeCQ(client, "testRegionEvents_0", false, null);
+    
+    // Create CQ on regionB
+    cqDUnitTest.createCQ(client, poolName, "testRegionEvents_1", cqDUnitTest.cqs[2]);
+    cqDUnitTest.executeCQ(client, "testRegionEvents_1", false, null);
+
+    // Test for Event on Region Clear.
+    server.invoke(new CacheSerializableRunnable("testRegionEvents"){
+      public void run2()throws CacheException {
+        getLogWriter().info("### Clearing the region on the server ###");
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        for (int i = 1; i <=5; i++) {
+          region.put(CqQueryUsingPoolDUnitTest.KEY+i, new Portfolio(i));
+        }
+        region.clear();
+      }
+    });
+    
+    cqDUnitTest.waitForRegionClear(client,"testRegionEvents_0");
+
+    // Test for Event on Region invalidate.
+    server.invoke(new CacheSerializableRunnable("testRegionEvents"){
+      public void run2()throws CacheException {
+        getLogWriter().info("### Invalidate the region on the server ###");
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        for (int i = 1; i <=5; i++) {
+          region.put(CqQueryUsingPoolDUnitTest.KEY+i, new Portfolio(i));
+        }
+        region.invalidateRegion();
+      }
+    });
+
+    cqDUnitTest.waitForRegionInvalidate(client,"testRegionEvents_0");
+
+    // Test for Event on Region destroy.
+    server.invoke(new CacheSerializableRunnable("testRegionEvents"){
+      public void run2()throws CacheException {
+        getLogWriter().info("### Destroying the region on the server ###");
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[1]);
+        for (int i = 1; i <=5; i++) {
+          region.put(CqQueryUsingPoolDUnitTest.KEY+i, new Portfolio(i));
+        }
+        // this should close one cq on client.
+        region.destroyRegion();
+      }
+    });
+
+    pause(1000); // wait for cq to close becuse of region destroy on server.
+    //cqDUnitTest.waitForClose(client,"testRegionEvents_1");
+    cqDUnitTest.validateCQCount(client,1);
+
+        
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server);
+
+  }
+
+  /**
+   * Test for events created during the CQ query execution.
+   * When CQs are executed using executeWithInitialResults 
+   * there may be possibility that the region changes during
+   * that time may not be reflected in the query result set
+   * thus making the query data and region data inconsistent.
+   * @throws Exception
+   */
+  public void testEventsDuringQueryExecution() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    final VM client = host.getVM(1);
+    final String cqName = "testEventsDuringQueryExecution_0";
+    cqDUnitTest.createServer(server);
+    
+    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+ 
+    String poolName = "testEventsDuringQueryExecution";
+    cqDUnitTest.createPool(client, poolName, host0, port);
+    
+    // create CQ.
+    cqDUnitTest.createCQ(client, poolName, cqName, cqDUnitTest.cqs[0]);
+
+    final int numObjects = 200;
+    final int totalObjects = 500;
+    
+    // initialize Region.
+    server.invoke(new CacheSerializableRunnable("Update Region"){
+      public void run2()throws CacheException {
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        for (int i = 1; i <= numObjects; i++) {
+          Portfolio p = new Portfolio(i);
+          region.put(""+i, p);
+        }
+      }
+    });
+    
+    // First set testhook in executeWithInitialResults so that queued events
+    // are not drained before we verify there number.    
+    client.invoke(setTestHook());    
+    
+    // Execute CQ while update is in progress.
+    AsyncInvocation executeCq = client.invokeAsync(new CacheSerializableRunnable("Execute CQ AsyncInvoke") {
+      public void run2()throws CacheException {
+        QueryService cqService = getCache().getQueryService();
+        // Get CqQuery object.
+        CqQuery cq1 = cqService.getCq(cqName);
+        if (cq1 == null) {
+          fail("Failed to get CQ " + cqName);
+        }
+        SelectResults cqResults = null;
+        try {
+          cqResults = cq1.executeWithInitialResults();
+        } catch (Exception ex){
+          fail("CQ execution failed", ex);
+        }
+
+        // Check num of events received during executeWithInitialResults.
+        final TestHook testHook = CqQueryImpl.testHook;
+        waitForCriterion(new WaitCriterion() {
+
+          @Override
+          public boolean done() {
+            return testHook.numQueuedEvents() > 0;
+          }
+          
+          @Override
+          public String description() {
+            return "No queued events found.";
+          }
+        }, 3000, 5, true);
+        
+        getCache().getLogger().fine("Queued Events Size" + testHook.numQueuedEvents());
+        // Make sure CQEvents are queued during execute with initial results.
+        
+        CqQueryTestListener cqListener = (CqQueryTestListener)cq1.getCqAttributes().getCqListener();
+        // Wait for the last key to arrive.
+        cqListener.waitForCreated("" + totalObjects);
+        
+        // Check if the events from CqListener are in order.
+        int oldId = 0;
+        for (Object cqEvent : cqListener.events.toArray()) { 
+          int newId = new Integer(cqEvent.toString()).intValue();
+          if (oldId > newId){
+            fail("Queued events for CQ Listener during execution with " + 
+                "Initial results is not in the order in which they are created.");
+          }
+          oldId = newId;
+        }
+
+        // Check if all the IDs are present as part of Select Results and CQ Events.
+        HashSet ids = new HashSet(cqListener.events);
+    
+        for (Object o : cqResults.asList()) {
+          Struct s = (Struct)o;
+          ids.add(s.get("key"));
+        }
+
+        HashSet missingIds = new HashSet();
+        String key = "";
+        for (int i = 1; i <= totalObjects; i++) {
+          key = "" + i;
+          if (!(ids.contains(key))){
+            missingIds.add(key);
+          }
+        }
+        
+        if (!missingIds.isEmpty()) {
+          fail("Missing Keys in either ResultSet or the Cq Event list. " +
+              " Missing keys : [size : " + missingIds.size() + "]" + missingIds +
+              " Ids in ResultSet and CQ Events :" + ids);
+        }
+      }
+    });
+
+    // Keep updating region (async invocation).
+    server.invoke(new CacheSerializableRunnable("Update Region"){
+      public void run2()throws CacheException {
+        pause(200);
+        client.invoke(new CacheSerializableRunnable("Releasing the latch") {
+          public void run2()throws CacheException {
+            // Now release the testhook so that CQListener can proceed.
+            final TestHook testHook = CqQueryImpl.testHook;
+            testHook.ready();
+          }
+        });
+        Region region = getCache().getRegion("/root/" + cqDUnitTest.regions[0]);
+        for (int i = numObjects + 1; i <= totalObjects; i++) {
+          Portfolio p = new Portfolio(i);
+          region.put(""+i, p);
+        }
+      }
+    });
+
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server);
+
+  }
+
+  public void testCqStatInitializationTimingIssue() {
+    
+    //The async close can cause this exception on the server
+    addExpectedException("java.net.SocketException: Broken pipe");
+    final String regionName = "testCqStatInitializationTimingIssue";
+    final String cq1Name = "testCq1";
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    VM client2 = host.getVM(2);
+ 
+    // Start server 1
+    final int server1Port = ((Integer) server.invoke(CacheServerTestUtil.class,
+        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+        .intValue();
+    
+    // Start a  client
+    client.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(client.getHost()), server1Port), regionName});
+    
+    // Start a pub client
+    client2.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(client2.getHost()), server1Port), regionName});
+    
+    //client has thread that invokes new and remove cq over and over
+    client.invokeAsync(new CacheSerializableRunnable("Register cq") {
+      public void run2() throws CacheException {
+        for (int i = 0; i < 10000; i++) {
+          CqQuery query = createCq(regionName, cq1Name);
+          if (query != null) {
+            try {              
+              query.close();
+            }
+            catch (Exception e) {
+              System.out.println("exception while closing cq:" + e);
+            }
+          }
+        }
+      }
+    });
+    
+    client2.invokeAsync(new CacheSerializableRunnable("pub updates") {
+      public void run2() throws CacheException {
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        while (true) {
+          for (int i = 0; i < 50000; i++) {
+            region.put("" + i, "" + Math.random());
+          }
+        }
+      }
+    });
+    
+    server.invokeAsync(new CacheSerializableRunnable("pub updates") {
+      public void run2() throws CacheException {
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        while (true) {
+          for (int i = 0; i < 50000; i++) {
+            region.put("" + i, "" + Math.random());
+          }
+        }
+      }
+    });
+    
+    //client has another thread that retrieves cq map and checks stat over and over
+    client.invoke(new CacheSerializableRunnable("Check Stats") {
+      public void run2() throws CacheException {
+        for (int i = 0; i < 10000; i++) {
+          checkCqStats(cq1Name);
+        }
+      }
+    });
+    
+    client.invoke(CacheServerTestUtil.class, "closeCache");
+    client2.invoke(CacheServerTestUtil.class, "closeCache");
+    server.invoke(CacheServerTestUtil.class, "closeCache");
+  }
+  
+  public void testGetDurableCQsFromPoolOnly() throws Exception {
+    final String regionName = "regionA";
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client1 = host.getVM(1);
+    VM client2 = host.getVM(2);
+    
+    /* Create Server and Client */
+    cqDUnitTest.createServer(server);
+    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+  
+    final String poolName1 = "pool1";
+    final String poolName2 = "pool2";
+  
+    cqDUnitTest.createPool(client1, poolName1, host0, port);
+    cqDUnitTest.createPool(client2, poolName2, host0, port);
+    
+    client1.invoke(new CacheSerializableRunnable("Register cq for client 1") {
+      public void run2() throws CacheException {
+    
+        QueryService queryService = null;
+        try {
+          queryService = (PoolManager.find(poolName1)).getQueryService();
+        } catch (Exception cqe) {
+          fail("Failed to getCQService.", cqe);
+        }
+        try {
+          CqAttributesFactory cqAf = new CqAttributesFactory();
+          CqAttributes attributes = cqAf.create();
+          queryService.newCq("client1DCQ1", "Select * From /root/" + regionName + " where id = 1", attributes, true).execute();
+          queryService.newCq("client1DCQ2", "Select * From /root/" + regionName + " where id = 10", attributes, true).execute();
+          queryService.newCq("client1NoDC1", "Select * From /root/" + regionName, attributes, false).execute();
+          queryService.newCq("client1NoDC2", "Select * From /root/" + regionName + " where id = 3", attributes, false).execute();
+        }
+        catch (CqException e) {
+          throw new CacheException(e) {
+            
+          };
+        }
+        catch (CqExistsException e) {
+          throw new CacheException(e) {
+            
+          };
+        }
+        catch (RegionNotFoundException e) {
+          throw new CacheException(e) {
+            
+          };
+        }
+      }
+    });
+    
+    client2.invoke(new CacheSerializableRunnable("Register cq for client 2") {
+      public void run2() throws CacheException {
+    
+        QueryService queryService = null;
+        try {
+          queryService = (PoolManager.find(poolName2)).getQueryService();
+        } catch (Exception cqe) {
+          fail("Failed to getCQService.", cqe);
+        }
+        try {
+          CqAttributesFactory cqAf = new CqAttributesFactory();
+          CqAttributes attributes = cqAf.create();
+          queryService.newCq("client2DCQ1", "Select * From /root/" + regionName + " where id = 1", attributes, true).execute();
+          queryService.newCq("client2DCQ2", "Select * From /root/" + regionName + " where id = 10", attributes, true).execute();
+          queryService.newCq("client2DCQ3", "Select * From /root/" + regionName, attributes, true).execute();
+          queryService.newCq("client2DCQ4", "Select * From /root/" + regionName + " where id = 3", attributes, true).execute();
+        }
+        catch (CqException e) {
+          throw new CacheException(e) {
+            
+          };
+        }
+        catch (CqExistsException e) {
+          throw new CacheException(e) {
+            
+          };
+        }
+        catch (RegionNotFoundException e) {
+          throw new CacheException(e) {
+            
+          };
+        }
+      }
+    });
+    
+    client2.invoke(new CacheSerializableRunnable("test getDurableCQsFromServer for client2") {
+      public void run2() throws CacheException {
+        QueryService queryService = null;
+        try {
+          queryService = (PoolManager.find(poolName2)).getQueryService();
+        } catch (Exception cqe) {
+          fail("Failed to getCQService.", cqe);
+        }
+        List<String> list;
+        try {
+          list = queryService.getAllDurableCqsFromServer();
+        }
+        catch (CqException e) {
+          throw new CacheException(e) {
+            
+          };
+        }
+        assertEquals(4, list.size());
+        assertTrue(list.contains("client2DCQ1"));
+        assertTrue(list.contains("client2DCQ2"));
+        assertTrue(list.contains("client2DCQ3"));
+        assertTrue(list.contains("client2DCQ4"));
+      }
+    });
+    
+    client1.invoke(new CacheSerializableRunnable("test getDurableCQsFromServer for client1") {
+      public void run2() throws CacheException {
+        QueryService queryService = null;
+        try {
+          queryService = (PoolManager.find(poolName1)).getQueryService();
+        } catch (Exception cqe) {
+          fail("Failed to getCQService.", cqe);
+        }
+        List<String> list;
+        try {
+          list = queryService.getAllDurableCqsFromServer();
+        }
+        catch (CqException e) {
+          throw new CacheException(e) {
+            
+          };
+        }
+        assertEquals(2, list.size());
+        assertTrue(list.contains("client1DCQ1"));
+        assertTrue(list.contains("client1DCQ2"));
+      }
+    });
+    
+    cqDUnitTest.closeClient(client2);
+    cqDUnitTest.closeClient(client1);
+    cqDUnitTest.closeServer(server);
+  }
+  
+  public void testGetDurableCQsFromServerWithEmptyList() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client1 = host.getVM(1);
+    
+    /* Create Server and Client */
+    cqDUnitTest.createServer(server);
+    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+  
+    final String poolName1 = "pool1";
+  
+    cqDUnitTest.createPool(client1, poolName1, host0, port);
+    
+    client1.invoke(new CacheSerializableRunnable("test getDurableCQsFromServer for client1") {
+      public void run2() throws CacheException {
+        QueryService queryService = null;
+        try {
+          queryService = (PoolManager.find(poolName1)).getQueryService();
+        } catch (Exception cqe) {
+          fail("Failed to getCQService.", cqe);
+        }
+        List<String> list;
+        try {
+          list = queryService.getAllDurableCqsFromServer();
+        }
+        catch (CqException e) {
+          throw new CacheException(e) {
+            
+          };
+        }
+        assertEquals(0, list.size());
+        assertFalse(list.contains("client1DCQ1"));
+        assertFalse(list.contains("client1DCQ2"));
+      }
+    });
+    
+    cqDUnitTest.closeClient(client1);
+    cqDUnitTest.closeServer(server);
+  }
+  
+  public void testGetDurableCqsFromServer() {
+    final String regionName = "testGetAllDurableCqsFromServer";
+    final String cq1Name = "testCq1";
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client1 = host.getVM(1);
+    VM client2 = host.getVM(2);
+ 
+    // Start server 1
+    final int server1Port = ((Integer) server.invoke(CacheServerTestUtil.class,
+        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+        .intValue();
+    
+    // Start client 1
+    client1.invoke(CacheServerTestUtil.class, "createClientCache", 
+        new Object[] {getClientPool(getServerHostName(client1.getHost()), server1Port), regionName});
+    
+    // Start client 2
+    client2.invoke(CacheServerTestUtil.class, "createClientCache", 
+        new Object[] {getClientPool(getServerHostName(client2.getHost()), server1Port), regionName});
+    
+    createClient1CqsAndDurableCqs(client1, regionName);
+    createClient2CqsAndDurableCqs(client2, regionName);
+    
+    client2.invoke(new CacheSerializableRunnable("check durable cqs for client 2") {
+      public void run2() throws CacheException {
+        QueryService queryService = CacheServerTestUtil.getCache().getQueryService();
+        List<String> list;
+        try {
+          list = queryService.getAllDurableCqsFromServer();
+        }
+        catch (CqException e) {
+          throw new CacheException(e) {};
+        }
+        assertEquals(4, list.size());
+        assertTrue(list.contains("client2DCQ1"));
+        assertTrue(list.contains("client2DCQ2"));
+        assertTrue(list.contains("client2DCQ3"));
+        assertTrue(list.contains("client2DCQ4"));
+      }
+    });
+    
+    client1.invoke(new CacheSerializableRunnable("check durable cqs for client 1") {
+      public void run2() throws CacheException {
+        QueryService queryService = CacheServerTestUtil.getCache().getQueryService();
+        List<String> list;
+        try {
+          list = queryService.getAllDurableCqsFromServer();
+        }
+        catch (CqException e) {
+          throw new CacheException(e) {};
+        }
+        assertEquals(2, list.size());
+        assertTrue(list.contains("client1DCQ1"));
+        assertTrue(list.contains("client1DCQ2"));
+      }
+    });
+    
+    client1.invoke(CacheServerTestUtil.class, "closeCache");
+    client2.invoke(CacheServerTestUtil.class, "closeCache");
+    server.invoke(CacheServerTestUtil.class, "closeCache");
+  }
+  
+  public void testGetDurableCqsFromServerCycleClients() {
+    final String regionName = "testGetAllDurableCqsFromServerCycleClients";
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client1 = host.getVM(1);
+    VM client2 = host.getVM(2);
+    int timeout = 60000;
+    // Start server 1
+    final int server1Port = ((Integer) server.invoke(CacheServerTestUtil.class,
+        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+        .intValue();
+    
+    // Start client 1
+    client1.invoke(CacheServerTestUtil.class, "createClientCache", 
+        new Object[] {getClientPool(getServerHostName(client1.getHost()), server1Port), regionName, getDurableClientProperties("client1_dc", timeout)});
+    
+    // Start client 2
+    client2.invoke(CacheServerTestUtil.class, "createClientCache", 
+        new Object[] {getClientPool(getServerHostName(client2.getHost()), server1Port), regionName, getDurableClientProperties("client2_dc", timeout)});
+    
+    createClient1CqsAndDurableCqs(client1, regionName);
+    createClient2CqsAndDurableCqs(client2, regionName);
+    
+    cycleDurableClient(client1, "client1_dc", server1Port, regionName, timeout);
+    cycleDurableClient(client2, "client2_dc", server1Port, regionName, timeout);
+    
+    client2.invoke(new CacheSerializableRunnable("check durable cqs for client 2") {
+      public void run2() throws CacheException {
+        QueryService queryService = CacheServerTestUtil.getCache().getQueryService();
+        List<String> list;
+        try {
+          list = queryService.getAllDurableCqsFromServer();
+        }
+        catch (CqException e) {
+          throw new CacheException(e) {};
+        }
+        assertEquals(4, list.size());
+        assertTrue(list.contains("client2DCQ1"));
+        assertTrue(list.contains("client2DCQ2"));
+        assertTrue(list.contains("client2DCQ3"));
+        assertTrue(list.contains("client2DCQ4"));
+      }
+    });
+    
+    client1.invoke(new CacheSerializableRunnable("check durable cqs for client 1") {
+      public void run2() throws CacheException {
+        QueryService queryService = CacheServerTestUtil.getCache().getQueryService();
+        List<String> list;
+        try {
+          list = queryService.getAllDurableCqsFromServer();
+        }
+        catch (CqException e) {
+          throw new CacheException(e) {};
+        }
+        assertEquals(2, list.size());
+        assertTrue(list.contains("client1DCQ1"));
+        assertTrue(list.contains("client1DCQ2"));
+      }
+    });
+    
+    client1.invoke(CacheServerTestUtil.class, "closeCache");
+    client2.invoke(CacheServerTestUtil.class, "closeCache");
+    server.invoke(CacheServerTestUtil.class, "closeCache");
+  }
+  
+  public void testGetDurableCqsFromServerCycleClientsAndMoreCqs() {
+    final String regionName = "testGetAllDurableCqsFromServerCycleClients";
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client1 = host.getVM(1);
+    VM client2 = host.getVM(2);
+    int timeout = 60000;
+    // Start server 1
+    final int server1Port = ((Integer) server.invoke(CacheServerTestUtil.class,
+        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+        .intValue();
+    
+    // Start client 1
+    client1.invoke(CacheServerTestUtil.class, "createClientCache", 
+        new Object[] {getClientPool(getServerHostName(client1.getHost()), server1Port), regionName, getDurableClientProperties("client1_dc", timeout)});
+    
+    // Start client 2
+    client2.invoke(CacheServerTestUtil.class, "createClientCache", 
+        new Object[] {getClientPool(getServerHostName(client2.getHost()), server1Port), regionName, getDurableClientProperties("client2_dc", timeout)});
+    
+    //create the test cqs
+    createClient1CqsAndDurableCqs(client1, regionName);
+    createClient2CqsAndDurableCqs(client2, regionName);
+    
+    cycleDurableClient(client1, "client1_dc", server1Port, regionName, timeout);
+    cycleDurableClient(client2, "client2_dc", server1Port, regionName, timeout);
+    
+    client1.invoke(new CacheSerializableRunnable("Register more cq for client 1") {
+      public void run2() throws CacheException {
+        //register the cq's
+        QueryService queryService = CacheServerTestUtil.getCache().getQueryService();
+        CqAttributesFactory cqAf = new CqAttributesFactory();
+        CqAttributes attributes = cqAf.create();
+        try {
+          queryService.newCq("client1MoreDCQ1", "Select * From /" + regionName + " where id = 1", attributes, true).execute();
+          queryService.newCq("client1MoreDCQ2", "Select * From /" + regionName + " where id = 10", attributes, true).execute();
+          queryService.newCq("client1MoreNoDC1", "Select * From /" + regionName, attributes, false).execute();
+          queryService.newCq("client1MoreNoDC2", "Select * From /" + regionName + " where id = 3", attributes, false).execute();
+        }
+        catch (RegionNotFoundException e) {
+          throw new CacheException(e) {
+            
+          };
+        }
+        catch (CqException e) {
+          throw new CacheException(e) {
+            
+          };
+        }
+        catch (CqExistsException e) {
+          throw new CacheException(e) {
+            
+          };
+        }
+      }
+    });
+    
+    client2.invoke(new CacheSerializableRunnable("Register more cq for client 2") {
+      public void run2() throws CacheException {
+        //register the cq's
+        QueryService queryService = CacheServerTestUtil.getCache().getQueryService();
+        CqAttributesFactory cqAf = new CqAttributesFactory();
+        CqAttributes attributes = cqAf.create();
+        try {
+          queryService.newCq("client2MoreDCQ1", "Select * From /" + regionName + " where id = 1", attributes, true).execute();
+          queryService.newCq("client2MoreDCQ2", "Select * From /" + regionName + " where id = 10", attributes, true).execute();
+          queryService.newCq("client2MoreDCQ3", "Select * From /" + regionName, attributes, true).execute();
+          queryService.newCq("client2MoreDCQ4", "Select * From /" + regionName + " where id = 3", attributes, true).execute();
+        }
+        catch (RegionNotFoundException e) {
+          throw new CacheException(e) {
+            
+          };
+        }
+        catch (CqException e) {
+          throw new CacheException(e) {
+            
+          };
+        }
+        catch (CqExistsException e) {
+          throw new CacheException(e) {
+            
+          };
+        }
+      }
+    });
+    
+    //Cycle clients a second time
+    cycleDurableClient(client1, "client1_dc", server1Port, regionName, timeout);
+    cycleDurableClient(client2, "client2_dc", server1Port, regionName, timeout);
+    
+    client2.invoke(new CacheSerializableRunnable("check durable cqs for client 2") {
+      public void run2() throws CacheException {
+        QueryService queryService = CacheServerTestUtil.getCache().getQueryService();
+        List<String> list;
+        try {
+          list = queryService.getAllDurableCqsFromServer();
+        }
+        catch (CqException e) {
+          throw new CacheException(e) {};
+        }
+        assertEquals(8, list.size());
+        assertTrue(list.contains("client2DCQ1"));
+        assertTrue(list.contains("client2DCQ2"));
+        assertTrue(list.contains("client2DCQ3"));
+        assertTrue(list.contains("client2DCQ4"));
+        assertTrue(list.contains("client2MoreDCQ1"));
+        assertTrue(list.contains("client2MoreDCQ2"));
+        assertTrue(list.contains("client2MoreDCQ3"));
+        assertTrue(list.contains("client2MoreDCQ4"));
+      }
+    });
+    
+    client1.invoke(new CacheSerializableRunnable("check durable cqs for client 1") {
+      public void run2() throws CacheException {
+        QueryService queryService = CacheServerTestUtil.getCache().getQueryService();
+        List<String> list;
+        try {
+          list = queryService.getAllDurableCqsFromServer();
+        }
+        catch (CqException e) {
+          throw new CacheException(e) {};
+        }
+        assertEquals(4, list.size());
+        assertTrue(list.contains("client1DCQ1"));
+        assertTrue(list.contains("client1DCQ2"));
+        assertTrue(list.contains("client1MoreDCQ1"));
+        assertTrue(list.contains("client1MoreDCQ2"));
+      }
+    });
+    
+    client1.invoke(CacheServerTestUtil.class, "closeCache");
+    client2.invoke(CacheServerTestUtil.class, "closeCache");
+    server.invoke(CacheServerTestUtil.class, "closeCache");
+  }
+  
+  private Properties getDurableClientProperties(String durableClientId, int durableClientTimeout) {
+    Properties properties = new Properties();
+    properties.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    properties.setProperty(DistributionConfig.LOCATORS_NAME, "");
+    properties.setProperty(DistributionConfig.DURABLE_CLIENT_ID_NAME, durableClientId);
+    properties.setProperty(DistributionConfig.DURABLE_CLIENT_TIMEOUT_NAME, String.valueOf(durableClientTimeout));
+    return properties;
+  }
+  
+  //helper to create durable cqs to test out getAllDurableCqs functionality
+  private void createClient1CqsAndDurableCqs(VM client, final String regionName) {
+    client.invoke(new CacheSerializableRunnable("Register cq for client 1") {
+      public void run2() throws CacheException {
+        //register the cq's
+        QueryService queryService = CacheServerTestUtil.getCache().getQueryService();
+        CqAttributesFactory cqAf = new CqAttributesFactory();
+        CqAttributes attributes = cqAf.create();
+        try {
+          queryService.newCq("client1DCQ1", "Select * From /" + regionName + " where id = 1", attributes, true).execute();
+          queryService.newCq("client1DCQ2", "Select * From /" + regionName + " where id = 10", attributes, true).execute();
+          queryService.newCq("client1NoDC1", "Select * From /" + regionName, attributes, false).execute();
+          queryService.newCq("client1NoDC2", "Select * From /" + regionName + " where id = 3", attributes, false).execute();
+        }
+        catch (RegionNotFoundException e) {
+          throw new CacheException(e) {
+            
+          };
+        }
+        catch (CqException e) {
+          throw new CacheException(e) {
+            
+          };
+        }
+        catch (CqExistsException e) {
+          throw new CacheException(e) {
+            
+          };
+        }
+      }
+    });
+  }
+  
+  private void createClient2CqsAndDurableCqs(VM client, final String regionName) {
+    client.invoke(new CacheSerializableRunnable("Register cq for client 2") {
+      public void run2() throws CacheException {
+        //register the cq's
+        QueryService queryService = CacheServerTestUtil.getCache().getQueryService();
+        CqAttributesFactory cqAf = new CqAttributesFactory();
+        CqAttributes attributes = cqAf.create();
+        try {
+          queryService.newCq("client2DCQ1", "Select * From /" + regionName + " where id = 1", attributes, true).execute();
+          queryService.newCq("client2DCQ2", "Select * From /" + regionName + " where id = 10", attributes, true).execute();
+          queryService.newCq("client2DCQ3", "Select * From /" + regionName, attributes, true).execute();
+          queryService.newCq("client2DCQ4", "Select * From /" + regionName + " where id = 3", attributes, true).execute();
+        }
+        catch (RegionNotFoundException e) {
+          throw new CacheException(e) {
+            
+          };
+        }
+        catch (CqException e) {
+          throw new CacheException(e) {
+            
+          };
+        }
+        catch (CqExistsException e) {
+          throw new CacheException(e) {
+            
+          };
+        }
+
+      }
+    });
+  }
+  
+  private void cycleDurableClient(VM client, final String dcName, final int serverPort, final String regionName, final int durableClientTimeout) {
+    client.invoke(new CacheSerializableRunnable("cycle client") {
+      public void run2() throws CacheException {
+        CacheServerTestUtil.closeCache(true);
+      }
+    });
+    
+    client.invoke(CacheServerTestUtil.class, "createClientCache", 
+        new Object[] {getClientPool(getServerHostName(client.getHost()), serverPort), regionName, getDurableClientProperties(dcName, durableClientTimeout)});
+  }
+  
+
+  private CqQuery createCq(String regionName, String cqName) {
+    // Create CQ Attributes.
+    CqAttributesFactory cqAf = new CqAttributesFactory();
+    
+    // Initialize and set CqListener.
+    CqListener[] cqListeners = { new CqListener() {
+
+      @Override
+      public void close() {
+      }
+
+      @Override
+      public void onEvent(CqEvent aCqEvent) {
+      }
+
+      @Override
+      public void onError(CqEvent aCqEvent) {
+      }
+      
+    }};
+    cqAf.initCqListeners(cqListeners);
+    CqAttributes cqa = cqAf.create();
+
+    // Create cq's
+    // Get the query service for the Pool
+    QueryService queryService = CacheServerTestUtil.getCache().getQueryService();
+    CqQuery query = null;
+    try { 
+      query = queryService.newCq(cqName , "Select * from /" + regionName, cqa);
+      query.execute();
+    }
+    catch (CqExistsException e) {
+      fail("Could not find specified region:" + regionName + ":" + e);
+    }
+    catch (CqException e) {
+      fail("Could not find specified region:" + regionName + ":" + e);
+
+    }
+    catch (RegionNotFoundException e) {
+      fail("Could not find specified region:" + regionName + ":" + e);
+    }
+    return query;
+  }
+  
+  private void checkCqStats(String cqName) {
+    QueryService queryService = CacheServerTestUtil.getPool().getQueryService();
+    CqQueryImpl query = null;
+    query = (CqQueryImpl)queryService.getCq(cqName);
+    if (query != null) {
+      query.getVsdStats();
+      query.getVsdStats().getNumEvents();
+    }
+  }
+  
+  private Pool getClientPool(String host, int serverPort) {
+    PoolFactory pf = PoolManager.createFactory();
+    pf.addServer(host, serverPort)
+      .setSubscriptionAckInterval(1).setSubscriptionEnabled(true);
+    return ((PoolFactoryImpl)pf).getPoolAttributes();
+  }
+  
+
+  public CacheSerializableRunnable setTestHook() {
+    SerializableRunnable sr = new CacheSerializableRunnable("TestHook") {
+      public void run2() {
+        class CqQueryTestHook implements CqQueryImpl.TestHook {
+
+          CountDownLatch latch = new CountDownLatch(1);
+          private int numEvents = 0;
+          Cache cache = GemFireCacheImpl.getInstance();
+          
+          public void pauseUntilReady() {
+            try {
+              cache.getLogger().fine("CqQueryTestHook: Going to wait on latch until ready is called.");
+              if (!latch.await(10, TimeUnit.SECONDS)) {
+                throw new TestException("query was never unlatched");
+              }
+            } catch (Exception e) {
+              e.printStackTrace();
+              Thread.currentThread().interrupt();
+            }
+          }
+
+          public void ready() {
+            latch.countDown();
+            cache.getLogger().fine("CqQueryTestHook: The latch has been released.");
+          }
+
+          public int numQueuedEvents() {
+            return numEvents;
+          }
+          
+          public void setEventCount(int count) {
+            cache.getLogger().fine("CqQueryTestHook: Setting numEVents to: " + count);
+            numEvents = count;
+          }
+        }
+        ;
+        CqQueryImpl.testHook = new CqQueryTestHook();
+      }
+    };
+    return (CacheSerializableRunnable) sr;
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
new file mode 100644
index 0000000..157ffab
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
@@ -0,0 +1,45 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.query.cq.dunit;
+
+
+import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
+
+import dunit.SerializableRunnable;
+
+/**
+ * Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
+ *
+ */
+public class CqDataUsingPoolOptimizedExecuteDUnitTest extends CqDataUsingPoolDUnitTest{
+
+  public CqDataUsingPoolOptimizedExecuteDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    addExpectedException("Read timed out");
+    addExpectedException("java.net.SocketException");
+    super.setUp();
+    invokeInEveryVM(new SerializableRunnable("set test hook") {
+      public void run() {
+        CqServiceImpl.EXECUTE_QUERY_DURING_INIT = false;
+      }
+    });
+  }
+  
+  @Override
+  public void tearDown2() throws Exception {
+    invokeInEveryVM(new SerializableRunnable("getSystem") {
+      public void run() {
+        CqServiceImpl.EXECUTE_QUERY_DURING_INIT = true;
+      }
+    });
+    super.tearDown2();
+  }
+}


[62/70] incubator-geode git commit: GEODE-819: Fix dunit imports in WAN and CQ tests

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java
index 13fd228..4cb03ae 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java
@@ -40,11 +40,10 @@ import com.gemstone.gemfire.internal.cache.PrimaryBucketException;
 import com.gemstone.gemfire.internal.cache.PutAllPartialResultException;
 import com.gemstone.gemfire.internal.cache.RegionQueue;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
-import dunit.DistributedTestCase;
-import dunit.DistributedTestCase.ExpectedException;
-import dunit.DistributedTestCase.WaitCriterion;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase.ExpectedException;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
 
 public class ReplicatedRegion_ParallelWANPropogationDUnitTest extends WANTestBase{
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
index 03b1354..3fdc672 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
@@ -41,8 +41,7 @@ import com.gemstone.gemfire.internal.cache.wan.CompressionOutputStream;
 import com.gemstone.gemfire.internal.cache.wan.InternalGatewaySenderFactory;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase.MyLocatorCallback;
-
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.VM;
 
 public class SenderWithTransportFilterDUnitTest extends WANTestBase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
index 53243eb..647dded 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
@@ -27,11 +27,10 @@ import com.gemstone.gemfire.internal.cache.CacheObserverAdapter;
 import com.gemstone.gemfire.internal.cache.CacheObserverHolder;
 import com.gemstone.gemfire.internal.cache.LocalRegion;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
-import dunit.DistributedTestCase;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 public class ShutdownAllPersistentGatewaySenderDUnitTest extends WANTestBase {
   private static final long MAX_WAIT = 70000;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
index 9f003b4..50bb4b9 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
@@ -35,8 +35,7 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.internal.cache.PoolFactoryImpl;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.Host;
+import com.gemstone.gemfire.test.dunit.Host;
 
 public class WANLocatorServerDUnitTest extends WANTestBase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
index 7f582f3..c80a447 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
@@ -18,8 +18,7 @@ package com.gemstone.gemfire.internal.cache.wan.misc;
 
 import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
 
 public class WANSSLDUnitTest extends WANTestBase{
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
index 848bf4f..19e42c1 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
@@ -27,9 +27,8 @@ import com.gemstone.gemfire.GemFireConfigException;
 import com.gemstone.gemfire.IncompatibleSystemException;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
-import dunit.Host;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.Host;
 
 public class WanAutoDiscoveryDUnitTest extends WANTestBase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
index 871e6d1..19f6c4b 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
@@ -22,11 +22,10 @@ import com.gemstone.gemfire.internal.cache.PartitionedRegion;
 import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
 import com.gemstone.gemfire.internal.cache.wan.GatewaySenderException;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
-import dunit.DistributedTestCase;
-import dunit.RMIException;
-import dunit.DistributedTestCase.ExpectedException;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.RMIException;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase.ExpectedException;
 
 /**
  * DUnit test for operations on ParallelGatewaySender

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
index 8c8233a..cb64868 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
@@ -38,8 +38,7 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.internal.cache.RegionQueue;
 import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * DUnit for ParallelSenderQueue overflow operations.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
index 48786a7..2d200bf 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
@@ -26,9 +26,8 @@ import com.gemstone.gemfire.cache.wan.GatewaySenderFactory;
 import com.gemstone.gemfire.internal.cache.ColocationHelper;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-
-import dunit.AsyncInvocation;
-import dunit.DistributedTestCase.ExpectedException;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase.ExpectedException;
 
 public class ParallelWANPersistenceEnabledGatewaySenderDUnitTest extends
     WANTestBase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java
index aa83f68..7286403 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java
@@ -17,8 +17,7 @@
 package com.gemstone.gemfire.internal.cache.wan.parallel;
 
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
 
 /**
  * @author skumar

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
index e1c315a..674de6a 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
@@ -21,8 +21,7 @@ import java.util.HashMap;
 import java.util.List;
 
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
 
 public class ParallelWANPropagationConcurrentOpsDUnitTest extends WANTestBase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
index a43f4ba..5b93bc2 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
@@ -30,8 +30,7 @@ import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
 import com.gemstone.gemfire.internal.cache.wan.BatchException70;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase.MyGatewayEventFilter;
-
-import dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
 
 public class ParallelWANPropagationDUnitTest extends WANTestBase {
   private static final long serialVersionUID = 1L;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
index c846254..4da0868 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
@@ -22,8 +22,7 @@ import java.util.Map;
 
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase.MyGatewayEventFilter;
-
-import dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
 
 public class ParallelWANStatsDUnitTest extends WANTestBase{
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
index 54a641c..fd0b753 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
@@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.execute.*;
 import com.gemstone.gemfire.distributed.DistributedSystem;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-import dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
 
 //The tests here are to validate changes introduced because a distributed deadlock
 //was found that caused issues for a production customer. 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
index d0251e8..82bbce0 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
@@ -28,8 +28,7 @@ import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
 import com.gemstone.gemfire.internal.cache.wan.MyGatewaySenderEventListener;
 import com.gemstone.gemfire.internal.cache.wan.MyGatewaySenderEventListener2;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
 
 /**
  * @author skumar

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
index b9e4f7f..d30289b 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
@@ -25,9 +25,8 @@ import com.gemstone.gemfire.cache.wan.GatewaySender;
 import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
 import com.gemstone.gemfire.internal.cache.wan.GatewaySenderException;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
-import dunit.RMIException;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.RMIException;
 
 /**
  * @author skumar

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
index 3995d65..eec1341 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
@@ -41,8 +41,7 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.internal.cache.RegionQueue;
 import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.VM;
 
 
 public class SerialGatewaySenderQueueDUnitTest extends WANTestBase{

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
index a95e9e4..ede5e09 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
@@ -18,8 +18,7 @@ package com.gemstone.gemfire.internal.cache.wan.serial;
 
 
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
 
 /**
  * @author skumar

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java
index 81a66ac..c33d7aa 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java
@@ -25,8 +25,7 @@ import com.gemstone.gemfire.cache.client.ServerOperationException;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
 import com.gemstone.gemfire.internal.cache.wan.BatchException70;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
 
 public class SerialWANPropogationDUnitTest extends WANTestBase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java
index 5356ffb..9ae58cc 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java
@@ -21,8 +21,7 @@ import com.gemstone.gemfire.CancelException;
 import com.gemstone.gemfire.cache.CacheClosedException;
 import com.gemstone.gemfire.internal.cache.ForceReattemptException;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
 
 public class SerialWANPropogation_PartitionedRegionDUnitTest extends WANTestBase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
index 39f4d34..979439b 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
@@ -22,8 +22,7 @@ import java.util.Map;
 import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase.MyGatewayEventFilter;
-
-import dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
 
 public class SerialWANStatsDUnitTest extends WANTestBase {
   

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
index bebf631..d0ea193 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
@@ -44,10 +44,9 @@ import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
 import com.gemstone.gemfire.management.ManagementService;
 import com.gemstone.gemfire.management.internal.cli.commands.CliCommandTestBase;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 public class WANCommandTestBase extends CliCommandTestBase{
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
index 5be0c45..a06b32e 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
@@ -29,9 +29,8 @@ import com.gemstone.gemfire.management.cli.Result;
 import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
 import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
 import com.gemstone.gemfire.management.internal.cli.result.TabularResultData;
-
-import dunit.Host;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * DUnit tests for 'create gateway-receiver' command.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
index 1314eda..f38f5b9 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
@@ -27,9 +27,8 @@ import com.gemstone.gemfire.management.cli.Result;
 import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
 import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
 import com.gemstone.gemfire.management.internal.cli.result.TabularResultData;
-
-import dunit.Host;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.VM;
 
 public class WanCommandGatewayReceiverStartDUnitTest extends WANCommandTestBase{
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
index 5c44015..439a74b 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
@@ -27,9 +27,8 @@ import com.gemstone.gemfire.management.cli.Result;
 import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
 import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
 import com.gemstone.gemfire.management.internal.cli.result.TabularResultData;
-
-import dunit.Host;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.VM;
 
 public class WanCommandGatewayReceiverStopDUnitTest extends WANCommandTestBase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java
index 3fd4a88..08f6cac 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java
@@ -27,10 +27,9 @@ import com.gemstone.gemfire.distributed.Locator;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
 import com.gemstone.gemfire.management.internal.MBeanJMXAdapter;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * Tests for WAN artifacts like Sender and Receiver. The purpose of this test is

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
index b35f230..79d5aa2 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
@@ -53,10 +53,11 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
 import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
 import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
 import com.gemstone.gemfire.management.internal.configuration.domain.XmlEntity;
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableCallable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.VM;
+
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java
index 908fa65..46e2d3f 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java
@@ -35,10 +35,9 @@ import com.gemstone.gemfire.management.ManagementTestBase;
 import com.gemstone.gemfire.management.RegionMXBean;
 
 import com.gemstone.gemfire.management.internal.MBeanJMXAdapter;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * This is for testing remote Cluster


[39/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
new file mode 100644
index 0000000..1dbb1d7
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
@@ -0,0 +1,1780 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.query.cq.dunit;
+
+import hydra.Log;
+
+import java.io.IOException;
+import java.util.HashSet;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.PartitionAttributes;
+import com.gemstone.gemfire.cache.PartitionAttributesFactory;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionAttributes;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.client.ClientCache;
+import com.gemstone.gemfire.cache.client.ClientCacheFactory;
+import com.gemstone.gemfire.cache.client.ClientRegionShortcut;
+import com.gemstone.gemfire.cache.query.CqAttributes;
+import com.gemstone.gemfire.cache.query.CqAttributesFactory;
+import com.gemstone.gemfire.cache.query.CqListener;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.cache.query.SelectResults;
+import com.gemstone.gemfire.cache.query.Struct;
+import com.gemstone.gemfire.cache.query.data.Portfolio;
+import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.cache30.CacheTestCase;
+import com.gemstone.gemfire.internal.cache.LocalRegion;
+
+import dunit.Host;
+import dunit.SerializableRunnable;
+import dunit.VM;
+/**
+ * Test class for Partitioned Region and CQs
+ * 
+ * @author rdubey
+ * @since 5.5
+ */
+public class PartitionedRegionCqQueryDUnitTest extends CacheTestCase {
+
+  
+  public PartitionedRegionCqQueryDUnitTest(String name) {
+    super(name);
+  }
+  
+  static public final String[] regions = new String[] {
+      "regionA",
+      "regionB"
+  };
+  
+  static public final String KEY = "key-";
+  
+  protected final CqQueryDUnitTest cqHelper = new CqQueryDUnitTest("HelperPartitonedRegionCqTest");
+  
+  public final String[] cqs = new String [] {
+      //0 - Test for ">" 
+      "SELECT ALL * FROM /root/" + regions[0] + " p where p.ID > 0",
+      
+      //1 -  Test for "=" and "and".
+      "SELECT ALL * FROM /root/" + regions[0] + " p where p.ID = 2 and p.status='active'",
+      
+      //2 -  Test for "<" and "and".
+      "SELECT ALL * FROM /root/" + regions[1] + " p where p.ID < 5 and p.status='active'",
+      
+      // FOLLOWING CQS ARE NOT TESTED WITH VALUES; THEY ARE USED TO TEST PARSING LOGIC WITHIN CQ.
+      //3
+      "SELECT * FROM /root/" + regions[0] + " ;",
+      //4
+      "SELECT ALL * FROM /root/" + regions[0],
+      //5
+      "import com.gemstone.gemfire.cache.\"query\".data.Portfolio; " +
+      "SELECT ALL * FROM /root/" + regions[0] +  " TYPE Portfolio",
+      //6
+      "import com.gemstone.gemfire.cache.\"query\".data.Portfolio; " +
+      "SELECT ALL * FROM /root/" + regions[0] +  " p TYPE Portfolio",
+      //7
+      "SELECT ALL * FROM /root/" + regions[1] + " p where p.ID < 5 and p.status='active';",
+      //8
+      "SELECT ALL * FROM /root/" + regions[0] + "  ;",
+      //9
+      "SELECT ALL * FROM /root/" + regions[0] +" p where p.description = NULL",
+      
+      // 10
+      "SELECT ALL * FROM /root/" + regions[1] +" p where p.ID > 0",
+  };
+  
+  public final String[] cqsWithoutRoot = new String [] {
+      //0 - Test for ">" 
+      "SELECT ALL * FROM /" + regions[0] + " p where p.ID > 0"
+      
+  };
+  
+  private static int bridgeServerPort;
+  
+  public void testCQLeakWithPartitionedRegion() throws Exception {
+    // creating servers.
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+    
+    createServer(server1);       
+    createServer(server2);    
+       
+    
+    // create client 
+    
+    final int port = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+    
+    createClient(client, port, host0);
+    
+    // register cq.
+    createCQ(client, "testCQEvents_0", cqs[0]);
+    cqHelper.executeCQ(client, "testCQEvents_0", false, null);
+    pause(2 * 1000);
+    
+    // create values
+    int size = 40;
+    createValues(server1, regions[0], size);
+    
+    // wait for last creates...
+    
+    cqHelper.waitForCreated(client, "testCQEvents_0", KEY+size);
+    
+    // validate cq..
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    
+    int cc1 = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCqCountFromRegionProfile");
+    int cc2 = server2.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCqCountFromRegionProfile");
+    assertEquals("Should have one", 1, cc1);
+    assertEquals("Should have one", 1, cc2);
+    
+    server1.bounce();
+    
+    cqHelper.closeClient(client);
+    pause(10 * 1000);
+    //cc1 = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCqCountFromRegionProfile");
+    cc2 = server2.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCqCountFromRegionProfile");
+    
+    //assertEquals("Should have one", 0, cc1);
+    assertEquals("Should have one", 0, cc2);
+    
+    cqHelper.closeServer(server2);
+    //cqHelper.closeServer(server1);
+  }
+  
+  public void testCQAndPartitionedRegion() throws Exception {
+    // creating servers.
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+    
+    createServer(server1);
+    
+    createServer(server2);
+    
+    // create client 
+    
+    final int port = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+    
+    createClient(client, port, host0);
+    
+    // register cq.
+    createCQ(client, "testCQEvents_0", cqs[0]);
+    cqHelper.executeCQ(client, "testCQEvents_0", false, null);
+    pause(2 * 1000);
+    
+    // create values
+    int size = 40;
+    createValues(server1, regions[0], size);
+    
+    // wait for last creates...
+    
+    cqHelper.waitForCreated(client, "testCQEvents_0", KEY+size);
+    
+    // validate cq..
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    //size = 2;
+    
+    // do updates
+    createValues(server1, regions[0], size);
+    
+    cqHelper.waitForUpdated(client, "testCQEvents_0", KEY+size);
+    
+    // validate cqs again
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ (size+size));
+    
+    
+    // destroy all the values.
+    int numDestroys = size;
+    cqHelper.deleteValues(server2,regions[0], numDestroys);
+    
+    cqHelper.waitForDestroyed(client, "testCQEvents_0", KEY+numDestroys);
+    
+    // validate cqs after destroyes on server2.
+ 
+        
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ numDestroys,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ numDestroys,
+        /* totalEvents: */ (size+size+numDestroys));
+    
+    // invalidate some entries.
+    /*final int numInvalidates = 5;
+    
+    server2.invoke(new CacheSerializableRunnable("Invalidate values") {
+      public void run2() throws CacheException {
+        Region region1 = getRootRegion().getSubregion(regions[0]);
+        for (int i = numInvalidates; i <= (numInvalidates+4); i++) {
+          region1.invalidate(KEY+i);
+        }
+      }
+    });
+     
+    cqHelper.waitForInvalidated(client, "testCQEvents_0", KEY+(numInvalidates+4));
+    */
+   // cqHelper.validateCQ(client, "testCQEvents_0",
+    //    /* resultSize: */ cqHelper.noTest,
+    //    /* creates: */ size,
+    //    /* updates: */ size,
+    //    /* deletes; */ (numDestroys+numInvalidates),
+    //    /* queryInserts: */ size,
+     //   /* queryUpdates: */ size,
+     //   /* queryDeletes: */ (numDestroys+numInvalidates),
+    //    /* totalEvents: */ (size+size+numDestroys + numInvalidates));
+    
+    cqHelper.closeClient(client);
+    cqHelper.closeServer(server2);
+    cqHelper.closeServer(server1);
+  }
+  
+  /**
+   * test for registering cqs on a bridge server with local max memory zero.
+   */
+  public void testPartitionedCqOnAccessorBridgeServer() throws Exception {
+ // creating servers.
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+    
+    // creating an accessor vm with Bridge Server installed.
+    createServer(server1,true);
+    
+    createServer(server2);
+    
+    // create client 
+    
+    final int port = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+    
+    createClient(client, port, host0);
+    
+    // register cq.
+    createCQ(client, "testCQEvents_0", cqs[0]);
+    cqHelper.executeCQ(client, "testCQEvents_0", false, null);
+    
+    
+    // create values
+    final int size = 1000;
+    createValues(server1, regions[0], size);
+    
+    // wait for last creates...
+
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForCreated(client, "testCQEvents_0", KEY+i);
+    }
+
+    // validate cq..
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    //size = 2;
+    
+    // do updates
+    createValues(server1, regions[0], size);
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForUpdated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cqs again.
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ (size+size));
+    
+    
+    // destroy all the values.
+    int numDestroys = size;
+    cqHelper.deleteValues(server2,regions[0], numDestroys);
+    
+    for (int i=1; i <= numDestroys; i++){
+      cqHelper.waitForDestroyed(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cqs after destroyes on server2.
+ 
+        
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ numDestroys,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ numDestroys,
+        /* totalEvents: */ (size+size+numDestroys));
+    
+    cqHelper.closeClient(client);
+    cqHelper.closeServer(server2);
+    cqHelper.closeServer(server1);
+  }
+  
+  /**
+   * test for registering cqs on single Bridge server hosting all the data. This
+   * will generate all the events locally and should always have the old value 
+   * and should not sent the profile update on wire.
+   */
+  public void testPartitionedCqOnSingleBridgeServer() throws Exception { 
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+//    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+    
+    // creating an accessor vm with Bridge Server installed.
+    createServer(server1);
+    final int port = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+    
+    createClient(client, port, host0);
+    
+    // register cq.
+    createCQ(client, "testCQEvents_0", cqs[0]);
+    cqHelper.executeCQ(client, "testCQEvents_0", false, null);
+    
+    
+    // create values
+    final int size = 400;
+    createValues(server1, regions[0], size);
+    
+    // wait for last creates...
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForCreated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cq..
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    //size = 2;
+    
+    // do updates
+    createValues(server1, regions[0], size);
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForUpdated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cqs again.
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ (size+size));
+    
+    
+    // destroy all the values.
+    int numDestroys = size;
+    cqHelper.deleteValues(server1,regions[0], numDestroys);
+    
+    for (int i=1; i <= numDestroys; i++){
+      cqHelper.waitForDestroyed(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cqs after destroyes on server2.
+ 
+        
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ numDestroys,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ numDestroys,
+        /* totalEvents: */ (size+size+numDestroys));
+    
+    cqHelper.closeClient(client);
+    cqHelper.closeServer(server1);
+    
+  }
+  
+  /**
+   * test for registering cqs on single Bridge server hosting all the data. This
+   * will generate all the events locally but the puts, updates and destroys originate
+   * at an accessor vm.
+   */
+  public void testPRCqOnSingleBridgeServerUpdatesOriginatingAtAccessor() throws Exception { 
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+    
+    // creating an accessor vm with Bridge Server installed.
+    createServer(server1,true);
+    
+    assertLocalMaxMemory(server1);
+    
+    createServer(server2);
+    
+    // create client 
+    
+    final int port = server2.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server2.getHost());
+    
+    createClient(client, port, host0);
+    
+    // register cq.
+    createCQ(client, "testCQEvents_0", cqs[0]);
+    cqHelper.executeCQ(client, "testCQEvents_0", false, null);
+    
+    
+    // create values
+    final int size = 400;
+    createValues(server1, regions[0], size);
+    
+    // wait for last creates...
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForCreated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cq..
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    //size = 2;
+    
+    // do updates
+    createValues(server1, regions[0], size);
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForUpdated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cqs again.
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ (size+size));
+    
+    
+    // destroy all the values.
+    int numDestroys = size;
+    cqHelper.deleteValues(server1,regions[0], numDestroys);
+    
+    for (int i=1; i <= numDestroys; i++){
+      cqHelper.waitForDestroyed(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cqs after destroyes on server2.
+ 
+        
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ numDestroys,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ numDestroys,
+        /* totalEvents: */ (size+size+numDestroys));
+    
+    cqHelper.closeClient(client);
+    cqHelper.closeServer(server2);
+    cqHelper.closeServer(server1);
+  }
+  
+  /**
+   * test to check invalidates on bridge server hosting datastores as well.
+   */
+  public void testPRCqWithInvalidatesOnBridgeServer()  {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+    
+    // creating Bridge Server with data store. clients will connect to this 
+    // bridge server.
+    createServer(server1);
+     
+    // create another server with data store.
+    createServer(server2);
+    
+    
+    final int port = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+    
+    createClient(client, port, host0);
+    
+    // register cq.
+    createCQ(client, "testCQEvents_0", cqs[0]);
+    cqHelper.executeCQ(client, "testCQEvents_0", false, null);
+    
+    
+    // create values
+    final int size = 400;
+    createValues(server1, regions[0], size);
+    
+    // wait for last creates...
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForCreated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cq..
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    //size = 2;
+    
+    // do updates
+    createValues(server1, regions[0], size);
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForUpdated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cqs again.
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ (size+size));
+    
+    
+    // invalidate all the values.
+    int numInvalidates = size;
+    cqHelper.invalidateValues(server2,regions[0], numInvalidates);
+    
+    for (int i=1; i <= numInvalidates; i++){
+      cqHelper.waitForInvalidated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cqs after invalidates on server2.
+         
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ numInvalidates,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ numInvalidates,
+        /* totalEvents: */ (size+size+numInvalidates));
+    
+    cqHelper.closeClient(client);
+    cqHelper.closeServer(server2);
+    cqHelper.closeServer(server1);
+  }
+  
+  /**
+   * test cqs with invalidates on bridge server not hosting datastores.
+   * 
+   */
+  public void testPRCqWithInvalidatesOnAccessorBridgeServer() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+    
+    // creating Bridge Server with data store. clients will connect to this 
+    // bridge server.
+    createServer(server1, true);
+     
+    // create another server with data store.
+    createServer(server2);
+    
+    
+    final int port = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+    
+    createClient(client, port, host0);
+    
+    // register cq.
+    createCQ(client, "testCQEvents_0", cqs[0]);
+    cqHelper.executeCQ(client, "testCQEvents_0", false, null);
+    
+    
+    // create values
+    final int size = 400;
+    createValues(server1, regions[0], size);
+    
+    // wait for last creates...
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForCreated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cq..
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    //size = 2;
+    
+    // do updates
+    createValues(server1, regions[0], size);
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForUpdated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cqs again.
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ (size+size));
+    
+    
+    // invalidate all the values.
+    int numInvalidates = size;
+    cqHelper.invalidateValues(server1,regions[0], numInvalidates);
+    
+    for (int i=1; i <= numInvalidates; i++){
+      cqHelper.waitForInvalidated(client, "testCQEvents_0", KEY+i);
+    } 
+    // validate cqs after invalidates on server2.
+         
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ numInvalidates,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ numInvalidates,
+        /* totalEvents: */ (size+size+numInvalidates));
+    
+    cqHelper.closeClient(client);
+    cqHelper.closeServer(server2);
+    cqHelper.closeServer(server1);
+  }
+  
+  /**
+   * test cqs with create updates and destroys from client on bridge server
+   * hosting datastores.
+   */
+  public void testPRCqWithUpdatesFromClients() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+    VM client2 = host.getVM(3);
+    
+    // creating Bridge Server with data store. clients will connect to this 
+    // bridge server.
+    createServer(server1, false, 1);
+     
+    // create another server with data store.
+    createServer(server2, false , 1);
+    
+    
+    final int port = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+    
+    createClient(client, port, host0);
+    createClient(client2, port, host0);
+    
+    // register cq.
+    createCQ(client, "testCQEvents_0", cqs[0]);
+    cqHelper.executeCQ(client, "testCQEvents_0", false, null);
+    
+    
+    // create values
+    final int size = 400;
+    createValues(client2, regions[0], size);
+    
+    // wait for last creates...
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForCreated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cq..
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    //size = 2;
+    
+    // do updates
+    createValues(client2, regions[0], size);
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForUpdated(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cqs again.
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ (size+size));
+    
+    
+    // invalidate all the values.
+    int numDelets = size;
+    
+    cqHelper.deleteValues(client2,regions[0], numDelets);
+    
+    for (int i=1; i <= numDelets; i++){
+      cqHelper.waitForDestroyed(client, "testCQEvents_0", KEY+i);
+    }
+    
+    // validate cqs after invalidates on server2.
+         
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ numDelets,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ numDelets,
+        /* totalEvents: */ (size+size+numDelets));
+    
+    cqHelper.closeClient(client);
+    cqHelper.closeClient(client2);
+    cqHelper.closeServer(server2);
+    cqHelper.closeServer(server1);    
+  }
+  
+  /**
+   * test cqs on multiple partitioned region hosted by bridge servers.
+   * 
+   */
+  public void testPRCqWithMultipleRegionsOnServer() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+    VM client2 = host.getVM(3);
+    
+    // creating Bridge Server with data store. clients will connect to this 
+    // bridge server.
+    createServer(server1, false, 1);
+     
+    // create another server with data store.
+    createServer(server2, false , 1);
+    
+    // Wait for server to initialize.
+    pause(2000);
+    
+    final int port = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+    
+    createClient(client, port, host0);
+    createClient(client2, port, host0);
+    
+    // register cq.
+    createCQ(client, "testCQEvents_0", cqs[0]);
+    createCQ(client, "testCQEvents_1", cqs[10]);
+    cqHelper.executeCQ(client, "testCQEvents_0", false, null);
+    cqHelper.executeCQ(client, "testCQEvents_1", false, null);
+    
+    // create values
+    final int size = 400;
+    createValues(client2, regions[0], size);
+    createValues(client2, regions[1], size);
+    
+    // wait for last creates...
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForCreated(client, "testCQEvents_0", KEY+i);
+      cqHelper.waitForCreated(client, "testCQEvents_1", KEY+i);
+    }
+    
+    // validate cq..
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    cqHelper.validateCQ(client, "testCQEvents_1",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    
+    //size = 2;
+    
+    // do updates
+    createValues(client2, regions[0], size);
+    createValues(client2, regions[1], size);
+    
+ 
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForUpdated(client, "testCQEvents_0", KEY+i);
+      cqHelper.waitForUpdated(client, "testCQEvents_1", KEY+i);
+    }
+    
+    // validate cqs again.
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ (size+size));
+    
+    cqHelper.validateCQ(client, "testCQEvents_1",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ (size+size));
+    
+    // invalidate all the values.
+    int numInvalidates = size;
+    //cqHelper.invalidateValues(server1,regions[0], numInvalidates);
+    cqHelper.deleteValues(client2,regions[0], numInvalidates);
+    cqHelper.deleteValues(client2,regions[1], numInvalidates);
+    
+
+    for (int i=1; i <= numInvalidates; i++){
+      cqHelper.waitForDestroyed(client, "testCQEvents_0", KEY+i);
+      cqHelper.waitForDestroyed(client, "testCQEvents_1", KEY+i);
+    }
+    
+    
+    // validate cqs after invalidates on server2.
+         
+    cqHelper.validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ numInvalidates,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ numInvalidates,
+        /* totalEvents: */ (size+size+numInvalidates));
+    
+    
+    cqHelper.validateCQ(client, "testCQEvents_1",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ numInvalidates,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ numInvalidates,
+        /* totalEvents: */ (size+size+numInvalidates));
+    
+    cqHelper.closeClient(client);
+    cqHelper.closeClient(client2);
+    cqHelper.closeServer(server2);
+    cqHelper.closeServer(server1);         
+  }
+  
+  /**
+   * tests multiple cqs on partitioned region on bridge servers with profile update 
+   * for not requiring old values.
+   * 
+   */
+  public void testPRWithCQsAndProfileUpdates() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+    VM client2 = host.getVM(3);
+    
+    // creating Bridge Server with data store. clients will connect to this 
+    // bridge server.
+    createServer(server1, false, 1);
+     
+    // create another server with data store.
+    createServer(server2, false , 1);
+    
+    
+    final int port = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+    
+    createClient(client, port, host0);
+    createClient(client2, port, host0);
+    
+    // register cq.
+    createCQ(client, "testPRWithCQsAndProfileUpdates_0", cqs[0]); // SAME CQ REGISTERED TWICE.
+    createCQ(client, "testPRWithCQsAndProfileUpdates_1", cqs[0]); 
+    cqHelper.executeCQ(client, "testPRWithCQsAndProfileUpdates_0", false, null);
+    cqHelper.executeCQ(client, "testPRWithCQsAndProfileUpdates_1", false, null);
+    
+    // create values
+    final int size = 400;
+    createValues(client2, regions[0], size);
+    createValues(client2, regions[1], size);
+    
+    // wait for last creates...
+
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForCreated(client,"testPRWithCQsAndProfileUpdates_0", KEY+i);
+      cqHelper.waitForCreated(client,"testPRWithCQsAndProfileUpdates_1", KEY+i);
+    }
+    
+    // validate cq..
+    cqHelper.validateCQ(client, "testPRWithCQsAndProfileUpdates_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    cqHelper.validateCQ(client, "testPRWithCQsAndProfileUpdates_1",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    
+    //size = 2;
+    
+    // do updates
+    createValues(client2, regions[0], size);
+    createValues(client2, regions[1], size);
+    
+    for (int i=1; i <= size; i++){
+      cqHelper.waitForUpdated(client,"testPRWithCQsAndProfileUpdates_0", KEY+i);
+      cqHelper.waitForUpdated(client,"testPRWithCQsAndProfileUpdates_1", KEY+i);
+    }
+    
+    // validate cqs again.
+    cqHelper.validateCQ(client, "testPRWithCQsAndProfileUpdates_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ (size+size));
+    
+    cqHelper.validateCQ(client, "testPRWithCQsAndProfileUpdates_1",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ (size+size));
+    
+    // invalidate all the values.
+    int numInvalidates = size;
+    //cqHelper.invalidateValues(server1,regions[0], numInvalidates);
+    cqHelper.deleteValues(client2,regions[0], numInvalidates);
+    cqHelper.deleteValues(client2,regions[1], numInvalidates);
+    
+    for (int i=1; i <= numInvalidates; i++){
+      cqHelper.waitForDestroyed(client,"testPRWithCQsAndProfileUpdates_0",KEY+i);
+      cqHelper.waitForDestroyed(client,"testPRWithCQsAndProfileUpdates_1",KEY+i);
+    }
+    
+    
+    // validate cqs after invalidates on server2.
+         
+    cqHelper.validateCQ(client, "testPRWithCQsAndProfileUpdates_0",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ numInvalidates,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ numInvalidates,
+        /* totalEvents: */ (size+size+numInvalidates));
+    
+    
+    cqHelper.validateCQ(client, "testPRWithCQsAndProfileUpdates_1",
+        /* resultSize: */ CqQueryDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ numInvalidates,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ numInvalidates,
+        /* totalEvents: */ (size+size+numInvalidates));
+    
+    // check for requries old value set.
+    /*
+    server1.invoke(new CacheSerializableRunnable("Check requires old value") {
+      public void run2()
+      {
+        Cache cc = getCache();
+        PartitionedRegion region1 = (PartitionedRegion)cc
+            .getRegion("/root/regionA");
+        Set requiresOldValue = region1.getRegionAdvisor()
+            .adviseRequiresOldValue();
+        getLogWriter().info(
+            "ize of requires old value at server1 before closing cqs : "
+                + requiresOldValue.size());
+        assertTrue("The size of requiresOldValue shoule be zero on server1",
+            (0 == requiresOldValue.size()));
+      }
+    });
+
+    server2.invoke(new CacheSerializableRunnable("Check requires old value") {
+      public void run2()
+      {
+        Cache cc = getCache();
+        PartitionedRegion region1 = (PartitionedRegion)cc
+            .getRegion("/root/regionA");
+        Set requiresOldValue = region1.getRegionAdvisor()
+            .adviseRequiresOldValue();
+        getLogWriter().info(
+            "size of requires old value at server2 before closing cqs :"
+                + requiresOldValue.size());
+        assertTrue("The size of requiresOldValue should be one on server2 ",
+            (1 == requiresOldValue.size()));
+      }
+    });
+    */
+    
+    cqHelper.closeCQ(client, "testPRWithCQsAndProfileUpdates_0");
+    cqHelper.closeCQ(client, "testPRWithCQsAndProfileUpdates_1");
+    
+    
+    // check for requires old value set after closing all the cqs.
+    /*
+    REQUIRES OLD VALUES requirement is removed in the eventFilterOpt_dev_Jun09 
+    branch. The old values are no more sent to the peer, instead CQs are processed
+    at the source (where change happens). Replace requiresOldValue test with 
+    appropriate test.
+    
+    server1.invoke(new CacheSerializableRunnable("Check requires old value") {
+      public void run2()
+      {
+        Cache cc = getCache();
+        PartitionedRegion region1 = (PartitionedRegion)cc
+            .getRegion("/root/regionA");
+        Set requiresOldValue = region1.getRegionAdvisor()
+            .adviseRequiresOldValue();
+        getLogWriter().info(
+            "size of requires old value set at the end server1 : "
+                + requiresOldValue.size());
+        assertTrue("The size of requiresOldValue shoule be zero on server1",
+            (0 == requiresOldValue.size()));
+      }
+    });
+    
+    
+    server2.invoke(new CacheSerializableRunnable("Check requires old value") {
+      public void run2()
+      {
+        Cache cc = getCache();
+        PartitionedRegion region1 = (PartitionedRegion)cc
+            .getRegion("/root/regionA");
+        Set requiresOldValue = region1.getRegionAdvisor()
+            .adviseRequiresOldValue();
+        getLogWriter().info(
+            " size of requires old value set at the end server2 : "
+                + requiresOldValue.size());
+        assertTrue(
+            "The size of requiresOldValue shoule be zero on server2 as well after closing all the cqs",
+            (0 == requiresOldValue.size()));
+      }
+    });
+    */
+    cqHelper.closeClient(client);
+    cqHelper.closeClient(client2);
+    cqHelper.closeServer(server2);
+    cqHelper.closeServer(server1);     
+  }
+  
+  /**
+   * Test for events created during the CQ query execution.
+   * When CQs are executed using executeWithInitialResults 
+   * there may be possibility that the region changes during
+   * that time may not be reflected in the query result set
+   * thus making the query data and region data inconsistent.
+   * @throws Exception
+   */
+  public void testEventsDuringQueryExecution() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(0);
+    VM server2 = host.getVM(1);
+    VM client = host.getVM(2);
+    
+    final String cqName = "testEventsDuringQueryExecution_0";
+    
+    // Server.
+    createServer(server1);
+    createServer(server2);
+    
+    final int port = server1.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+    
+    // Initialize Client.
+    createClient(client, port, host0);
+    
+    // create CQ.
+    createCQ(client, cqName, cqs[0]);
+    
+    
+    final int numObjects = 200;
+    final int totalObjects = 500;
+    
+    // initialize Region.
+    server1.invoke(new CacheSerializableRunnable("Update Region"){
+      public void run2()throws CacheException {
+        Region region = getCache().getRegion("/root/" + regions[0]);
+        for (int i = 1; i <= numObjects; i++) {
+          Portfolio p = new Portfolio(i);
+          region.put(""+i, p);
+        }
+      }
+    });
+      
+    // Keep updating region (async invocation).
+    server1.invokeAsync(new CacheSerializableRunnable("Update Region"){
+      public void run2()throws CacheException {
+        Region region = getCache().getRegion("/root/" + regions[0]);
+        for (int i = numObjects + 1; i <= totalObjects; i++) {
+          Portfolio p = new Portfolio(i);
+          region.put(""+i, p);
+        }
+      }
+    });
+    
+    // Execute CQ while update is in progress.
+    client.invoke(new CacheSerializableRunnable("Execute CQ") {
+      public void run2()throws CacheException {
+        QueryService cqService = getCache().getQueryService();
+        // Get CqQuery object.
+        CqQuery cq1 = cqService.getCq(cqName);
+        if (cq1 == null) {
+          fail("Failed to get CQ " + cqName);
+        }
+        
+        SelectResults cqResults = null;
+
+        try {
+          cqResults = cq1.executeWithInitialResults();
+        } catch (Exception ex){
+          AssertionError err = new AssertionError("Failed to execute  CQ " + cqName);
+          err.initCause(ex);
+          throw err;
+        }
+        
+        //getLogWriter().info("initial result size = " + cqResults.size());
+        
+        
+        CqQueryTestListener cqListener = (CqQueryTestListener)cq1.getCqAttributes().getCqListener();
+        // Wait for the last key to arrive.
+        for (int i=0; i < 4; i++) {
+          try {
+            cqListener.waitForCreated("" + totalObjects);
+            // Found skip from the loop.
+            break;
+          } catch (CacheException ex) {
+            if (i == 3) {
+              throw ex;
+            }
+          }
+        }
+        
+        // Check if the events from CqListener are in order.
+        int oldId = 0;
+        for (Object cqEvent : cqListener.events.toArray()) { 
+          int newId = new Integer(cqEvent.toString()).intValue();
+          if (oldId > newId){
+            fail("Queued events for CQ Listener during execution with " + 
+                "Initial results is not in the order in which they are created.");
+          }
+          oldId = newId;
+        }
+        
+        // Check if all the IDs are present as part of Select Results and CQ Events.
+        HashSet ids = new HashSet(cqListener.events);
+
+        for (Object o : cqResults.asList()) {
+          Struct s = (Struct)o;
+          ids.add(s.get("key"));
+        }
+
+        //Iterator iter = cqResults.asSet().iterator();
+        //while (iter.hasNext()) {
+        //  Portfolio p = (Portfolio)iter.next();
+        //  ids.add(p.getPk());
+        //  //getLogWriter().info("Result set value : " + p.getPk());
+        //}
+        
+        HashSet missingIds = new HashSet();
+        String key = "";
+        for (int i = 1; i <= totalObjects; i++) {
+          key = "" + i;
+          if (!(ids.contains(key))){
+            missingIds.add(key);
+          }
+        }
+        
+        if (!missingIds.isEmpty()) {
+          fail("Missing Keys in either ResultSet or the Cq Event list. " +
+              " Missing keys : [size : " + missingIds.size() + "]" + missingIds +
+              " Ids in ResultSet and CQ Events :" + ids);
+        }
+        
+      } 
+    });
+    
+    cqHelper.closeClient(client);
+    cqHelper.closeServer(server2);
+    cqHelper.closeServer(server1);    
+  }
+
+  
+  
+  public void testDestroyRegionEventOnClientsWithCQRegistered() throws Exception{
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client1 = host.getVM(1);
+    VM client2 = host.getVM(2);
+    
+    final String cqName = "testDestroyEventOnClientsWithCQRegistered_0";
+    
+    createServerWithoutRootRegion(server, 0, false, 0);
+    
+    final int port = server.invokeInt(PartitionedRegionCqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    
+    // Initialize Client.
+    createCacheClient(client1, port, host0);
+    createCacheClient(client2, port, host0);
+    
+    createCQ(client1, cqName, cqsWithoutRoot[0]);
+    cqHelper.executeCQ(client1, cqName, false, null);
+    
+    final int numObjects = 10;
+    client1.invoke(new CacheSerializableRunnable("Populate region") {
+
+      @Override
+      public void run2() throws CacheException {
+        Region region = getCache().getRegion("/" + regions[0]);
+        for (int i = 1; i <= numObjects; i++) {
+          getCache().getLogger().fine("### DOING PUT with key: " + ("KEY-" + i)); 
+          Portfolio p = new Portfolio(i);
+          region.put("KEY-"+i, p);
+        }
+      }
+      
+    });
+    
+    client1.invokeAsync(new CacheSerializableRunnable("Wait for CqEvent") {
+      
+      @Override
+      public void run2() throws CacheException {
+        //Check for region destroyed event from server.
+        Region localRegion = getCache().getRegion("/"+ regions[0]);
+        assertNotNull(localRegion);
+        
+        CqQueryTestListener cqListener = (CqQueryTestListener)getCache().getQueryService().getCq(cqName).getCqAttributes().getCqListener();
+        assertNotNull(cqListener);
+        
+        cqListener.waitForTotalEvents(numObjects + 1 /*Destroy region event*/);
+                
+      }
+    });
+    
+    client2.invoke(new CacheSerializableRunnable("Destroy region on server") {
+      
+      @Override
+      public void run2() throws CacheException {
+        //Check for region destroyed event from server.
+        Region localRegion = getCache().getRegion("/"+ regions[0]);
+        assertNotNull(localRegion);
+        
+        localRegion.destroyRegion();
+      }
+    });
+    
+    client1.invoke(new CacheSerializableRunnable("Check for destroyed region and closed CQ") {
+      
+      @Override
+      public void run2() throws CacheException {
+        // Check for region destroyed event from server.
+        Region localRegion = getCache().getRegion("/" + regions[0]);
+        // IF NULL - GOOD
+        // ELSE - get listener and wait for destroyed.
+        if (localRegion != null) {
+
+          // REGION NULL
+          Log.getLogWriter().info("Local region is NOT null in client 1");
+          
+          pause(5*1000);
+          CqQuery[] cqs = getCache().getQueryService().getCqs();
+          if (cqs != null && cqs.length > 0) {
+            assertTrue(cqs[0].isClosed());
+          }
+
+          // If cqs length is zero then Cq got closed and removed from CQService.
+          assertNull(
+              "Region is still available on client1 even after performing destroyRegion from client2 on server."
+                  + "Client1 must have received destroyRegion message from server with CQ parts in it.",
+              getCache().getRegion("/" + regions[0]));
+
+        }
+      }
+    });
+    
+    cqHelper.closeServer(server);
+  }
+  
+  // helper methods.
+  
+  /**
+   * create bridge server with default attributes for partitioned region.
+   */
+  public void createServer(VM server) {
+    createServer(server, 0, false, 0);
+  }
+  
+  /**
+   * create accessor vm if the given accessor parameter variable is true.
+   * @param server VM to create bridge server.
+   * @param accessor boolean if true creates an accessor bridge server.
+   */
+  public void createServer(VM server, boolean accessor){
+    createServer(server, 0, accessor, 0);
+  }
+  
+  /**
+   * create server with partitioned region with redundant copies.
+   * @param server VM where to create the bridge server.
+   * @param accessor boolean if true create partitioned region with local max memory zero.
+   * @param redundantCopies number of redundant copies for a partitioned region.
+   */
+  public void createServer(VM server, boolean accessor, int redundantCopies){
+    createServer(server, 0, accessor, redundantCopies);
+  }
+  
+  /**
+   * Create a bridge server with partitioned region.
+   * @param server VM where to create the bridge server.
+   * @param port bridge server port.
+   * @param isAccessor if true the under lying partitioned region will not host data on this vm.
+   * @param redundantCopies number of redundant copies for the primary bucket.
+   */
+  public void createServer(VM server, final int port,final boolean isAccessor, final int redundantCopies)
+  {
+    SerializableRunnable createServer = new CacheSerializableRunnable(
+        "Create Cache Server") {
+      public void run2() throws CacheException
+      {
+          getLogWriter().info("### Create Cache Server. ###");
+          //AttributesFactory factory = new AttributesFactory();
+          //factory.setScope(Scope.DISTRIBUTED_ACK);
+          //factory.setMirrorType(MirrorType.KEYS_VALUES);
+          
+          //int maxMem = 0;
+          AttributesFactory attr = new AttributesFactory();
+          //attr.setValueConstraint(valueConstraint);
+          PartitionAttributesFactory paf = new PartitionAttributesFactory();
+          if (isAccessor){
+            paf.setLocalMaxMemory(0);
+          }
+          PartitionAttributes prAttr = paf.setTotalNumBuckets(197).setRedundantCopies(redundantCopies).create();
+          attr.setPartitionAttributes(prAttr);
+          
+          assertFalse(getSystem().isLoner());
+          //assertTrue(getSystem().getDistributionManager().getOtherDistributionManagerIds().size() > 0);
+          for (int i = 0; i < regions.length; i++) {
+            Region r = createRegion(regions[i], attr.create());
+            getLogWriter().info("Server created the region: "+r);
+          }
+//          pause(2000);
+          try {
+            startBridgeServer(port, true);
+          }
+          catch (Exception ex) {
+            fail("While starting CacheServer", ex);
+          }
+//          pause(2000);
+       
+      }
+    };
+
+    server.invoke(createServer);
+  }
+  
+  /**
+   * Create a bridge server with partitioned region.
+   * @param server VM where to create the bridge server.
+   * @param port bridge server port.
+   * @param isAccessor if true the under lying partitioned region will not host data on this vm.
+   * @param redundantCopies number of redundant copies for the primary bucket.
+   */
+  public void createServerWithoutRootRegion(VM server, final int port,final boolean isAccessor, final int redundantCopies)
+  {
+    SerializableRunnable createServer = new CacheSerializableRunnable(
+        "Create Cache Server") {
+      public void run2() throws CacheException
+      {
+          getLogWriter().info("### Create Cache Server. ###");
+          //AttributesFactory factory = new AttributesFactory();
+          //factory.setScope(Scope.DISTRIBUTED_ACK);
+          //factory.setMirrorType(MirrorType.KEYS_VALUES);
+          
+          //int maxMem = 0;
+          AttributesFactory attr = new AttributesFactory();
+          //attr.setValueConstraint(valueConstraint);
+          PartitionAttributesFactory paf = new PartitionAttributesFactory();
+          if (isAccessor){
+            paf.setLocalMaxMemory(0);
+          }
+          PartitionAttributes prAttr = paf.setTotalNumBuckets(1).setRedundantCopies(redundantCopies).create();
+          attr.setPartitionAttributes(prAttr);
+          
+          assertFalse(getSystem().isLoner());
+          //assertTrue(getSystem().getDistributionManager().getOtherDistributionManagerIds().size() > 0);
+          for (int i = 0; i < regions.length; i++) {
+            Region r = createRegionWithoutRoot(regions[i], attr.create());
+            getLogWriter().info("Server created the region: "+r);
+          }
+//          pause(2000);
+          try {
+            startBridgeServer(port, true);
+          }
+          catch (Exception ex) {
+            fail("While starting CacheServer", ex);
+          }
+//          pause(2000);
+      }
+
+      private Region createRegionWithoutRoot(String regionName,
+          RegionAttributes create) {
+        getCache().createRegion(regionName, create);
+        return null;
+      }
+    };
+
+    server.invoke(createServer);
+  }
+  /**
+   * Starts a bridge server on the given port, using the given
+   * deserializeValues and notifyBySubscription to serve up the
+   * given region.
+   *
+   * @since 5.5
+   */
+  protected void startBridgeServer(int port, boolean notifyBySubscription)
+  throws IOException {
+    
+    Cache cache = getCache();
+    CacheServer bridge = cache.addCacheServer();
+    bridge.setPort(port);
+    bridge.setNotifyBySubscription(notifyBySubscription);
+    bridge.start();
+    bridgeServerPort = bridge.getPort();
+  }
+  
+  /* Create Client */
+  public void createClient(VM client, final int serverPort, final String serverHost) {
+    int[] serverPorts = new int[] {serverPort};
+    createClient(client, serverPorts, serverHost, null); 
+  }
+  
+  
+  /* Create Client */
+  public void createClient(VM client, final int[] serverPorts, final String serverHost, final String redundancyLevel) {
+    SerializableRunnable createQService =
+      new CacheSerializableRunnable("Create Client") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Create Client. ###");
+        getLogWriter().info(
+            "Will connect to server at por: " + serverPorts[0] + " and at host : "
+             + serverHost);
+        //Region region1 = null;
+        // Initialize CQ Service.
+        try {
+          getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+        
+        AttributesFactory regionFactory = new AttributesFactory();
+        regionFactory.setScope(Scope.LOCAL);
+        
+        if (redundancyLevel != null){
+          ClientServerTestCase.configureConnectionPool(regionFactory, serverHost, serverPorts[0],-1, true, Integer.parseInt(redundancyLevel), -1, null);
+        } else {
+          ClientServerTestCase.configureConnectionPool(regionFactory, serverHost, serverPorts[0], -1, true, -1, -1, null);
+        }
+        
+        for (int i=0; i < regions.length; i++) {        
+          Region clientRegion = createRegion(regions[i], regionFactory.createRegionAttributes());
+          getLogWriter().info("### Successfully Created Region on Client :" + clientRegion);
+          //region1.getAttributesMutator().setCacheListener(new CqListener());
+        }
+      }
+    };
+    
+    client.invoke(createQService);
+  }
+  
+  public void createCQ(VM vm, final String cqName, final String queryStr) {
+    vm.invoke(new CacheSerializableRunnable("Create CQ :" + cqName) {
+      public void run2() throws CacheException {
+        //pause(60 * 1000);
+        //getLogWriter().info("### DEBUG CREATE CQ START ####");
+        //pause(20 * 1000);
+        
+        getLogWriter().info("### Create CQ. ###" + cqName);
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+        // Create CQ Attributes.
+        CqAttributesFactory cqf = new CqAttributesFactory();
+        CqListener[] cqListeners = {new CqQueryTestListener(getLogWriter())};
+        ((CqQueryTestListener)cqListeners[0]).cqName = cqName;
+        
+        cqf.initCqListeners(cqListeners);
+        CqAttributes cqa = cqf.create();
+        
+        // Create CQ.
+        try {
+          CqQuery cq1 = cqService.newCq(cqName, queryStr, cqa);
+          assertTrue("newCq() state mismatch", cq1.getState().isStopped());
+          getLogWriter().info("Created a new CqQuery : "+cq1);
+        } catch (Exception ex){
+          AssertionError err = new AssertionError("Failed to create CQ " + cqName + " . ");
+          err.initCause(ex);
+          getLogWriter().info("CqService is :" + cqService, err);
+          throw err;
+        }
+      }
+    });   
+  } 
+  
+  /* Returs Cache Server Port */
+  private static int getCacheServerPort() {
+    return bridgeServerPort;
+  }
+  
+  private static String[] getCqs() {
+    CqQuery[] cqs = CacheFactory.getAnyInstance().getQueryService().getCqs();
+    
+    String[] cqnames = new String[cqs.length];
+    int idx = 0;
+    for(CqQuery cq : cqs) {
+      cqnames[idx++] = cq.getName();
+    }
+    
+    return cqnames;
+  }
+  
+  private static int getCqCountFromRegionProfile() {
+    
+    LocalRegion region1 = (LocalRegion)CacheFactory.getAnyInstance().getRegion("/root/regionA");
+    
+    return region1.getFilterProfile().getCqCount();
+  }
+  
+  /* Create/Init values */
+  public void createValues(VM vm, final String regionName, final int size) {
+    vm.invoke(new CacheSerializableRunnable("Create values for region : "+regionName) {
+      public void run2() throws CacheException {
+        Region region1 = getRootRegion().getSubregion(regionName);
+        for (int i = 1; i <= size; i++) {
+          region1.put(KEY+i, new Portfolio(i));
+        }
+        getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
+      }
+    });
+  }
+  
+  private void assertLocalMaxMemory (VM vm){
+    vm.invoke(new CacheSerializableRunnable("Create values") {
+      public void run2() throws CacheException {
+        for (int i = 0; i< regions.length ; i++) {
+          Region region = getRootRegion().getSubregion(regions[i]);
+          assertEquals("The region should be configure with local max memory zero : "
+                  + region, region.getAttributes().getPartitionAttributes()
+                  .getLocalMaxMemory(), 0);
+        }
+        
+      }
+    });
+  }
+  
+  
+  public void createCacheClient(VM client, final int serverPort, final String serverHost){
+    createCacheClient(client, new String[]{serverHost}, new int[]{serverPort}, null);
+  }
+  
+  public void createCacheClient(VM vm, final String[] serverHosts, final int[] serverPorts, final String redundancyLevel) {
+    vm.invoke(new CacheSerializableRunnable("createCacheClient") {
+      public void run2() throws CacheException {
+        getLogWriter().info(
+            "Will connect to server at por: " + serverPorts[0] + " and at host : "
+             + serverHosts[0]);
+        ClientCacheFactory ccf = new ClientCacheFactory();
+        ccf.addPoolServer(serverHosts[0]/*getServerHostName(Host.getHost(0))*/, serverPorts[0]);
+        ccf.setPoolSubscriptionEnabled(true);
+        ccf.set("log-level", getDUnitLogLevel());
+        
+        // Create Client Cache.
+        getClientCache(ccf);
+        
+        //Create regions
+        // Initialize CQ Service.
+        try {
+          getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+        
+        AttributesFactory regionFactory = new AttributesFactory();
+        regionFactory.setScope(Scope.LOCAL);
+        
+        if (redundancyLevel != null){
+          ClientServerTestCase.configureConnectionPool(regionFactory, serverHosts[0], serverPorts[0],-1, true, Integer.parseInt(redundancyLevel), -1, null);
+        } else {
+          ClientServerTestCase.configureConnectionPool(regionFactory, serverHosts[0], serverPorts[0], -1, true, -1, -1, null);
+        }
+        
+        for (int i=0; i < regions.length; i++) {        
+          Region clientRegion = ((ClientCache)getCache()).createClientRegionFactory(ClientRegionShortcut.CACHING_PROXY)
+          .create(regions[i]);
+          getLogWriter().info("### Successfully Created Region on Client :" + clientRegion);
+          //region1.getAttributesMutator().setCacheListener(new CqListener());
+        }
+      }
+    });   
+  }
+}
+
+

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
new file mode 100644
index 0000000..a9a1ac8
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
@@ -0,0 +1,238 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.query.cq.dunit;
+
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.query.data.Portfolio;
+import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
+import com.gemstone.gemfire.cache.query.internal.cq.CqServiceProvider;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+
+import dunit.Host;
+import dunit.SerializableRunnable;
+import dunit.VM;
+
+public class PartitionedRegionCqQueryOptimizedExecuteDUnitTest extends PartitionedRegionCqQueryDUnitTest{
+
+  public PartitionedRegionCqQueryOptimizedExecuteDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+    invokeInEveryVM(new SerializableRunnable("getSystem") {
+      public void run() {
+        CqServiceImpl.EXECUTE_QUERY_DURING_INIT = false;
+      }
+    });
+  }
+  
+  @Override
+  public void tearDown2() throws Exception {
+    invokeInEveryVM(new SerializableRunnable("getSystem") {
+      public void run() {
+        CqServiceImpl.EXECUTE_QUERY_DURING_INIT = true;
+        CqServiceProvider.MAINTAIN_KEYS = true;
+      }
+    });
+    super.tearDown2();
+  }
+  
+  public void testCqExecuteWithoutQueryExecution() throws Exception {
+    final Host host = Host.getHost(0);
+    final VM server = host.getVM(0);
+    final VM client = host.getVM(1);
+    final int numOfEntries = 10;
+    final String cqName = "testCqExecuteWithoutQueryExecution_1";
+
+    createServer(server);
+    // Create values.
+    createValues(server, regions[0], numOfEntries);
+
+    final int thePort = server.invokeInt(PartitionedRegionCqQueryOptimizedExecuteDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+
+    // Create client.
+    createClient(client, thePort, host0);
+
+     /* Create CQs. */
+    createCQ(client, cqName, cqs[0]); 
+    
+    cqHelper.validateCQCount(client, 1);
+    
+    cqHelper.executeCQ(client, cqName, false, null);
+
+    server.invoke(new CacheSerializableRunnable("execute cq") {
+      public void run2() throws CacheException {
+        assertFalse("CqServiceImpl.EXECUTE_QUERY_DURING_INIT flag should be false ", CqServiceImpl.EXECUTE_QUERY_DURING_INIT);
+        int numOfQueryExecutions = (Integer) ((GemFireCacheImpl)getCache()).getCachePerfStats().getStats().get("queryExecutions");
+        assertEquals("Number of query executions for cq.execute should be 0 ", 0, numOfQueryExecutions);
+      }
+    });
+    
+    // Create more values.
+    server.invoke(new CacheSerializableRunnable("Create values") {
+      public void run2() throws CacheException {
+        Region region1 = getRootRegion().getSubregion(regions[0]);
+        for (int i = numOfEntries+1; i <= numOfEntries*2; i++) {
+          region1.put(KEY+i, new Portfolio(i));
+        }
+        getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
+      }
+    });
+    
+    cqHelper.waitForCreated(client, cqName, KEY+numOfEntries*2);
+
+    cqHelper.validateCQ(client, cqName,
+        /* resultSize: */ cqHelper.noTest,
+        /* creates: */ numOfEntries,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ numOfEntries,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ numOfEntries);
+    
+    // Update values.
+    createValues(server, regions[0], 5);
+    createValues(server, regions[0], 10);
+    
+    cqHelper.waitForUpdated(client, cqName, KEY+numOfEntries);
+    
+    
+    // validate Update events.
+    cqHelper.validateCQ(client, cqName,
+        /* resultSize: */ cqHelper.noTest,
+        /* creates: */ numOfEntries,
+        /* updates: */ 15,
+        /* deletes; */ 0,
+        /* queryInserts: */ numOfEntries,
+        /* queryUpdates: */ 15,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ numOfEntries + 15);
+    
+    // Validate delete events.
+    cqHelper.deleteValues(server, regions[0], 5);
+    cqHelper.waitForDestroyed(client, cqName, KEY+5);
+    
+    cqHelper.validateCQ(client, cqName,
+        /* resultSize: */ cqHelper.noTest,
+        /* creates: */ numOfEntries,
+        /* updates: */ 15,
+        /* deletes; */5,
+        /* queryInserts: */ numOfEntries,
+        /* queryUpdates: */ 15,
+        /* queryDeletes: */ 5,
+        /* totalEvents: */ numOfEntries + 15 + 5);
+
+    cqHelper.closeClient(client);   
+    cqHelper.closeServer(server);    
+  }
+  
+  public void testCqExecuteWithoutQueryExecutionAndNoRSCaching() throws Exception {
+    final Host host = Host.getHost(0);
+    final VM server = host.getVM(0);
+    final VM client = host.getVM(1);
+    final int numOfEntries = 10;
+    final String cqName = "testCqExecuteWithoutQueryExecution_1";
+
+    server.invoke(new CacheSerializableRunnable("execute cq") {
+      public void run2() throws CacheException {
+        CqServiceProvider.MAINTAIN_KEYS = false;
+      }
+    });
+    
+    createServer(server);
+    // Create values.
+    createValues(server, regions[0], numOfEntries);
+
+    final int thePort = server.invokeInt(PartitionedRegionCqQueryDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+
+    // Create client.
+    createClient(client, thePort, host0);
+
+     /* Create CQs. */
+    createCQ(client, cqName, cqs[0]); 
+    
+    cqHelper.validateCQCount(client, 1);
+    
+    cqHelper.executeCQ(client, cqName, false, null);
+
+    server.invoke(new CacheSerializableRunnable("execute cq") {
+      public void run2() throws CacheException {
+        assertFalse("CqServiceImpl.EXECUTE_QUERY_DURING_INIT flag should be false ", CqServiceImpl.EXECUTE_QUERY_DURING_INIT);
+        assertFalse("gemfire.cq.MAINTAIN_KEYS flag should be false ", CqServiceProvider.MAINTAIN_KEYS);
+        int numOfQueryExecutions = (Integer) ((GemFireCacheImpl)getCache()).getCachePerfStats().getStats().get("queryExecutions");
+        assertEquals("Number of query executions for cq.execute should be 0 ", 0, numOfQueryExecutions);
+      }
+    });
+    
+    // Create more values.
+    server.invoke(new CacheSerializableRunnable("Create values") {
+      public void run2() throws CacheException {
+        Region region1 = getRootRegion().getSubregion(regions[0]);
+        for (int i = numOfEntries+1; i <= numOfEntries*2; i++) {
+          region1.put(KEY+i, new Portfolio(i));
+        }
+        getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
+      }
+    });
+    
+    cqHelper.waitForCreated(client, cqName, KEY+numOfEntries*2);
+
+    cqHelper.validateCQ(client, cqName,
+        /* resultSize: */ cqHelper.noTest,
+        /* creates: */ numOfEntries,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ numOfEntries,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ numOfEntries);
+    
+    // Update values.
+    createValues(server, regions[0], 5);
+    createValues(server, regions[0], 10);
+    
+    cqHelper.waitForUpdated(client, cqName, KEY+numOfEntries);
+    
+    
+    // validate Update events.
+    cqHelper.validateCQ(client, cqName,
+        /* resultSize: */ cqHelper.noTest,
+        /* creates: */ numOfEntries,
+        /* updates: */ 15,
+        /* deletes; */ 0,
+        /* queryInserts: */ numOfEntries,
+        /* queryUpdates: */ 15,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ numOfEntries + 15);
+    
+    // Validate delete events.
+    cqHelper.deleteValues(server, regions[0], 5);
+    cqHelper.waitForDestroyed(client, cqName, KEY+5);
+    
+    cqHelper.validateCQ(client, cqName,
+        /* resultSize: */ cqHelper.noTest,
+        /* creates: */ numOfEntries,
+        /* updates: */ 15,
+        /* deletes; */5,
+        /* queryInserts: */ numOfEntries,
+        /* queryUpdates: */ 15,
+        /* queryDeletes: */ 5,
+        /* totalEvents: */ numOfEntries + 15 + 5);
+
+    cqHelper.closeClient(client);   
+    cqHelper.closeServer(server);    
+  }
+}


[18/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java
new file mode 100644
index 0000000..447f5ea
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java
@@ -0,0 +1,603 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+/**
+ * 
+ */
+package com.gemstone.gemfire.internal.cache.wan.concurrent;
+
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.EntryExistsException;
+import com.gemstone.gemfire.cache.client.ServerOperationException;
+import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.internal.cache.wan.BatchException70;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+
+import dunit.AsyncInvocation;
+
+/**
+ * All the test cases are similar to SerialWANPropogationDUnitTest except that
+ * the we create concurrent serial GatewaySender with concurrency of 4
+ * @author skumar
+ *
+ */
+public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase {
+
+  /**
+   * @param name
+   */
+  public ConcurrentWANPropogation_1_DUnitTest(String name) {
+    super(name);
+  }
+
+  private static final long serialVersionUID = 1L;
+  
+  /**
+   * All the test cases are similar to SerialWANPropogationDUnitTest
+   * @throws Exception
+   */
+  public void testReplicatedSerialPropagation_withoutRemoteSite() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    //keep the batch size high enough to reduce the number of exceptions in the log
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 400, false, false, null, true, 4, OrderPolicy.KEY });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 400, false, false, null, true, 4, OrderPolicy.KEY });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    
+    addExpectedException(BatchException70.class.getName());
+    addExpectedException(ServerOperationException.class.getName());
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+      1000 });
+    
+    vm2.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", null, isOffHeap() });
+  
+    vm2.invoke(WANTestBase.class, "createReceiver2",
+        new Object[] {nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver2",
+        new Object[] {nyPort });
+    
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+  }
+  
+  public void testReplicatedSerialPropagation() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+  }
+  
+  
+  public void testReplicatedSerialPropagationWithLocalSiteClosedAndRebuilt() throws Exception {
+    addExpectedException("Broken pipe");
+    addExpectedException("Connection reset");
+    addExpectedException("Unexpected IOException");
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+    
+    //---------close local site and build again-----------------------------------------
+    vm4.invoke(WANTestBase.class, "killSender", new Object[] { });
+    vm5.invoke(WANTestBase.class, "killSender", new Object[] { });
+    vm6.invoke(WANTestBase.class, "killSender", new Object[] { });
+    vm7.invoke(WANTestBase.class, "killSender", new Object[] { });
+    
+    Integer regionSize = 
+      (Integer) vm2.invoke(WANTestBase.class, "getRegionSize", new Object[] {testName + "_RR" });
+    getLogWriter().info("Region size on remote is: " + regionSize);
+    
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+      false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+      false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD });
+  
+    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
+    vm5.invoke(WANTestBase.class, "setRemoveFromQueueOnException", new Object[] { "ln", true });
+    
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln", isOffHeap() });
+    
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    addExpectedException(EntryExistsException.class.getName());
+    addExpectedException(BatchException70.class.getName());
+    addExpectedException(ServerOperationException.class.getName());
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+      1000 });
+    //----------------------------------------------------------------------------------
+
+    //verify remote site receives all the events
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+  }
+  
+  /**
+   * Two regions configured with the same sender and put is in progress 
+   * on both the regions.
+   * One of the two regions is destroyed in the middle.
+   * 
+   * @throws Exception
+   */
+  public void testReplicatedSerialPropagationWithLocalRegionDestroy() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    //these are part of remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    //these are part of local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    //senders are created on local site
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 20, false, false, null, true, 3, OrderPolicy.THREAD });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 20, false, false, null, true ,3, OrderPolicy.THREAD});
+
+    //create one RR (RR_1) on remote site
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", null, isOffHeap() });
+
+    //create another RR (RR_2) on remote site
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", null, isOffHeap() });
+    
+    //start the senders on local site
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    //create one RR (RR_1) on local site
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap() });
+
+    //create another RR (RR_2) on local site
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", "ln", isOffHeap() });
+    
+    //start puts in RR_1 in another thread
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_RR_1", 1000 });
+    //do puts in RR_2 in main thread
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR_2", 500 });
+    //destroy RR_2 after above puts are complete
+    vm4.invoke(WANTestBase.class, "destroyRegion", new Object[] { testName + "_RR_2"});
+    
+    try {
+      inv1.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+    //sleep for some time to let all the events propagate to remote site
+    Thread.sleep(20);
+    //vm4.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ln", 0 });
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR_1", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR_2", 500 });
+  }
+
+  /**
+   * 1 region and sender configured on local site and 1 region and a 
+   * receiver configured on remote site. Puts to the local region are in progress.
+   * Remote region is destroyed in the middle.
+   * 
+   * @throws Exception
+   */
+  public void testReplicatedSerialPropagationWithRemoteRegionDestroy() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    //these are part of remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    //these are part of local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    //senders are created on local site
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 500, false, false, null, true, 5, OrderPolicy.KEY });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 500, false, false, null, true, 5, OrderPolicy.KEY });
+
+    //create one RR (RR_1) on remote site
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", null, isOffHeap() });
+
+    //start the senders on local site
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    //create one RR (RR_1) on local site
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap() });
+
+    addExpectedException(BatchException70.class.getName());
+    addExpectedException(ServerOperationException.class.getName());
+    
+    //start puts in RR_1 in another thread
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_RR_1", 10000 });
+    //destroy RR_1 in remote site
+    vm2.invoke(WANTestBase.class, "destroyRegion", new Object[] { testName + "_RR_1"});
+    
+    try {
+      inv1.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+
+    //verify that all is well in local site. All the events should be present in local region
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR_1", 10000 });
+    //assuming some events might have been dispatched before the remote region was destroyed,
+    //sender's region queue will have events less than 1000 but the queue will not be empty.
+    //NOTE: this much verification might be sufficient in DUnit. Hydra will take care of 
+    //more in depth validations.
+    vm4.invoke(WANTestBase.class, "verifyRegionQueueNotEmptyForConcurrentSender", new Object[] {"ln" });
+  }
+  
+  /**
+   * Two regions configured in local with the same sender and put is in progress 
+   * on both the regions. Same two regions are configured on remote site as well.
+   * One of the two regions is destroyed in the middle on remote site.
+   * 
+   * @throws Exception
+   */
+  public void testReplicatedSerialPropagationWithRemoteRegionDestroy2() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    //these are part of remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    //these are part of local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    //senders are created on local site
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 200, false, false, null, true, 5, OrderPolicy.THREAD });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 200, false, false, null, true, 5, OrderPolicy.THREAD });
+
+    //create one RR (RR_1) on remote site
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", null, isOffHeap() });
+
+    //create another RR (RR_2) on remote site
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", null, isOffHeap() });
+    
+    //start the senders on local site
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    //create one RR (RR_1) on local site
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap() });
+
+    //create another RR (RR_2) on local site
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", "ln", isOffHeap() });
+    //destroy RR_2 on remote site in the middle
+    vm2.invoke(WANTestBase.class, "destroyRegion", new Object[] { testName + "_RR_2"});
+    
+    //expected exceptions in the logs
+    addExpectedException(BatchException70.class.getName());
+    addExpectedException(ServerOperationException.class.getName());
+    
+    //start puts in RR_2 in another thread
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR_2", 1000 });
+    
+    //start puts in RR_1 in another thread
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_RR_1", 1000 });
+   
+    try {
+      inv1.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+    //though region RR_2 is destroyed, RR_1 should still get all the events put in it 
+    //in local site
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR_1", 1000 });
+
+  }
+
+  public void testReplicatedSerialPropagationWithRemoteRegionDestroy3()
+      throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    // these are part of remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    // these are part of local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    // senders are created on local site
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 200, false, false, null, true, 5, OrderPolicy.THREAD });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 200, false, false, null, true, 5, OrderPolicy.THREAD });
+
+    // create one RR (RR_1) on remote site
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", null, isOffHeap() });
+
+    // create another RR (RR_2) on remote site
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", null, isOffHeap() });
+
+    // start the senders on local site
+    vm4.invoke(WANTestBase.class, "setRemoveFromQueueOnException",
+        new Object[] { "ln", true });
+    vm5.invoke(WANTestBase.class, "setRemoveFromQueueOnException",
+        new Object[] { "ln", true });
+
+    // start the senders on local site
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    // create one RR (RR_1) on local site
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap() });
+
+    // create another RR (RR_2) on local site
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", "ln", isOffHeap() });
+
+    addExpectedException(BatchException70.class.getName());
+    addExpectedException(ServerOperationException.class.getName());
+
+    // start puts in RR_1 in another thread
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
+        new Object[] { testName + "_RR_1", 1000 });
+    // start puts in RR_2 in another thread
+    AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "doPuts",
+        new Object[] { testName + "_RR_2", 1000 });
+    // destroy RR_2 on remote site in the middle
+    vm2.invoke(WANTestBase.class, "destroyRegion", new Object[] { testName
+        + "_RR_2" });
+
+    try {
+      inv1.join();
+      inv2.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+    // though region RR_2 is destroyed, RR_1 should still get all the events put
+    // in it
+    // in local site
+    try {
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_RR_1", 1000 });
+    } finally {
+      System.setProperty(
+          "gemfire.GatewaySender.REMOVE_FROM_QUEUE_ON_EXCEPTION", "False");
+      vm4.invoke(new CacheSerializableRunnable("UnSetting system property ") {
+        public void run2() throws CacheException {
+          System.setProperty(
+              "gemfire.GatewaySender.REMOVE_FROM_QUEUE_ON_EXCEPTION", "False");
+        }
+      });
+
+      vm5.invoke(new CacheSerializableRunnable("UnSetting system property ") {
+        public void run2() throws CacheException {
+          System.setProperty(
+              "gemfire.GatewaySender.REMOVE_FROM_QUEUE_ON_EXCEPTION", "False");
+        }
+      });
+    }
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java
new file mode 100644
index 0000000..3f95552
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java
@@ -0,0 +1,480 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+/**
+ * 
+ */
+package com.gemstone.gemfire.internal.cache.wan.concurrent;
+
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.EntryExistsException;
+import com.gemstone.gemfire.cache.client.ServerOperationException;
+import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase.MyGatewayEventFilter;
+
+import dunit.AsyncInvocation;
+
+/**
+ * All the test cases are similar to SerialWANPropogationDUnitTest except that
+ * the we create concurrent serial GatewaySender with concurrency of 4
+ * @author skumar
+ *
+ */
+public class ConcurrentWANPropogation_2_DUnitTest extends WANTestBase {
+
+  /**
+   * @param name
+   */
+  public ConcurrentWANPropogation_2_DUnitTest(String name) {
+    super(name);
+  }
+
+  private static final long serialVersionUID = 1L;
+  
+  public void testSerialReplicatedWanWithOverflow() {
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, "createFirstLocatorWithDSId",
+        new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver",
+        new Object[] {nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver",
+        new Object[] {nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    //keep the maxQueueMemory low enough to trigger eviction
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 50, 5, false, false, null, true, 5, OrderPolicy.KEY });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 50, 5, false, false, null, true, 5, OrderPolicy.KEY });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "doHeavyPuts", new Object[] {
+        testName + "_RR", 150 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 150 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 150 });
+  }
+
+  public void Bug46921_testSerialReplicatedWanWithPersistence() {
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true, 5, OrderPolicy.THREAD });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true, 5, OrderPolicy.THREAD });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+
+  }
+
+  public void testReplicatedSerialPropagationToTwoWanSites() throws Exception {
+
+    Integer lnPort = createFirstLocatorWithDSId(1);
+    Integer nyPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer tkPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 3, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "lnSerial1",
+        2, false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "lnSerial1",
+        2, false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "lnSerial2",
+        3, false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "lnSerial2",
+        3, false, 100, 10, false, false, null, true, 5 , OrderPolicy.THREAD});
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial1" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial1" });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial2" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial2" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "lnSerial1,lnSerial2", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "lnSerial1,lnSerial2", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "lnSerial1,lnSerial2", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "lnSerial1,lnSerial2", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+  }
+
+  public void testReplicatedSerialPropagationHA() throws Exception {
+    addExpectedException("Broken pipe");
+    addExpectedException("Connection reset");
+    addExpectedException("Unexpected IOException");
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    AsyncInvocation inv1 = vm5.invokeAsync(WANTestBase.class, "doPuts",
+        new Object[] { testName + "_RR", 10000 });
+    pause(2000);
+    AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "killSender");
+    
+    inv1.join();
+    inv2.join();
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 10000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 10000 });
+  }
+
+  public void testReplicatedSerialPropagationWithConflation() throws Exception {
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 1000, true, false, null, true, 5, OrderPolicy.THREAD });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 1000, true, false, null, true, 5, OrderPolicy.THREAD });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+  }
+
+  public void testReplicatedSerialPropagationWithParallelThreads()
+      throws Exception {
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] {1});
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] {2,lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true, 4, OrderPolicy.THREAD });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true, 4, OrderPolicy.THREAD });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "doMultiThreadedPuts", new Object[] {
+        testName + "_RR", 1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+  }
+
+  public void testSerialPropogationWithFilter() throws Exception {
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, "createFirstLocatorWithDSId",
+        new Object[] {1});
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] {2,lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false,
+        new MyGatewayEventFilter(), true, 5, OrderPolicy.THREAD });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false,
+        new MyGatewayEventFilter(), true, 5, OrderPolicy.THREAD });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 800 });
+  }
+
+  public void testReplicatedSerialPropagationWithFilter() throws Exception {
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false,
+        new MyGatewayEventFilter(), true, 5, OrderPolicy.THREAD });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false,
+        new MyGatewayEventFilter(), true, 5, OrderPolicy.THREAD });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName, null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName, null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName, "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName, "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName, "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName, "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 800 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 800 });
+  }
+  
+  public void testNormalRegionSerialPropagation() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD });
+    vm5.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true, 5, OrderPolicy.THREAD });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    pause(500);
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createNormalRegion", new Object[] {
+        testName + "_RR", "ln" });
+    vm5.invoke(WANTestBase.class, "createNormalRegion", new Object[] {
+        testName + "_RR", "ln" });
+
+    vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+
+    vm4.invoke(WANTestBase.class, "checkQueueStats", new Object[] { "ln", 0,
+        0, 0, 0});
+
+    vm5.invoke(WANTestBase.class, "checkQueueStats", new Object[] { "ln", 0,
+        1000, 0, 0 });
+    
+    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", 1000});
+
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_RR", 0});
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 0 });
+    
+    vm2.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {0, 0, 0});
+    
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
new file mode 100644
index 0000000..057f89b
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
@@ -0,0 +1,194 @@
+package com.gemstone.gemfire.internal.cache.wan.disttx;
+
+import com.gemstone.gemfire.CancelException;
+import com.gemstone.gemfire.cache.CacheClosedException;
+import com.gemstone.gemfire.internal.cache.ForceReattemptException;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+
+import dunit.AsyncInvocation;
+import dunit.SerializableCallable;
+
+public class DistTXWANDUnitTest extends WANTestBase {
+
+  private static final long serialVersionUID = 1L;
+
+  public DistTXWANDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+    
+    this.invokeInEveryVM(new SerializableCallable() {
+      @Override
+      public Object call() throws Exception {
+        System.setProperty("gemfire.log-level", getDUnitLogLevel());
+        return null;
+      }
+    }); 
+  }
+  
+
+  /*
+   * Disabled because it hangs with current implementation of notifying
+   * adjunct receivers by sending DistTXAdjunctCommitMessage from primary at the
+   * time of commit.
+   */
+  public void DISABLED_testPartitionedSerialPropagation_SenderSameAsCoordinator() throws Exception {
+
+    
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "doDistTXPuts", new Object[] { testName + "_PR",
+        50 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 50 });
+  }
+
+  public void testPartitionedSerialPropagation_SenderNotSameAsCoordinator() throws Exception {
+
+    
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    vm6.invoke(WANTestBase.class, "doDistTXPuts", new Object[] { testName + "_PR",
+        50 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 50 });
+  }
+
+  
+  public void testPartitionedRegionParallelPropagation() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap()  });
+
+    //before doing any puts, let the senders be running in order to ensure that
+    //not a single event will be lost
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "doDistTXPuts", new Object[] { testName + "_PR",
+        5 });
+    
+    //verify all buckets drained on all sender nodes.
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 5 });
+  }
+
+  public void testDummy() {
+  }
+  
+}
+

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
new file mode 100644
index 0000000..eea4f81
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
@@ -0,0 +1,476 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+/**
+ * 
+ */
+package com.gemstone.gemfire.internal.cache.wan.misc;
+
+import com.gemstone.gemfire.cache.wan.GatewaySender;
+import com.gemstone.gemfire.internal.cache.BucketRegion;
+import com.gemstone.gemfire.internal.cache.PartitionedRegion;
+import com.gemstone.gemfire.internal.cache.RegionQueue;
+import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+import com.gemstone.gemfire.internal.cache.wan.parallel.ConcurrentParallelGatewaySenderEventProcessor;
+import com.gemstone.gemfire.internal.cache.wan.parallel.ConcurrentParallelGatewaySenderQueue;
+import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelGatewaySenderQueue;
+
+import dunit.AsyncInvocation;
+import dunit.DistributedTestCase;
+
+import java.util.Set;
+
+/**
+ * @author skumar
+ *
+ */
+public class CommonParallelGatewaySenderDUnitTest extends WANTestBase {
+
+  public CommonParallelGatewaySenderDUnitTest(String name ){
+    super(name);
+  }
+  
+  public void testSameSenderWithNonColocatedRegions() throws Exception {
+    addExpectedException("cannot have the same parallel");
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR1", "ln", 1, 100, isOffHeap() });
+    try {
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR2", "ln", 1, 100, isOffHeap() });
+      fail("Expected IllegateStateException : cannot have the same parallel gateway sender");
+    }
+    catch (Exception e) {
+      if (!(e.getCause() instanceof IllegalStateException)
+          || !(e.getCause().getMessage()
+              .contains("cannot have the same parallel gateway sender id"))) {
+        fail("Expected IllegalStateException", e);
+      }
+    }
+  }
+  
+  /**
+   * Simple scenario. Two regions attach the same PGS
+   * @throws Exception
+   * Below test is disabled intentionally
+    1> In this release 8.0, for rolling upgrade support queue name is changed to old style
+    2>Comman parallel sender for different non colocated regions is not supported in 8.0 so no need to bother about 
+      ParallelGatewaySenderQueue#convertPathToName
+    3> We have to enabled it in next release
+    4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 
+     and version prior to 8.0
+   */
+  public void DISABLED_testParallelPropagation() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR1", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR1", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR1", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR1", "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR2", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR2", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR2", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR2", "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR1", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR1", null, 1, 100, isOffHeap() });
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR2", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR2", null, 1, 100, isOffHeap() });
+    //before doing any puts, let the senders be running in order to ensure that
+    //not a single event will be lost
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR1",
+        1000 });
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR2",
+      1000 });
+    
+    //verify all buckets drained on all sender nodes.
+    vm4.invoke(CommonParallelGatewaySenderDUnitTest.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(CommonParallelGatewaySenderDUnitTest.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm6.invoke(CommonParallelGatewaySenderDUnitTest.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm7.invoke(CommonParallelGatewaySenderDUnitTest.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR1", 1000 });
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR2", 1000 });
+  }
+  
+  /**
+   * The PGS is persistence enabled but not the Regions
+   * Below test is disabled intentionally
+    1> In this release 8.0, for rolling upgrade support queue name is changed to old style
+    2>Comman parallel sender for different non colocated regions is not supported in 8.0 so no need to bother about 
+      ParallelGatewaySenderQueue#convertPathToName
+    3> We have to enabled it in next release
+    4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 
+     and version prior to 8.0
+   */
+  public void DISABLED_testParallelPropagationPersistenceEnabled() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, true, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, true, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, true, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, true, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR1", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR1", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR1", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR1", "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR2", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR2", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR2", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR2", "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR1", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR1", null, 1, 100, isOffHeap() });
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR2", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR2", null, 1, 100, isOffHeap() });
+    //before doing any puts, let the senders be running in order to ensure that
+    //not a single event will be lost
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR1",
+        1000 });
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR2",
+      1000 });
+    
+    //verify all buckets drained on all sender nodes.
+    vm4.invoke(CommonParallelGatewaySenderDUnitTest.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(CommonParallelGatewaySenderDUnitTest.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm6.invoke(CommonParallelGatewaySenderDUnitTest.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm7.invoke(CommonParallelGatewaySenderDUnitTest.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR1", 1000 });
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR2", 1000 });
+  }
+  
+  
+  /**
+   * Enable persistence for GatewaySender.
+   * Pause the sender and do some puts in local region.  
+   * Close the local site and rebuild the region and sender from disk store.
+   * Dispatcher should not start dispatching events recovered from persistent sender.
+   * Check if the remote site receives all the events.
+   * Below test is disabled intentionally
+    1> In this release 8.0, for rolling upgrade support queue name is changed to old style
+    2>Comman parallel sender for different non colocated regions is not supported in 8.0 so no need to bother about 
+      ParallelGatewaySenderQueue#convertPathToName
+    3> We have to enabled it in next release
+    4> Version based rolling upgrade support should be provided. based on the version of the gemfire QSTRING should be used between 8.0 
+     and version prior to 8.0
+   */
+  public void DISABLED_testPRWithGatewaySenderPersistenceEnabled_Restart() {
+    //create locator on local site
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    //create locator on remote site
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    //create receiver on remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    //create cache in local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    //create senders with disk store
+    String diskStore1 = (String) vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore2 = (String) vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore3 = (String) vm6.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+    String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true });
+
+    getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4);
+    
+    //create PR on remote site
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName+"PR1", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName+"PR1", null, 1, 100, isOffHeap() });
+    
+    //create PR on remote site
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName+"PR2", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName+"PR2", null, 1, 100, isOffHeap() });
+    
+    //create PR on local site
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName+"PR1", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName+"PR1", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName+"PR1", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName+"PR1", "ln", 1, 100, isOffHeap() });
+
+    //create PR on local site
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName+"PR2", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName+"PR2", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName+"PR2", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName+"PR2", "ln", 1, 100, isOffHeap() });
+
+    
+    //start the senders on local site
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    //wait for senders to become running
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    //pause the senders
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    
+    //start puts in region on local site
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName+"PR1", 3000 });
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName+"PR2", 5000 });
+    getLogWriter().info("Completed puts in the region");
+    
+    //--------------------close and rebuild local site -------------------------------------------------
+    //kill the senders
+    vm4.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm5.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm6.invoke(WANTestBase.class, "killSender", new Object[] {});
+    vm7.invoke(WANTestBase.class, "killSender", new Object[] {});
+    
+    getLogWriter().info("Killed all the senders.");
+    
+    //restart the vm
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    
+    getLogWriter().info("Created back the cache");
+    
+   //create senders with disk store
+    vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore1, true });
+    vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore2, true });
+    vm6.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore3, true });
+    vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", 
+        new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true });
+    
+    getLogWriter().info("Created the senders back from the disk store.");
+    //create PR on local site
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName+"PR1", "ln", 1, 100, isOffHeap() });
+    AsyncInvocation inv2 = vm5.invokeAsync(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName+"PR1", "ln", 1, 100, isOffHeap() });
+    AsyncInvocation inv3 = vm6.invokeAsync(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName+"PR1", "ln", 1, 100, isOffHeap() });
+    AsyncInvocation inv4 = vm7.invokeAsync(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName+"PR1", "ln", 1, 100, isOffHeap() });
+    
+    try {
+      inv1.join();
+      inv2.join();
+      inv3.join();
+      inv4.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+
+    inv1 = vm4.invokeAsync(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName+"PR2", "ln", 1, 100, isOffHeap() });
+    inv2 = vm5.invokeAsync(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName+"PR2", "ln", 1, 100, isOffHeap() });
+    inv3 = vm6.invokeAsync(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName+"PR2", "ln", 1, 100, isOffHeap() });
+    inv4 = vm7.invokeAsync(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName+"PR2", "ln", 1, 100, isOffHeap() });
+    
+    try {
+      inv1.join();
+      inv2.join();
+      inv3.join();
+      inv4.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+    
+    getLogWriter().info("Created back the partitioned regions");
+    
+    //start the senders in async mode. This will ensure that the 
+    //node of shadow PR that went down last will come up first
+    vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    getLogWriter().info("Waiting for senders running.");
+    //wait for senders running
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    getLogWriter().info("All the senders are now running...");
+    
+    //----------------------------------------------------------------------------------------------------
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName+"PR1", 3000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName+"PR1", 3000 });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName+"PR2", 5000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName+"PR2", 5000 });
+  }
+  
+  public static void validateParallelSenderQueueAllBucketsDrained(final String senderId) {
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    GatewaySender sender = null;
+    for (GatewaySender s : senders) {
+      if (s.getId().equals(senderId)) {
+        sender = s;
+        break;
+      }
+    }
+    ConcurrentParallelGatewaySenderQueue regionQueue = (ConcurrentParallelGatewaySenderQueue)((AbstractGatewaySender)sender).getQueues().toArray(new RegionQueue[1])[0];
+    
+    Set<PartitionedRegion> shadowPRs = (Set<PartitionedRegion>)regionQueue.getRegions();
+    
+    for(PartitionedRegion shadowPR: shadowPRs) {
+      Set<BucketRegion> buckets = shadowPR.getDataStore().getAllLocalBucketRegions();
+      
+      for (final BucketRegion bucket : buckets) {
+        WaitCriterion wc = new WaitCriterion() {
+          public boolean done() {
+            if (bucket.keySet().size() == 0) {
+              getLogWriter().info("Bucket " + bucket.getId() + " is empty");
+              return true;
+            }
+            return false;
+          }
+     
+          public String description() {
+            return "Expected bucket entries for bucket: " + bucket.getId() + " is: 0 but actual entries: " 
+              + bucket.keySet().size() + " This bucket isPrimary: " + bucket.getBucketAdvisor().isPrimary() + " KEYSET: " + bucket.keySet();
+          }
+        };
+        DistributedTestCase.waitForCriterion(wc, 180000, 50, true);
+      
+      }//for loop ends
+    }
+    
+
+  }
+  
+}



[43/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
new file mode 100644
index 0000000..4b09e73
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
@@ -0,0 +1,303 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.query.cq.dunit;
+
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.query.data.Portfolio;
+import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
+import com.gemstone.gemfire.cache.query.internal.cq.CqServiceProvider;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.internal.AvailablePortHelper;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+
+import dunit.Host;
+import dunit.SerializableRunnable;
+import dunit.VM;
+
+/**
+ * Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag
+ *
+ */
+public class CqQueryOptimizedExecuteDUnitTest extends CqQueryDUnitTest{
+
+  public CqQueryOptimizedExecuteDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+    invokeInEveryVM(new SerializableRunnable("getSystem") {
+      public void run() {
+        CqServiceImpl.EXECUTE_QUERY_DURING_INIT = false;
+      }
+    });
+  }
+  
+  @Override
+  public void tearDown2() throws Exception {
+    invokeInEveryVM(new SerializableRunnable("getSystem") {
+      public void run() {
+        CqServiceImpl.EXECUTE_QUERY_DURING_INIT = true;
+        CqServiceProvider.MAINTAIN_KEYS = true;
+      }
+    });
+    super.tearDown2();
+  }
+  
+  public void testCqExecuteWithoutQueryExecution() throws Exception {
+    final Host host = Host.getHost(0);
+    final VM server = host.getVM(0);
+    final VM client = host.getVM(1);
+    final int numOfEntries = 10;
+    final String cqName = "testCqExecuteWithoutQueryExecution_1";
+
+    createServer(server);
+    // Create values.
+    createValues(server, regions[0], numOfEntries);
+
+    final int thePort = server.invokeInt(CqQueryDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+
+    // Create client.
+    createClient(client, thePort, host0);
+
+     /* Create CQs. */
+    createCQ(client, cqName, cqs[0]); 
+    
+    validateCQCount(client, 1);
+    
+    executeCQ(client, cqName, false, null);
+
+    server.invoke(new CacheSerializableRunnable("execute cq") {
+      public void run2() throws CacheException {
+        assertFalse("CqServiceImpl.EXECUTE_QUERY_DURING_INIT flag should be false ", CqServiceImpl.EXECUTE_QUERY_DURING_INIT);
+        int numOfQueryExecutions = (Integer) ((GemFireCacheImpl)getCache()).getCachePerfStats().getStats().get("queryExecutions");
+        assertEquals("Number of query executions for cq.execute should be 0 ", 0, numOfQueryExecutions);
+      }
+    });
+    
+    // Create more values.
+    server.invoke(new CacheSerializableRunnable("Create values") {
+      public void run2() throws CacheException {
+        Region region1 = getRootRegion().getSubregion(regions[0]);
+        for (int i = numOfEntries+1; i <= numOfEntries*2; i++) {
+          region1.put(KEY+i, new Portfolio(i));
+        }
+        getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
+      }
+    });
+    
+ 
+    waitForCreated(client, cqName, KEY+numOfEntries*2);
+
+    validateCQ(client, cqName,
+        /* resultSize: */ noTest,
+        /* creates: */ numOfEntries,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ numOfEntries,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ numOfEntries);
+    
+    // Update values.
+    createValues(server, regions[0], 5);
+    createValues(server, regions[0], 10);
+    
+    waitForUpdated(client, cqName, KEY+numOfEntries);
+    
+    
+    // validate Update events.
+    validateCQ(client, cqName,
+        /* resultSize: */ noTest,
+        /* creates: */ numOfEntries,
+        /* updates: */ 15,
+        /* deletes; */ 0,
+        /* queryInserts: */ numOfEntries,
+        /* queryUpdates: */ 15,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ numOfEntries + 15);
+    
+    // Validate delete events.
+    deleteValues(server, regions[0], 5);
+    waitForDestroyed(client, cqName, KEY+5);
+    
+    validateCQ(client, cqName,
+        /* resultSize: */ noTest,
+        /* creates: */ numOfEntries,
+        /* updates: */ 15,
+        /* deletes; */5,
+        /* queryInserts: */ numOfEntries,
+        /* queryUpdates: */ 15,
+        /* queryDeletes: */ 5,
+        /* totalEvents: */ numOfEntries + 15 + 5);
+
+    closeClient(client);   
+    closeServer(server);    
+  }
+
+  public void testCqExecuteWithoutQueryExecutionAndNoRSCaching() throws Exception {
+    final Host host = Host.getHost(0);
+    final VM server = host.getVM(0);
+    final VM client = host.getVM(1);
+    final int numOfEntries = 10;
+    final String cqName = "testCqExecuteWithoutQueryExecution_1";
+
+    server.invoke(new CacheSerializableRunnable("execute cq") {
+      public void run2() throws CacheException {
+        CqServiceProvider.MAINTAIN_KEYS = false;
+      }
+    });
+    
+    createServer(server);
+    // Create values.
+    createValues(server, regions[0], numOfEntries);
+
+    final int thePort = server.invokeInt(CqQueryDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+
+    // Create client.
+    createClient(client, thePort, host0);
+
+     /* Create CQs. */
+    createCQ(client, cqName, cqs[0]); 
+    
+    validateCQCount(client, 1);
+    
+    executeCQ(client, cqName, false, null);
+
+    server.invoke(new CacheSerializableRunnable("execute cq") {
+      public void run2() throws CacheException {
+        assertFalse("CqServiceImpl.EXECUTE_QUERY_DURING_INIT flag should be false ", CqServiceImpl.EXECUTE_QUERY_DURING_INIT);
+        assertFalse("gemfire.cq.MAINTAIN_KEYS flag should be false ", CqServiceProvider.MAINTAIN_KEYS);
+        int numOfQueryExecutions = (Integer) ((GemFireCacheImpl)getCache()).getCachePerfStats().getStats().get("queryExecutions");
+        assertEquals("Number of query executions for cq.execute should be 0 ", 0, numOfQueryExecutions);
+      }
+    });
+    
+    // Create more values.
+    server.invoke(new CacheSerializableRunnable("Create values") {
+      public void run2() throws CacheException {
+        Region region1 = getRootRegion().getSubregion(regions[0]);
+        for (int i = numOfEntries+1; i <= numOfEntries*2; i++) {
+          region1.put(KEY+i, new Portfolio(i));
+        }
+        getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
+      }
+    });
+    
+    waitForCreated(client, cqName, KEY+numOfEntries*2);
+
+    validateCQ(client, cqName,
+        /* resultSize: */ noTest,
+        /* creates: */ numOfEntries,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ numOfEntries,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ numOfEntries);
+    
+    // Update values.
+    createValues(server, regions[0], 5);
+    createValues(server, regions[0], 10);
+    
+    waitForUpdated(client, cqName, KEY+numOfEntries);
+    
+    
+    // validate Update events.
+    validateCQ(client, cqName,
+        /* resultSize: */ noTest,
+        /* creates: */ numOfEntries,
+        /* updates: */ 15,
+        /* deletes; */ 0,
+        /* queryInserts: */ numOfEntries,
+        /* queryUpdates: */ 15,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ numOfEntries + 15);
+    
+    // Validate delete events.
+    deleteValues(server, regions[0], 5);
+    waitForDestroyed(client, cqName, KEY+5);
+    
+    validateCQ(client, cqName,
+        /* resultSize: */ noTest,
+        /* creates: */ numOfEntries,
+        /* updates: */ 15,
+        /* deletes; */5,
+        /* queryInserts: */ numOfEntries,
+        /* queryUpdates: */ 15,
+        /* queryDeletes: */ 5,
+        /* totalEvents: */ numOfEntries + 15 + 5);
+
+    closeClient(client);   
+    closeServer(server);    
+  }
+
+// Moved from CqQueryDUnitTest class.
+//Tests when two pools each are configured to a different server
+  // Each cq uses a different pool and the servers are shutdown.
+  // The listeners for each cq should receive a connect and disconnect
+  // when their respective servers are shutdown
+  public void testCQAllServersLeaveMultiplePool() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server1 = host.getVM(1);
+    VM server2 = host.getVM(2);
+    VM client = host.getVM(3);
+
+    createServer(server1);
+
+    final int port1 = server1.invokeInt(CqQueryDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server1.getHost());
+    final int[] ports = AvailablePortHelper.getRandomAvailableTCPPorts(1);
+
+    createServer(server2, ports[0]);
+    final int thePort2 = server2.invokeInt(CqQueryDUnitTest.class,
+        "getCacheServerPort");
+    pause(8 * 1000);
+
+    // Create client
+    createClientWith2Pools(client, new int[] { port1 }, new int[] { thePort2 },
+        host0, "-1");
+
+    // Create CQs.
+    createCQ(client, "testCQAllServersLeave_" + 11, cqs[11], true);
+    executeCQ(client, "testCQAllServersLeave_" + 11, false, null);
+
+    createCQ(client, "testCQAllServersLeave_" + 12, cqs[12], true);
+    executeCQ(client, "testCQAllServersLeave_" + 12, false, null);
+
+    pause(5 * 1000);
+    waitForCqsConnected(client, "testCQAllServersLeave_11", 1);
+    waitForCqsConnected(client, "testCQAllServersLeave_12", 1);
+    // CREATE.
+    createValues(server2, regions[0], 10);
+    createValues(server2, regions[1], 10);
+    waitForCreated(client, "testCQAllServersLeave_11", KEY + 10);
+
+    // Close server1 pause is unnecessary here since each cq has it's own pool
+    // and each pool is configured only to 1 server.
+    closeServer(server1);
+    waitForCqsDisconnected(client, "testCQAllServersLeave_11", 1);
+
+    createValues(server2, regions[1], 20);
+    waitForCreated(client, "testCQAllServersLeave_12", KEY + 19);
+    
+    // Close server 2 pause unnecessary here since each cq has it's own pool
+    closeServer(server2);
+    waitForCqsDisconnected(client, "testCQAllServersLeave_12", 1);
+
+    // Close.
+    closeClient(client);
+  }  
+
+}


[06/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java
new file mode 100644
index 0000000..c2ef6f3
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java
@@ -0,0 +1,416 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.wan.parallel;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+
+public class ParallelWANPropagationLoopBackDUnitTest extends WANTestBase {
+
+  private static final long serialVersionUID = 1L;
+  
+  public ParallelWANPropagationLoopBackDUnitTest(String name) {
+    super(name);
+  }
+  
+  public void setUp() throws Exception {
+    super.setUp();
+  }
+  
+  /**
+   * Test loop back issue between 2 WAN sites (LN & NY). LN -> NY -> LN.
+   * Site1 (LN): vm2, vm4, vm5
+   * Site2 (NY): vm3, vm6, vm7
+   */
+  public void testParallelPropagationLoopBack() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    //create receiver on site1 and site2
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { lnPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    //create cache on site1 and site2
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+
+    //create senders on site1
+    vm2.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true });
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true });
+    
+    //create senders on site2
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ny", 1,
+      true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ny", 1,
+      true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ny", 1,
+      true, 100, 10, false, false, null, true });
+    
+    //create PR on site1
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 0, 100, isOffHeap()  });
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 0, 100, isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 0, 100, isOffHeap()  });
+    
+    //create PR on site2
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ny", 0, 100, isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ny", 0, 100, isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ny", 0, 100, isOffHeap()  });
+    
+    //start sender on site1
+    vm2.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    //start sender on site2
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ny" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ny" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ny" });
+    
+    //pause senders on site1
+    vm2.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    
+    //pause senders on site2
+    vm3.invoke(WANTestBase.class, "pauseSender", new Object[] { "ny" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ny" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ny" });
+    
+    //this is required since sender pause doesn't take effect immediately
+    pause(1000);
+    
+    //Do 100 puts on site1
+    vm2.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+      100 });
+    //do next 100 puts on site2
+    vm3.invoke(WANTestBase.class, "doPutsFrom", new Object[] { testName + "_PR",
+      100, 200 });
+    //verify queue size on both sites
+    vm2.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ln", 100 });
+    vm4.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ln", 100 });
+    vm5.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ln", 100 });
+    
+    vm3.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ny", 100 });
+    vm6.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ny", 100 });
+    vm7.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ny", 100 });
+    
+    //resume sender on site1
+    vm2.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+     
+    //validate events reached site2 from site1
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 200 });
+    
+    //on site2, verify queue size again
+    //this ensures that loopback is not happening since the queue size is same as before
+    //the event coming from site1 are not enqueued again
+    vm3.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ny", 100 });
+    vm6.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ny", 100 });
+    vm7.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ny", 100 });
+    
+    //resume sender on site2
+    vm3.invoke(WANTestBase.class, "resumeSender", new Object[] { "ny" });
+    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ny" });
+    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ny" });
+    
+    //validate region size on both the sites
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 200 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 200 });
+  }
+  
+  /**
+   * Test loop back issue among 3 WAN sites with Ring topology i.e. LN -> NY -> TK -> LN
+   * Site1 (LN): vm3, vm6
+   * Site2 (NY): vm4, vm7
+   * Site3 (TK): vm5
+   */
+  public void testParallelPropagationLoopBack3Sites() {
+    //Create locators
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer tkPort = (Integer)vm2.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 3, lnPort });
+    
+    //create cache and receivers on all the 3 sites
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { lnPort });
+    vm4.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm5.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
+    
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+    
+    //create senders on all the 3 sites
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true });
+    
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ny", 3,
+      true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ny", 3,
+      true, 100, 10, false, false, null, true });
+    
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "tk", 1,
+      true, 100, 10, false, false, null, true });
+    
+    //create PR on the 3 sites
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 0, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 0, 100, isOffHeap() });
+    
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ny", 0, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ny", 0, 100, isOffHeap() });
+    
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "tk", 0, 100, isOffHeap() });
+    
+    //start senders on all the sites 
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ny" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ny" });
+    
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "tk" });
+    
+    //pause senders on site1 and site3. Site2 has the sender running to pass along events
+    vm3.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "tk" });
+    
+    //need to have this pause since pauseSender doesn't take effect immediately
+    pause(1000);
+    
+    //do puts on site1
+    vm3.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+      100 });
+    
+    //do more puts on site3
+    vm5.invoke(WANTestBase.class, "doPutsFrom", new Object[] { testName + "_PR",
+      100, 200 });
+    
+    //verify queue size on site1 and site3
+    vm3.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ln", 100 });
+    vm5.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "tk", 100 });
+
+    //resume sender on site1 so that events reach site2 and from there to site3
+    vm3.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    
+    //validate region size on site2 (should have 100) and site3 (should have 200)
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 100 });
+    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 200 });
+    
+    //verify queue size remains same on site3 which means event loopback did not happen
+    //this means events coming from site1 are not enqueued back into the sender
+    vm5.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "tk", 100 });
+    
+    //resume sender on site3
+    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "tk" });
+    
+    //validate region size
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 200 });
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 200 });
+    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 200 });
+  }
+  
+  /**
+   * Test loop back issue among 3 WAN sites with N to N topology 
+   * i.e. each site connected to all other sites.
+   * Puts are done to only one DS.
+   * LN site: vm3, vm6
+   * NY site: vm4, vm7
+   * TK site: vm5
+   */
+  public void testParallelPropagationLoopBack3SitesNtoNTopologyPutFromOneDS() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer tkPort = (Integer)vm2.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 3, lnPort });
+    
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { lnPort });
+    vm4.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm5.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
+    
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+    
+    //site1
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+      true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+      true, 100, 10, false, false, null, true });
+
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln2", 3,
+      true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln2", 3,
+      true, 100, 10, false, false, null, true });
+    
+    //site2
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ny1", 1,
+      true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ny1", 1,
+      true, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ny2", 3,
+      true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ny2", 3,
+      true, 100, 10, false, false, null, true });
+
+    //site3
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "tk1", 1,
+      true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "tk2", 2,
+      true, 100, 10, false, false, null, true });
+
+    //create PR
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln1,ln2", 0, 1, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln1,ln2", 0, 1, isOffHeap() });
+    
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ny1,ny2", 0, 1, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ny1,ny2", 0, 1, isOffHeap() });
+    
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "tk1,tk2", 0, 1, isOffHeap() });
+
+    //start all the senders
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln2" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln2" });
+    
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ny1" });
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ny2" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ny1" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ny2" });
+    
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "tk1" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "tk2" });
+    
+    //pause senders on all the sites
+    vm3.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln1" });
+    vm3.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln2" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln1" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln2" });
+    
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ny1" });
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ny2" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ny1" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ny2" });
+    
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "tk1" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "tk2" });
+    
+    //this is required since sender pause doesn't take effect immediately
+    pause(1000);
+
+    //do puts on site1
+    vm3.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+      100 });
+    
+    //verify queue size on site1 and site3
+    vm3.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ln1", 100 });
+    vm3.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ln2", 100 });
+    
+    //resume sender (from site1 to site2) on site1
+    vm3.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln1" });
+    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln1" });
+
+    //validate region size on site2
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 100 });
+
+    //verify queue size on site2 (sender 2 to 1)
+    //should remain at 0 as the events from site1 should not go back to site1
+    vm4.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ny1", 0 });
+    
+    //verify queue size on site2 (sender 2 to 3)
+    //should remain at 0 as events from site1 will reach site3 directly..site2 need not send to site3 again  
+    vm4.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ny2", 0 });
+    
+    //do more puts on site3
+    vm5.invoke(WANTestBase.class, "doPutsFrom", new Object[] { testName + "_PR",
+      100, 200 });
+    
+    //resume sender (from site3 to site2) on site3
+    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "tk2" });
+    
+    //validate region size on site2
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 200 });
+    
+    //verify queue size on site2 (sender 2 to 3)
+    //should remain at 0 as the events from site3 should not go back to site3
+    vm4.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ny2", 0 });
+    
+    //verify queue size on site2 (sender 2 to 1)
+    //should remain at 0 as events from site3 will reach site1 directly..site2 need not send to site1 again  
+    vm4.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ny1", 0 });
+    
+    //resume all senders
+    vm3.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln2" });
+    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln2" });
+    
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ny1" });
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ny2" });
+    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ny1" });
+    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ny2" });
+    
+    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "tk1" });
+    
+    //validate region size on all sites
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 200 });
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 200 });
+    vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 200 });
+  }
+  
+
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
new file mode 100644
index 0000000..728bade
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
@@ -0,0 +1,621 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.wan.parallel;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase.MyGatewayEventFilter;
+
+import dunit.AsyncInvocation;
+
+public class ParallelWANStatsDUnitTest extends WANTestBase{
+  
+  private static final long serialVersionUID = 1L;
+
+  public ParallelWANStatsDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+  }
+  
+  public void testPartitionedRegionParallelPropagation_BeforeDispatch() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, true, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, true, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, true, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, true, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    pause(3000);
+
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap() });
+
+    pause(2000);
+    
+    final Map keyValues = new HashMap();
+    final Map updateKeyValues = new HashMap();
+    for(int i=0; i< 1000; i++) {
+      keyValues.put(i, i);
+    }
+    
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, keyValues });
+
+    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() });
+
+    ArrayList<Integer> v4List = (ArrayList<Integer>)vm4.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", 1000 });
+    ArrayList<Integer> v5List = (ArrayList<Integer>)vm5.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", 1000 });
+    ArrayList<Integer> v6List = (ArrayList<Integer>)vm6.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", 1000 });
+    ArrayList<Integer> v7List = (ArrayList<Integer>)vm7.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", 1000 });
+    
+    assertEquals(1000, v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0) ); //queue size
+    assertEquals(1000, v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)); //eventsReceived
+    assertEquals(1000, v4List.get(2) + v5List.get(2) + v6List.get(2) + v7List.get(2)); //events queued
+    assertEquals(0, v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)); //events distributed
+    assertEquals(0, v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4)); //batches distributed
+    assertEquals(0, v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5)); //batches redistributed
+    
+  }
+  
+  public void testPartitionedRegionParallelPropagation_AfterDispatch_NoRedundacny() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+   
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 0, 100, isOffHeap() });
+   
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 0, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 0, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 0, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 0, 100, isOffHeap() });
+    
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+        1000 });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 1000 });
+    
+    
+    ArrayList<Integer> v4List = (ArrayList<Integer>)vm4.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
+    ArrayList<Integer> v5List = (ArrayList<Integer>)vm5.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
+    ArrayList<Integer> v6List = (ArrayList<Integer>)vm6.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
+    ArrayList<Integer> v7List = (ArrayList<Integer>)vm7.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
+    
+    assertEquals(0, v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0) ); //queue size
+    assertEquals(1000, v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)); //eventsReceived
+    assertEquals(1000, v4List.get(2) + v5List.get(2) + v6List.get(2) + v7List.get(2)); //events queued
+    assertEquals(1000, v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)); //events distributed
+    assertTrue(v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4) >= 100); //batches distributed
+    assertEquals(0, v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5)); //batches redistributed
+    
+    vm2.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {100, 1000, 1000 });
+  }
+  
+  public void testPartitionedRegionParallelPropagation_AfterDispatch_Redundancy_3() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 0, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 3, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 3, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 3, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 3, 100, isOffHeap() });
+    
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+        1000 });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 1000 });
+    
+    ArrayList<Integer> v4List = (ArrayList<Integer>)vm4.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
+    ArrayList<Integer> v5List = (ArrayList<Integer>)vm5.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
+    ArrayList<Integer> v6List = (ArrayList<Integer>)vm6.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
+    ArrayList<Integer> v7List = (ArrayList<Integer>)vm7.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
+    
+    assertEquals(0, v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0) ); //queue size
+    assertEquals(4000, v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)); //eventsReceived
+    assertEquals(4000, v4List.get(2) + v5List.get(2) + v6List.get(2) + v7List.get(2)); //events queued
+    assertEquals(1000, v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)); //events distributed
+    assertTrue(v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4) >= 100); //batches distributed
+    assertEquals(0, v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5)); //batches redistributed
+    
+    vm2.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {100, 1000, 1000 });
+  }
+  
+  public void testWANStatsTwoWanSites_Bug44331() throws Exception {
+    Integer lnPort = createFirstLocatorWithDSId(1);
+    Integer nyPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer tkPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 3, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln1",
+        2, true, 100, 10, false, false, null, true });
+  
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln2",
+        3, true, 100, 10, false, false, null, true });
+  
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 0, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 0, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln1,ln2", 0, 100, isOffHeap() });
+    
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln2" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+        1000 });
+
+    pause(10000);
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 1000 });
+    
+    ArrayList<Integer> v4Sender1List = (ArrayList<Integer>)vm4.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln1", 0 });
+    ArrayList<Integer> v4Sender2List = (ArrayList<Integer>)vm4.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln2", 0 });
+    
+    assertEquals(0, v4Sender1List.get(0).intValue()); //queue size
+    assertEquals(1000, v4Sender1List.get(1).intValue()); //eventsReceived
+    assertEquals(1000, v4Sender1List.get(2).intValue()); //events queued
+    assertEquals(1000, v4Sender1List.get(3).intValue()); //events distributed
+    assertTrue(v4Sender1List.get(4).intValue()>=100); //batches distributed
+    assertEquals(0, v4Sender1List.get(5).intValue()); //batches redistributed
+    
+    assertEquals(0, v4Sender2List.get(0).intValue()); //queue size
+    assertEquals(1000, v4Sender2List.get(1).intValue()); //eventsReceived
+    assertEquals(1000, v4Sender2List.get(2).intValue()); //events queued
+    assertEquals(1000, v4Sender2List.get(3).intValue()); //events distributed
+    assertTrue(v4Sender2List.get(4).intValue()>=100); //batches distributed
+    assertEquals(0, v4Sender2List.get(5).intValue()); //batches redistributed
+    
+    vm2.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {100, 1000, 1000 });
+    vm3.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {100, 1000, 1000 });
+  }
+
+  public void testParallelPropagationHA() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true });
+    
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 0, 100, isOffHeap() });
+    
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 3, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 3, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 3, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 3, 100, isOffHeap() });
+    
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    AsyncInvocation inv1 = vm5.invokeAsync(WANTestBase.class, "doPuts",
+        new Object[] { testName + "_PR", 10000 });
+    pause(2000);
+    AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "killSender");
+    inv1.join();
+    inv2.join();
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 10000 });
+    
+    ArrayList<Integer> v5List = (ArrayList<Integer>)vm5.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0});
+    ArrayList<Integer> v6List = (ArrayList<Integer>)vm6.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0});
+    ArrayList<Integer> v7List = (ArrayList<Integer>)vm7.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0});
+    
+    assertEquals(0, v5List.get(0) + v6List.get(0) + v7List.get(0) ); //queue size
+    assertEquals(30000, v5List.get(1) + v6List.get(1) + v7List.get(1)); //eventsReceived
+    assertEquals(30000, v5List.get(2) + v6List.get(2) + v7List.get(2)); //events queued
+    //assertTrue(10000 <= v5List.get(3) + v6List.get(3) + v7List.get(3)); //events distributed : its quite possible that vm4 has distributed some of the events
+    //assertTrue(v5List.get(4) + v6List.get(4) + v7List.get(4) > 1000); //batches distributed : its quite possible that vm4 has distributed some of the batches.
+    assertEquals(0, v5List.get(5) + v6List.get(5) + v7List.get(5)); //batches redistributed
+  
+    vm2.invoke(WANTestBase.class, "checkGatewayReceiverStatsHA", new Object[] {1000, 10000, 10000 });
+  }
+  
+  /**
+   * 1 region and sender configured on local site and 1 region and a 
+   * receiver configured on remote site. Puts to the local region are in progress.
+   * Remote region is destroyed in the middle.
+   * 
+   * @throws Exception
+   */
+  public void  testParallePropagationWithRemoteRegionDestroy() throws Exception {
+    addExpectedException("RegionDestroyedException");
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    //these are part of remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    //these are part of local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    //senders are created on local site
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+    true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+    true, 100, 10, false, false, null, true });
+
+  vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+    testName + "_PR", null, 0, 100, isOffHeap() });
+  
+  vm2.invoke(WANTestBase.class, "addCacheListenerAndDestroyRegion", new Object[] {
+    testName + "_PR"});
+  
+  vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+    testName + "_PR", "ln", 0, 100, isOffHeap() });
+  vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+    testName + "_PR", "ln", 0, 100, isOffHeap() });
+  vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+    testName + "_PR", "ln", 0, 100, isOffHeap() });
+  vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+    testName + "_PR", "ln", 0, 100, isOffHeap() });
+  
+  vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+  vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+  vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+  vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    //start puts in RR_1 in another thread
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 20000 });
+    
+    //verify that all is well in local site. All the events should be present in local region
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 20000 });
+    
+    ArrayList<Integer> v4List = (ArrayList<Integer>)vm5.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", -1});
+    ArrayList<Integer> v5List = (ArrayList<Integer>)vm5.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", -1});
+    ArrayList<Integer> v6List = (ArrayList<Integer>)vm6.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", -1});
+    ArrayList<Integer> v7List = (ArrayList<Integer>)vm7.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", -1});
+    
+    
+    assertTrue(v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4) >= 1); //batches distributed : its quite possible that vm4 has distributed some of the batches.
+    assertTrue(v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5) >= 1); //batches redistributed
+  }
+  
+  public void testParallelPropogationWithFilter() throws Exception {
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, "createFirstLocatorWithDSId",
+        new Object[] {1});
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] {2,lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false,
+        new MyGatewayEventFilter(), true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false,
+        new MyGatewayEventFilter(), true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false,
+      new MyGatewayEventFilter(), true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false,
+      new MyGatewayEventFilter(), true });
+  
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap() });
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 800 });
+    
+    ArrayList<Integer> v4List = (ArrayList<Integer>)vm4.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
+    ArrayList<Integer> v5List = (ArrayList<Integer>)vm5.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
+    ArrayList<Integer> v6List = (ArrayList<Integer>)vm6.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
+    ArrayList<Integer> v7List = (ArrayList<Integer>)vm7.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
+    
+    assertEquals(0, v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0) ); //queue size
+    assertEquals(1000, v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)); //eventsReceived
+    assertEquals(900, v4List.get(2) + v5List.get(2) + v6List.get(2) + v7List.get(2)); //events queued
+    assertEquals(800, v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)); //events distributed
+    assertTrue(v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4) >= 80); //batches distributed
+    assertEquals(0, v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5)); //batches redistributed
+    assertEquals(200, v4List.get(6) + v5List.get(6) + v6List.get(6) + v7List.get(6)); //events filtered
+    
+    vm2.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {80, 800, 800});
+  }
+  
+  public void testParallelPropagationConflation() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, true, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, true, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, true, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, true, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    pause(3000);
+
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap() });
+
+    pause(2000);
+    
+    final Map keyValues = new HashMap();
+    final Map updateKeyValues = new HashMap();
+    for(int i=0; i< 1000; i++) {
+      keyValues.put(i, i);
+    }
+    
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, keyValues });
+
+    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() });
+    for(int i=0;i<500;i++) {
+      updateKeyValues.put(i, i+"_updated");
+    }
+    
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues });
+
+    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() + updateKeyValues.size() /*creates aren't conflated*/ });
+    
+    // Do the puts again. Since these are updates, the previous updates will be conflated.
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues });
+
+    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() + updateKeyValues.size() /*creates aren't conflated*/ });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 0 });
+
+    vm2.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {0, 0, 0});
+    
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+
+    keyValues.putAll(updateKeyValues);
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, keyValues.size() });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
+        testName, keyValues });
+    
+    vm2.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {0, 1500, 1000});
+    
+    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", 0 });
+    
+    ArrayList<Integer> v4List = (ArrayList<Integer>)vm4.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
+    ArrayList<Integer> v5List = (ArrayList<Integer>)vm5.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
+    ArrayList<Integer> v6List = (ArrayList<Integer>)vm6.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
+    ArrayList<Integer> v7List = (ArrayList<Integer>)vm7.invoke(
+        WANTestBase.class, "getSenderStats", new Object[] { "ln", 0 });
+    
+    assertEquals(0, v4List.get(0) + v5List.get(0) + v6List.get(0) + v7List.get(0) ); //queue size
+    assertEquals(2000, v4List.get(1) + v5List.get(1) + v6List.get(1) + v7List.get(1)); //eventsReceived
+    assertEquals(2000, v4List.get(2) + v5List.get(2) + v6List.get(2) + v7List.get(2)); //events queued
+    assertEquals(1500, v4List.get(3) + v5List.get(3) + v6List.get(3) + v7List.get(3)); //events distributed
+    assertTrue(v4List.get(4) + v5List.get(4) + v6List.get(4) + v7List.get(4) >= 100); //batches distributed
+    assertEquals(0, v4List.get(5) + v5List.get(5) + v6List.get(5) + v7List.get(5)); //batches redistributed
+    assertEquals(500, v4List.get(7) + v5List.get(7) + v6List.get(7) + v7List.get(7)); //events conflated 
+    
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
new file mode 100644
index 0000000..24ea4cd
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
@@ -0,0 +1,391 @@
+package com.gemstone.gemfire.internal.cache.wan.serial;
+
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.CacheTransactionManager;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.execute.*;
+import com.gemstone.gemfire.distributed.DistributedSystem;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+import dunit.AsyncInvocation;
+
+//The tests here are to validate changes introduced because a distributed deadlock
+//was found that caused issues for a production customer. 
+//
+//There are 4 tests which use sender gateways with primaries on different 
+//JVM's. Two tests use replicated and two use partition regions and the
+//the tests vary the conserve-sockets.  
+//
+//currently the 4th test using PR, conserve-sockets=true hangs/fails and is commented
+//out to prevent issues
+public class SerialGatewaySenderDistributedDeadlockDUnitTest extends WANTestBase {
+
+    public SerialGatewaySenderDistributedDeadlockDUnitTest(String name) {
+        super(name);
+    }
+
+    public void setUp() throws Exception {
+        super.setUp();
+    }
+
+    //Uses replicated regions and conserve-sockets=false
+    public void testPrimarySendersOnDifferentVMsReplicated() throws Exception {
+
+        Integer lnPort = (Integer) vm0.invoke(WANTestBase.class,
+                "createFirstPeerLocator", new Object[]{1});
+
+        Integer nyPort = (Integer) vm1.invoke(WANTestBase.class,
+                "createFirstRemoteLocator", new Object[]{2, lnPort});
+
+        createCachesWith(Boolean.FALSE, nyPort, lnPort);
+
+        createSerialSenders();
+
+        createReplicatedRegions(nyPort);
+
+        //get one primary sender on vm4 and another primary on vm5
+        //the startup order matters here
+        startSerialSenders();
+
+        //exercise region and gateway operations with different messaging
+        exerciseWANOperations();
+        AsyncInvocation invVM4transaction = vm4.invokeAsync(WANTestBase.class, "doTxPuts", new Object[]{testName + "_RR", 100});
+        AsyncInvocation invVM5transaction = vm5.invokeAsync(WANTestBase.class, "doTxPuts", new Object[]{testName + "_RR", 100});
+        AsyncInvocation invVM4 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[]{testName + "_RR", 1000});
+        AsyncInvocation invVM5 = vm5.invokeAsync(WANTestBase.class, "doPuts", new Object[]{testName + "_RR", 1000});
+
+        exerciseFunctions();
+
+        try {
+            invVM4transaction.join();
+            invVM5transaction.join();
+            invVM4.join();
+            invVM5.join();
+
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+            fail();
+        }
+    }
+
+    //Uses partitioned regions and conserve-sockets=false
+    public void testPrimarySendersOnDifferentVMsPR() throws Exception {
+        Integer lnPort = (Integer) vm0.invoke(WANTestBase.class,
+                "createFirstPeerLocator", new Object[]{1});
+
+        Integer nyPort = (Integer) vm1.invoke(WANTestBase.class,
+                "createFirstRemoteLocator", new Object[]{2, lnPort});
+
+        createCachesWith(Boolean.FALSE, nyPort, lnPort);
+
+        createSerialSenders();
+
+        createPartitionedRegions(nyPort);
+
+        startSerialSenders();
+
+        exerciseWANOperations();
+        AsyncInvocation invVM4transaction
+                = vm4.invokeAsync(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doTxPutsPR", new Object[]{testName + "_RR", 100, 1000});
+        AsyncInvocation invVM5transaction
+                = vm5.invokeAsync(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doTxPutsPR", new Object[]{testName + "_RR", 100, 1000});
+
+        AsyncInvocation invVM4 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[]{testName + "_RR", 1000});
+        AsyncInvocation invVM5 = vm5.invokeAsync(WANTestBase.class, "doPuts", new Object[]{testName + "_RR", 1000});
+
+        exerciseFunctions();
+
+        try {
+            invVM4transaction.join();
+            invVM5transaction.join();
+            invVM4.join();
+            invVM5.join();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+            fail();
+        }
+    }
+
+    //Uses replicated regions and conserve-sockets=true
+    public void testPrimarySendersOnDifferentVMsReplicatedSocketPolicy() throws Exception {
+
+        Integer lnPort = (Integer) vm0.invoke(WANTestBase.class,
+                "createFirstPeerLocator", new Object[]{1});
+
+        Integer nyPort = (Integer) vm1.invoke(WANTestBase.class,
+                "createFirstRemoteLocator", new Object[]{2, lnPort});
+
+        createCachesWith(Boolean.TRUE, nyPort, lnPort);
+
+        createSerialSenders();
+
+        createReplicatedRegions(nyPort);
+
+        //get one primary sender on vm4 and another primary on vm5
+        //the startup order matters here
+        startSerialSenders();
+
+        //exercise region and gateway operations with messaging
+        exerciseWANOperations();
+        AsyncInvocation invVM4transaction = vm4.invokeAsync(WANTestBase.class, "doTxPuts", new Object[]{testName + "_RR", 100});
+        AsyncInvocation invVM5transaction = vm5.invokeAsync(WANTestBase.class, "doTxPuts", new Object[]{testName + "_RR", 100});
+
+        AsyncInvocation invVM4 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[]{testName + "_RR", 1000});
+        AsyncInvocation invVM5 = vm5.invokeAsync(WANTestBase.class, "doPuts", new Object[]{testName + "_RR", 1000});
+
+        exerciseFunctions();
+
+        try {
+            invVM4transaction.join();
+            invVM5transaction.join();
+            invVM4.join();
+            invVM5.join();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+            fail();
+        }
+    }
+
+    //Uses partitioned regions and conserve-sockets=true
+    //this always causes a distributed deadlock
+    public void testPrimarySendersOnDifferentVMsPRSocketPolicy() throws Exception {
+        Integer lnPort = (Integer) vm0.invoke(WANTestBase.class,
+                "createFirstPeerLocator", new Object[]{1});
+
+        Integer nyPort = (Integer) vm1.invoke(WANTestBase.class,
+                "createFirstRemoteLocator", new Object[]{2, lnPort});
+
+        createCachesWith(Boolean.TRUE, nyPort, lnPort);
+
+        createSerialSenders();
+
+        createPartitionedRegions(nyPort);
+
+        startSerialSenders();
+
+        exerciseWANOperations();
+        AsyncInvocation invVM4transaction
+                = vm4.invokeAsync(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doTxPutsPR", new Object[]{testName + "_RR", 100, 1000});
+        AsyncInvocation invVM5transaction
+                = vm5.invokeAsync(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doTxPutsPR", new Object[]{testName + "_RR", 100, 1000});
+
+        AsyncInvocation invVM4 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[]{testName + "_RR", 1000});
+        AsyncInvocation invVM5 = vm5.invokeAsync(WANTestBase.class, "doPuts", new Object[]{testName + "_RR", 1000});
+
+        exerciseFunctions();
+
+        try {
+            invVM4transaction.join();
+            invVM5transaction.join();
+            invVM4.join();
+            invVM5.join();
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+            fail();
+        }
+    }
+
+    //**************************************************************************
+    //Utility methods used by tests
+    //**************************************************************************
+    private void createReplicatedRegions(Integer nyPort) throws Exception {
+        //create receiver
+        vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[]{
+          testName + "_RR", null, false});
+        vm2.invoke(WANTestBase.class, "createReceiverAfterCache", new Object[]{nyPort});
+
+        //create senders
+        vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[]{
+          testName + "_RR", "ln1,ln2", false});
+
+        vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[]{
+          testName + "_RR", "ln1,ln2", false});
+    }
+
+    private void createCachesWith(Boolean socketPolicy, Integer nyPort, Integer lnPort) {
+        vm2.invoke(WANTestBase.class, "createCacheConserveSockets", new Object[]{socketPolicy, nyPort});
+
+        vm4.invoke(WANTestBase.class, "createCacheConserveSockets", new Object[]{socketPolicy, lnPort});
+
+        vm5.invoke(WANTestBase.class, "createCacheConserveSockets", new Object[]{socketPolicy, lnPort});
+    }
+
+    private void exerciseFunctions() throws Exception {
+        //do function calls that use a shared connection
+        for (int x = 0; x < 1000; x++) {
+            //setting it to Boolean.TRUE it should pass the test
+            vm4.invoke(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doFunctionPuts",
+                    new Object[]{testName + "_RR", 1, Boolean.TRUE});
+            vm5.invoke(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doFunctionPuts",
+                    new Object[]{testName + "_RR", 1, Boolean.TRUE});
+        }
+        for (int x = 0; x < 1000; x++) {
+            //setting the Boolean.FALSE below will cause a deadlock in some GFE versions
+            //setting it to Boolean.TRUE as above it should pass the test
+            //this is similar to the customer found distributed deadlock
+            vm4.invoke(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doFunctionPuts",
+                    new Object[]{testName + "_RR", 1, Boolean.FALSE});
+            vm5.invoke(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doFunctionPuts",
+                    new Object[]{testName + "_RR", 1, Boolean.FALSE});
+        }
+    }
+
+    private void createPartitionedRegions(Integer nyPort) throws Exception {
+        //create remote receiver
+        vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[]{testName + "_RR",
+                                                                                "", 0, 113, false});
+
+        vm2.invoke(WANTestBase.class, "createReceiverAfterCache", new Object[]{nyPort});
+
+        //create sender vms
+        vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[]{
+          testName + "_RR", "ln1,ln2", 1, 113, false});
+
+        vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[]{
+          testName + "_RR", "ln1,ln2", 1, 113, false});
+    }
+
+    private void exerciseWANOperations() throws Exception {
+        //note - some of these should be made async to truly exercise the 
+        //messaging between the WAN gateways and members
+
+        //exercise region and gateway operations
+        vm4.invoke(WANTestBase.class, "doPuts", new Object[]{testName + "_RR", 100});
+        vm5.invoke(WANTestBase.class, "doPuts", new Object[]{testName + "_RR", 100});
+        pause(2000); //wait for events to propogate
+        vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[]{testName + "_RR", 100});
+        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[]{testName + "_RR", 100});
+        vm5.invoke(WANTestBase.class, "doDestroys", new Object[]{testName + "_RR", 100});
+        pause(2000);//wait for events to propogate
+        vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[]{testName + "_RR", 0});
+        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[]{testName + "_RR", 0});
+        vm4.invoke(WANTestBase.class, "doPuts", new Object[]{testName + "_RR", 100});
+        vm5.invoke(WANTestBase.class, "doPuts", new Object[]{testName + "_RR", 100});
+        pause(2000); //wait for events to propogate
+        vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[]{testName + "_RR", 100});
+        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[]{testName + "_RR", 100});
+        vm4.invoke(SerialGatewaySenderDistributedDeadlockDUnitTest.class, "doInvalidates",
+                new Object[]{testName + "_RR", 100, 100});
+        vm4.invoke(WANTestBase.class, "doPutAll", new Object[]{testName + "_RR", 100, 10});
+        vm5.invoke(WANTestBase.class, "doPutAll", new Object[]{testName + "_RR", 100, 10});
+        pause(2000);//wait for events to propogate
+        vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[]{testName + "_RR", 1000});
+        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[]{testName + "_RR", 1000});
+        vm4.invoke(WANTestBase.class, "doDestroys", new Object[]{testName + "_RR", 1000});
+        pause(2000);//wait for events to propogate
+        vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[]{testName + "_RR", 0});
+        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[]{testName + "_RR", 0});
+        vm4.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[]{testName + "_RR", 100});
+        pause(2000);
+        vm5.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[]{testName + "_RR", 100});
+        vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[]{testName + "_RR", 100});
+    }
+
+    private void startSerialSenders() throws Exception {
+        //get one primary sender on vm4 and another primary on vm5
+        //the startup order matters here so that primaries are
+        //on different JVM's
+        vm4.invoke(WANTestBase.class, "startSender", new Object[]{"ln1"});
+
+        vm5.invoke(WANTestBase.class, "startSender", new Object[]{"ln2"});
+
+        //start secondaries
+        vm5.invoke(WANTestBase.class, "startSender", new Object[]{"ln1"});
+
+        vm4.invoke(WANTestBase.class, "startSender", new Object[]{"ln2"});
+    }
+
+    private void createSerialSenders() throws Exception {
+
+        vm4.invoke(WANTestBase.class, "createSender", new Object[]{"ln1", 2,
+            false, 100, 10, false, false, null, true});
+
+        vm5.invoke(WANTestBase.class, "createSender", new Object[]{"ln1", 2,
+            false, 100, 10, false, false, null, true});
+
+        vm4.invoke(WANTestBase.class, "createSender", new Object[]{"ln2", 2,
+            false, 100, 10, false, false, null, true});
+
+        vm5.invoke(WANTestBase.class, "createSender", new Object[]{"ln2", 2,
+            false, 100, 10, false, false, null, true});
+    }
+
+    public static void doFunctionPuts(String name, int num, Boolean useThreadOwnedSocket) throws Exception {
+        Region region = CacheFactory.getAnyInstance().getRegion(name);
+        FunctionService.registerFunction(new TestFunction());
+        Execution exe = FunctionService.onRegion(region);
+        for (int x = 0; x < num; x++) {
+            exe.withArgs(useThreadOwnedSocket).execute("com.gemstone.gemfire.internal.cache.wan.serial.TestFunction");
+        }
+    }
+
+    public static void doTxPutsPR(String regionName, int numPuts, int size) throws Exception {
+        Region r = cache.getRegion(Region.SEPARATOR + regionName);
+        CacheTransactionManager mgr = cache.getCacheTransactionManager();
+        for (int x = 0; x < numPuts; x++) {
+            int temp = (int) (Math.floor(Math.random() * size));
+            try {
+                mgr.begin();
+                r.put(temp, temp);
+                mgr.commit();
+            } catch (com.gemstone.gemfire.cache.TransactionDataNotColocatedException txe) {
+                //ignore colocation issues or primary bucket issues 
+            } catch (com.gemstone.gemfire.cache.CommitConflictException cce) {
+                //ignore - conflicts are ok and expected
+            }
+        }
+    }
+
+    public static void doInvalidates(String regionName, int numInvalidates, int size) throws Exception {
+        Region r = cache.getRegion(Region.SEPARATOR + regionName);
+        for (int x = 0; x < numInvalidates; x++) {
+            int temp = (int) (Math.floor(Math.random() * size));
+            try {
+                if (r.containsValueForKey(temp)) {
+                    r.invalidate(temp);
+                }
+            } catch (com.gemstone.gemfire.cache.EntryNotFoundException enfe) {
+                //ignore as an entry may not exist
+            }
+        }
+    }
+
+}
+
+class TestFunction implements Function {
+
+    @Override
+    public boolean hasResult() {
+        return false;
+    }
+
+    @Override
+    public void execute(FunctionContext fc) {
+        boolean option = (Boolean) fc.getArguments();
+        if (option) {
+            DistributedSystem.setThreadsSocketPolicy(false);
+        }
+        RegionFunctionContext context = (RegionFunctionContext) fc;
+        Region local = context.getDataSet();
+        local.put(randKeyValue(10), randKeyValue(10000));
+    }
+
+    @Override
+    public String getId() {
+        return this.getClass().getName();
+    }
+
+    @Override
+    public boolean optimizeForWrite() {
+        return false;
+    }
+
+    @Override
+    public boolean isHA() {
+        return false;
+    }
+
+    private int randKeyValue(int size) {
+        double temp = Math.floor(Math.random() * size);
+        return (int) temp;
+    }
+}


[52/70] incubator-geode git commit: Merge remote-tracking branch 'origin/develop' into wan_cq_donation

Posted by up...@apache.org.
Merge remote-tracking branch 'origin/develop' into wan_cq_donation


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/2b781340
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/2b781340
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/2b781340

Branch: refs/heads/develop
Commit: 2b7813404ecf78bf5e8a1007fb849b0d09a48050
Parents: 6df7524 ae1ab71
Author: Dan Smith <up...@apache.org>
Authored: Fri Jan 22 14:44:54 2016 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Fri Jan 22 14:44:54 2016 -0800

----------------------------------------------------------------------
 build.gradle                                    |    53 +-
 gemfire-assembly/build.gradle                   |     8 +
 .../management/internal/AgentUtilJUnitTest.java |    25 +-
 .../com/gemstone/gemfire/admin/AdminConfig.java |     2 +-
 .../gemfire/admin/AdminDistributedSystem.java   |     2 +-
 .../admin/AdminDistributedSystemFactory.java    |     2 +-
 .../gemstone/gemfire/admin/AdminException.java  |     2 +-
 .../gemfire/admin/AdminXmlException.java        |     2 +-
 .../java/com/gemstone/gemfire/admin/Alert.java  |     2 +-
 .../com/gemstone/gemfire/admin/AlertLevel.java  |     2 +-
 .../gemstone/gemfire/admin/AlertListener.java   |     2 +-
 .../gemstone/gemfire/admin/BackupStatus.java    |     2 +-
 .../admin/CacheDoesNotExistException.java       |     2 +-
 .../gemfire/admin/CacheHealthConfig.java        |     2 +-
 .../com/gemstone/gemfire/admin/CacheVm.java     |     2 +-
 .../gemstone/gemfire/admin/CacheVmConfig.java   |     2 +-
 .../gemfire/admin/ConfigurationParameter.java   |     2 +-
 .../gemfire/admin/DistributedSystemConfig.java  |     2 +-
 .../admin/DistributedSystemHealthConfig.java    |     2 +-
 .../gemfire/admin/DistributionLocator.java      |     2 +-
 .../admin/DistributionLocatorConfig.java        |     2 +-
 .../gemstone/gemfire/admin/GemFireHealth.java   |     2 +-
 .../gemfire/admin/GemFireHealthConfig.java      |     2 +-
 .../gemfire/admin/GemFireMemberStatus.java      |     2 +-
 .../gemstone/gemfire/admin/ManagedEntity.java   |     2 +-
 .../gemfire/admin/ManagedEntityConfig.java      |     2 +-
 .../gemfire/admin/MemberHealthConfig.java       |     2 +-
 .../admin/OperationCancelledException.java      |     2 +-
 .../gemfire/admin/RegionNotFoundException.java  |     2 +-
 .../gemfire/admin/RegionSubRegionSnapshot.java  |     2 +-
 .../gemfire/admin/RuntimeAdminException.java    |     2 +-
 .../com/gemstone/gemfire/admin/Statistic.java   |     2 +-
 .../gemfire/admin/StatisticResource.java        |     2 +-
 .../gemstone/gemfire/admin/SystemMember.java    |     2 +-
 .../gemfire/admin/SystemMemberCache.java        |     2 +-
 .../gemfire/admin/SystemMemberCacheEvent.java   |     2 +-
 .../admin/SystemMemberCacheListener.java        |     2 +-
 .../gemfire/admin/SystemMemberCacheServer.java  |     2 +-
 .../gemfire/admin/SystemMemberRegion.java       |     2 +-
 .../gemfire/admin/SystemMemberRegionEvent.java  |     2 +-
 .../gemfire/admin/SystemMemberType.java         |     2 +-
 .../gemfire/admin/SystemMembershipEvent.java    |     2 +-
 .../gemfire/admin/SystemMembershipListener.java |     2 +-
 .../UnmodifiableConfigurationException.java     |     2 +-
 .../com/gemstone/gemfire/admin/jmx/Agent.java   |     2 +-
 .../gemstone/gemfire/admin/jmx/AgentConfig.java |     2 +-
 .../gemfire/admin/jmx/AgentFactory.java         |     2 +-
 .../jmx/internal/RMIRegistryServiceMBean.java   |     2 +-
 .../gemfire/cache/AttributesMutator.java        |    11 +-
 .../internal/ParallelAsyncEventQueueImpl.java   |     8 +-
 .../internal/SerialAsyncEventQueueImpl.java     |     8 +-
 .../cache/query/internal/CompiledIn.java        |   106 +-
 .../internal/DistributionManager.java           |     7 +-
 .../internal/InternalDistributedSystem.java     |     2 +-
 .../internal/membership/gms/ServiceConfig.java  |     2 +-
 .../membership/gms/membership/GMSJoinLeave.java |   127 +-
 .../gms/mgr/GMSMembershipManager.java           |     8 +-
 .../gemfire/internal/AvailablePort.java         |     8 +-
 .../internal/LocalStatisticsFactory.java        |     4 +-
 .../internal/admin/StatAlertsManager.java       |    10 +-
 .../gemfire/internal/cache/BucketRegion.java    |     5 +-
 .../gemfire/internal/cache/LocalRegion.java     |     4 +-
 .../internal/cache/LocalRegionDataView.java     |     2 +-
 .../cache/PartitionedRegionDataStore.java       |    31 +-
 .../cache/PartitionedRegionDataView.java        |     2 +-
 .../gemfire/internal/cache/TXState.java         |     2 +-
 .../partitioned/PartitionedRegionObserver.java  |     5 +
 .../PartitionedRegionObserverAdapter.java       |     4 +
 .../cache/wan/AbstractGatewaySender.java        |    31 +-
 .../AbstractGatewaySenderEventProcessor.java    |     8 +-
 .../cache/wan/GatewaySenderAdvisor.java         |     4 +-
 .../ParallelGatewaySenderEventProcessor.java    |     8 +-
 .../parallel/ParallelGatewaySenderQueue.java    |    61 +-
 ...urrentSerialGatewaySenderEventProcessor.java |     9 +
 .../gemfire/internal/logging/MergeLogFiles.java |     6 -
 ...DisconnectingOutOfOffHeapMemoryListener.java |    77 +
 .../internal/offheap/MemoryBlockNode.java       |     2 +-
 .../internal/offheap/MemoryInspector.java       |     9 +-
 .../internal/offheap/MemoryInspectorImpl.java   |    99 +
 .../internal/offheap/OffHeapStorage.java        |   100 +-
 .../offheap/SimpleMemoryAllocatorImpl.java      |    80 +-
 .../gemfire/management/internal/AgentUtil.java  |   112 +-
 .../management/internal/ManagementAgent.java    |    17 +-
 .../gemfire/management/internal/RestAgent.java  |     2 +-
 .../beans/GatewaySenderMBeanBridge.java         |     8 +-
 .../internal/beans/stats/StatsKey.java          |     1 -
 .../cli/commands/LauncherLifecycleCommands.java |     2 -
 .../com/gemstone/gemfire/UnitTestDoclet.java    |     7 +-
 .../SortedListForAsyncQueueJUnitTest.java       |     4 +-
 .../query/internal/CompiledInJUnitTest.java     |   405 +
 .../gemfire/cache30/Bug38741DUnitTest.java      |     2 +-
 .../MemLRUEvictionControllerDUnitTest.java      |     4 -
 .../distributed/DistributedSystemDUnitTest.java |    74 +-
 .../gms/fd/GMSHealthMonitorJUnitTest.java       |    16 +-
 .../gms/membership/GMSJoinLeaveJUnitTest.java   |    20 +-
 .../messenger/JGroupsMessengerJUnitTest.java    |     8 +-
 .../cache/PartitionedRegionDUnitTestCase.java   |     2 +-
 .../PartitionedRegionDataStoreJUnitTest.java    |    73 +
 .../tier/sockets/InterestListDUnitTest.java     |   201 +-
 .../sockets/RedundancyLevelPart1DUnitTest.java  |     4 +
 .../ParallelGatewaySenderQueueJUnitTest.java    |    87 +
 ...ialGatewaySenderEventProcessorJUnitTest.java |    42 +
 .../CompressionRegionConfigDUnitTest.java       |     2 +-
 ...tingOutOfOffHeapMemoryListenerJUnitTest.java |   100 +
 .../offheap/LifecycleListenerJUnitTest.java     |     9 +-
 .../offheap/MemoryInspectorImplJUnitTest.java   |   142 +
 .../offheap/OffHeapStorageJUnitTest.java        |   271 +-
 .../offheap/OffHeapValidationJUnitTest.java     |    10 +-
 ...moryAllocatorFillPatternIntegrationTest.java |   246 +
 ...mpleMemoryAllocatorFillPatternJUnitTest.java |   378 +-
 .../offheap/SimpleMemoryAllocatorJUnitTest.java |    23 +-
 .../bean/stats/GatewayMBeanBridgeJUnitTest.java |   108 +
 .../bean/stats/GatewaySenderStatsJUnitTest.java |   101 -
 .../test/dunit/standalone/BounceResult.java     |    36 +
 .../gemfire/test/dunit/standalone/ChildVM.java  |    81 +
 .../test/dunit/standalone/DUnitLauncher.java    |   461 +
 .../test/dunit/standalone/ProcessManager.java   |   259 +
 .../test/dunit/standalone/RemoteDUnitVM.java    |   142 +
 .../test/dunit/standalone/RemoteDUnitVMIF.java  |    36 +
 .../dunit/standalone/StandAloneDUnitEnv.java    |    75 +
 .../test/dunit/tests/BasicDUnitTest.java        |   132 +
 .../gemfire/test/dunit/tests/VMDUnitTest.java   |   237 +
 .../src/test/java/dunit/BounceResult.java       |    36 -
 gemfire-core/src/test/java/dunit/DUnitEnv.java  |     2 +
 .../test/java/dunit/DistributedTestCase.java    |     3 +-
 gemfire-core/src/test/java/dunit/Host.java      |     2 +
 .../src/test/java/dunit/RemoteDUnitVMIF.java    |    36 -
 gemfire-core/src/test/java/dunit/VM.java        |     7 +-
 .../src/test/java/dunit/standalone/ChildVM.java |    82 -
 .../java/dunit/standalone/DUnitLauncher.java    |   463 -
 .../java/dunit/standalone/ProcessManager.java   |   262 -
 .../java/dunit/standalone/RemoteDUnitVM.java    |   144 -
 .../dunit/standalone/StandAloneDUnitEnv.java    |    75 -
 .../test/java/dunit/tests/BasicDUnitTest.java   |   132 -
 .../src/test/java/dunit/tests/TestFailure.java  |    50 -
 .../src/test/java/dunit/tests/VMDUnitTest.java  |   237 -
 .../gemfire/test/junit/ConditionalIgnore.java   |    49 +
 .../gemfire/test/junit/IgnoreCondition.java     |    32 +
 .../gemfire/test/junit/IgnoreUntil.java         |    49 +
 .../com/gemstone/gemfire/test/junit/Repeat.java |    43 +
 .../com/gemstone/gemfire/test/junit/Retry.java  |    38 +
 .../gemfire/test/junit/categories/UITest.java   |    24 +
 .../test/junit/rules/ConditionalIgnoreRule.java |   123 +
 .../test/junit/rules/ExpectedTimeoutRule.java   |   180 +
 .../test/junit/rules/IgnoreUntilRule.java       |   123 +
 .../gemfire/test/junit/rules/RepeatRule.java    |    81 +
 .../gemfire/test/junit/rules/RetryRule.java     |   181 +
 .../rules/SerializableExternalResource.java     |   107 +
 .../test/junit/rules/SerializableRuleChain.java |   119 +
 .../rules/SerializableTemporaryFolder.java      |    70 +
 .../test/junit/rules/SerializableTestName.java  |    54 +
 .../test/junit/rules/SerializableTestRule.java  |    33 +
 .../junit/rules/SerializableTestWatcher.java    |    29 +
 .../test/junit/rules/SerializableTimeout.java   |   119 +
 .../examples/RepeatingTestCasesExampleTest.java |    94 +
 .../rules/examples/RetryRuleExampleTest.java    |    43 +
 .../rules/tests/ExpectedTimeoutRuleTest.java    |   214 +
 .../junit/rules/tests/IgnoreUntilRuleTest.java  |   121 +
 .../junit/rules/tests/JUnitRuleTestSuite.java   |    33 +
 .../test/junit/rules/tests/RepeatRuleTest.java  |   304 +
 .../tests/RetryRuleGlobalWithErrorTest.java     |   250 +
 .../tests/RetryRuleGlobalWithExceptionTest.java |   254 +
 .../tests/RetryRuleLocalWithErrorTest.java      |   207 +
 .../tests/RetryRuleLocalWithExceptionTest.java  |   213 +
 .../junit/rules/tests/RuleAndClassRuleTest.java |   138 +
 .../test/junit/rules/tests/TestRunner.java      |    37 +
 .../junit/support/DefaultIgnoreCondition.java   |    57 +
 .../IgnoreConditionEvaluationException.java     |    43 +
 gemfire-pulse/build.gradle                      |   152 +
 .../tools/pulse/internal/PulseAppListener.java  |   703 +
 .../controllers/ExceptionHandlingAdvice.java    |    52 +
 .../internal/controllers/PulseController.java   |   587 +
 .../tools/pulse/internal/data/Cluster.java      |  3808 ++++
 .../tools/pulse/internal/data/DataBrowser.java  |   284 +
 .../pulse/internal/data/IClusterUpdater.java    |    37 +
 .../pulse/internal/data/JMXDataUpdater.java     |  2540 +++
 .../pulse/internal/data/JmxManagerFinder.java   |   175 +
 .../tools/pulse/internal/data/PulseConfig.java  |   126 +
 .../pulse/internal/data/PulseConstants.java     |   416 +
 .../tools/pulse/internal/data/PulseVersion.java |   104 +
 .../tools/pulse/internal/data/Repository.java   |   215 +
 .../gemfire/tools/pulse/internal/json/CDL.java  |   274 +
 .../tools/pulse/internal/json/Cookie.java       |   164 +
 .../tools/pulse/internal/json/CookieList.java   |    85 +
 .../gemfire/tools/pulse/internal/json/HTTP.java |   158 +
 .../tools/pulse/internal/json/HTTPTokener.java  |    72 +
 .../tools/pulse/internal/json/JSONArray.java    |   901 +
 .../pulse/internal/json/JSONException.java      |    47 +
 .../tools/pulse/internal/json/JSONML.java       |   462 +
 .../tools/pulse/internal/json/JSONObject.java   |  1588 ++
 .../tools/pulse/internal/json/JSONString.java   |    37 +
 .../tools/pulse/internal/json/JSONStringer.java |    73 +
 .../tools/pulse/internal/json/JSONTokener.java  |   441 +
 .../tools/pulse/internal/json/JSONWriter.java   |   322 +
 .../gemfire/tools/pulse/internal/json/README    |    68 +
 .../gemfire/tools/pulse/internal/json/XML.java  |   503 +
 .../tools/pulse/internal/json/XMLTokener.java   |   360 +
 .../tools/pulse/internal/log/LogWriter.java     |   266 +
 .../pulse/internal/log/MessageFormatter.java    |   103 +
 .../pulse/internal/log/PulseLogWriter.java      |   306 +
 .../tools/pulse/internal/log/PulseLogger.java   |   144 +
 .../internal/service/ClusterDetailsService.java |   109 +
 .../service/ClusterDiskThroughputService.java   |    79 +
 .../service/ClusterGCPausesService.java         |    71 +
 .../service/ClusterKeyStatisticsService.java    |    79 +
 .../internal/service/ClusterMemberService.java  |   133 +
 .../service/ClusterMembersRGraphService.java    |   372 +
 .../service/ClusterMemoryUsageService.java      |    70 +
 .../internal/service/ClusterRegionService.java  |   241 +
 .../internal/service/ClusterRegionsService.java |   243 +
 .../service/ClusterSelectedRegionService.java   |   278 +
 .../ClusterSelectedRegionsMemberService.java    |   149 +
 .../internal/service/ClusterWANInfoService.java |    82 +
 .../service/MemberAsynchEventQueuesService.java |   107 +
 .../internal/service/MemberClientsService.java  |   123 +
 .../internal/service/MemberDetailsService.java  |   129 +
 .../service/MemberDiskThroughputService.java    |    93 +
 .../internal/service/MemberGCPausesService.java |    85 +
 .../service/MemberGatewayHubService.java        |   163 +
 .../service/MemberHeapUsageService.java         |    85 +
 .../service/MemberKeyStatisticsService.java     |    98 +
 .../internal/service/MemberRegionsService.java  |   140 +
 .../internal/service/MembersListService.java    |    78 +
 .../pulse/internal/service/PulseService.java    |    42 +
 .../internal/service/PulseServiceFactory.java   |    56 +
 .../internal/service/PulseVersionService.java   |    74 +
 .../service/QueryStatisticsService.java         |   152 +
 .../internal/service/SystemAlertsService.java   |   134 +
 .../pulse/internal/util/ConnectionUtil.java     |    47 +
 .../pulse/internal/util/IPAddressUtil.java      |    66 +
 .../tools/pulse/internal/util/StringUtils.java  |    86 +
 .../tools/pulse/internal/util/TimeUtils.java    |   121 +
 .../main/resources/LogMessages_en_US.properties |    97 +
 .../main/resources/LogMessages_fr_FR.properties |    91 +
 .../src/main/resources/default.properties       |    23 +
 .../src/main/resources/gemfire.properties       |    47 +
 .../src/main/resources/pulse-users.properties   |    30 +
 .../src/main/resources/pulse.properties         |    54 +
 .../src/main/resources/pulsesecurity.properties |    26 +
 .../src/main/resources/sqlfire.properties       |    47 +
 gemfire-pulse/src/main/webapp/DataBrowser.html  |   367 +
 gemfire-pulse/src/main/webapp/Login.html        |   142 +
 .../src/main/webapp/META-INF/MANIFEST.MF        |     3 +
 .../src/main/webapp/MemberDetails.html          |   618 +
 .../src/main/webapp/QueryStatistics.html        |   323 +
 .../webapp/WEB-INF/mvc-dispatcher-servlet.xml   |    35 +
 .../src/main/webapp/WEB-INF/spring-security.xml |    83 +
 gemfire-pulse/src/main/webapp/WEB-INF/web.xml   |    62 +
 .../src/main/webapp/clusterDetail.html          |   676 +
 .../src/main/webapp/css/ForceDirected.css       |    46 +
 gemfire-pulse/src/main/webapp/css/Treemap.css   |   134 +
 gemfire-pulse/src/main/webapp/css/base.css      |    74 +
 gemfire-pulse/src/main/webapp/css/common.css    |   240 +
 .../webapp/css/fonts/DroidSans-Bold-webfont.eot |   Bin 0 -> 43462 bytes
 .../webapp/css/fonts/DroidSans-Bold-webfont.svg |   271 +
 .../webapp/css/fonts/DroidSans-Bold-webfont.ttf |   Bin 0 -> 43260 bytes
 .../css/fonts/DroidSans-Bold-webfont.woff       |   Bin 0 -> 27120 bytes
 .../main/webapp/css/fonts/DroidSans-webfont.eot |   Bin 0 -> 44926 bytes
 .../main/webapp/css/fonts/DroidSans-webfont.svg |   271 +
 .../main/webapp/css/fonts/DroidSans-webfont.ttf |   Bin 0 -> 44712 bytes
 .../webapp/css/fonts/DroidSans-webfont.woff     |   Bin 0 -> 27672 bytes
 .../src/main/webapp/css/grid/ui.jqgrid.css      |   850 +
 gemfire-pulse/src/main/webapp/css/ie/ie.css     |    19 +
 gemfire-pulse/src/main/webapp/css/ie/ie7.css    |    21 +
 gemfire-pulse/src/main/webapp/css/ie/ie8.css    |    20 +
 gemfire-pulse/src/main/webapp/css/ie/ie9.css    |    20 +
 gemfire-pulse/src/main/webapp/css/jquery-ui.css |   566 +
 .../src/main/webapp/css/jquery.jscrollpane.css  |   121 +
 .../src/main/webapp/css/jquery.ui.all.css       |    11 +
 .../src/main/webapp/css/jquery.ui.core.css      |    41 +
 .../src/main/webapp/css/jquery.ui.theme.css     |   248 +
 .../src/main/webapp/css/jquery.ztreestyle.css   |    90 +
 .../css/multiselect/jquery.multiselect.css      |   301 +
 .../main/webapp/css/multiselect/prettify.css    |    46 +
 .../src/main/webapp/css/multiselect/style.css   |    35 +
 gemfire-pulse/src/main/webapp/css/popup.css     |    55 +
 gemfire-pulse/src/main/webapp/css/style.css     |  3067 +++
 .../src/main/webapp/css/treeView/Treemap.css    |   134 +
 .../src/main/webapp/images/about-gemfirexd.png  |   Bin 0 -> 4440 bytes
 .../src/main/webapp/images/about-sqlfire.png    |   Bin 0 -> 6277 bytes
 gemfire-pulse/src/main/webapp/images/about.png  |   Bin 0 -> 4421 bytes
 .../src/main/webapp/images/acc-minus.png        |   Bin 0 -> 1049 bytes
 .../src/main/webapp/images/acc-n-minus.png      |   Bin 0 -> 961 bytes
 .../src/main/webapp/images/acc-n-plus.png       |   Bin 0 -> 988 bytes
 .../src/main/webapp/images/acc-plus.png         |   Bin 0 -> 1047 bytes
 .../src/main/webapp/images/activeServer.png     |   Bin 0 -> 2846 bytes
 .../src/main/webapp/images/arrow-down.png       |   Bin 0 -> 986 bytes
 .../src/main/webapp/images/arrow-up.png         |   Bin 0 -> 988 bytes
 .../src/main/webapp/images/bg-image.png         |   Bin 0 -> 948 bytes
 .../src/main/webapp/images/bg-imageLogin.png    |   Bin 0 -> 946 bytes
 .../src/main/webapp/images/blue-msg-icon.png    |   Bin 0 -> 1194 bytes
 .../src/main/webapp/images/border-left-grid.png |   Bin 0 -> 927 bytes
 .../src/main/webapp/images/bread-crumb.png      |   Bin 0 -> 1182 bytes
 .../src/main/webapp/images/bubble_arrow.png     |   Bin 0 -> 1168 bytes
 .../src/main/webapp/images/chart-active.png     |   Bin 0 -> 1096 bytes
 gemfire-pulse/src/main/webapp/images/chart.png  |   Bin 0 -> 1095 bytes
 .../src/main/webapp/images/checkbox.png         |   Bin 0 -> 1630 bytes
 gemfire-pulse/src/main/webapp/images/chkbox.png |   Bin 0 -> 1313 bytes
 .../src/main/webapp/images/copy_icon.png        |   Bin 0 -> 1172 bytes
 .../src/main/webapp/images/correct_icon.png     |   Bin 0 -> 1143 bytes
 .../main/webapp/images/correct_small_icon.png   |   Bin 0 -> 1065 bytes
 .../main/webapp/images/correct_white_icon.png   |   Bin 0 -> 1122 bytes
 gemfire-pulse/src/main/webapp/images/cross.png  |   Bin 0 -> 2954 bytes
 .../main/webapp/images/dataViewWanEnabled.png   |   Bin 0 -> 1204 bytes
 .../src/main/webapp/images/dd_active.png        |   Bin 0 -> 1065 bytes
 .../src/main/webapp/images/dd_arrow.png         |   Bin 0 -> 1058 bytes
 .../webapp/images/error-locators-others.png     |   Bin 0 -> 2052 bytes
 .../src/main/webapp/images/error-locators.png   |   Bin 0 -> 2023 bytes
 .../images/error-manager-locator-others.png     |   Bin 0 -> 2067 bytes
 .../webapp/images/error-manager-locator.png     |   Bin 0 -> 2047 bytes
 .../webapp/images/error-managers-others.png     |   Bin 0 -> 2051 bytes
 .../src/main/webapp/images/error-managers.png   |   Bin 0 -> 2025 bytes
 .../main/webapp/images/error-message-icon.png   |   Bin 0 -> 1193 bytes
 .../src/main/webapp/images/error-msg-icon.png   |   Bin 0 -> 1194 bytes
 .../src/main/webapp/images/error-others.png     |   Bin 0 -> 2066 bytes
 .../src/main/webapp/images/error-otheruser.png  |   Bin 0 -> 2002 bytes
 .../main/webapp/images/error-status-icon.png    |   Bin 0 -> 2024 bytes
 gemfire-pulse/src/main/webapp/images/error.png  |   Bin 0 -> 1110 bytes
 .../src/main/webapp/images/graph-active.png     |   Bin 0 -> 1360 bytes
 gemfire-pulse/src/main/webapp/images/graph.png  |   Bin 0 -> 1374 bytes
 .../images/graph/key-statistics-graph.png       |   Bin 0 -> 1617 bytes
 .../webapp/images/graph/memory-usage-graph.png  |   Bin 0 -> 4366 bytes
 .../src/main/webapp/images/graph/reads.png      |   Bin 0 -> 3423 bytes
 .../images/graph/throughput-writes-graph.png    |   Bin 0 -> 4340 bytes
 .../src/main/webapp/images/graph/topology.png   |   Bin 0 -> 14997 bytes
 .../src/main/webapp/images/graph/treeview.png   |   Bin 0 -> 3386 bytes
 .../src/main/webapp/images/graph/writes.png     |   Bin 0 -> 3527 bytes
 .../src/main/webapp/images/grid-active.png      |   Bin 0 -> 1095 bytes
 gemfire-pulse/src/main/webapp/images/grid.png   |   Bin 0 -> 1094 bytes
 .../webapp/images/header-bg-bottom-border.png   |   Bin 0 -> 924 bytes
 .../src/main/webapp/images/hide_ico.png         |   Bin 0 -> 3281 bytes
 .../src/main/webapp/images/history-icon.png     |   Bin 0 -> 3533 bytes
 .../src/main/webapp/images/history-remove.png   |   Bin 0 -> 1185 bytes
 .../src/main/webapp/images/hor-spiltter-dot.png |   Bin 0 -> 990 bytes
 .../webapp/images/icons members/locators.png    |   Bin 0 -> 3106 bytes
 .../images/icons members/locators_others.png    |   Bin 0 -> 3118 bytes
 .../webapp/images/icons members/managers.png    |   Bin 0 -> 3103 bytes
 .../images/icons members/managers_locators.png  |   Bin 0 -> 3120 bytes
 .../images/icons members/managers_others.png    |   Bin 0 -> 3117 bytes
 .../main/webapp/images/icons members/others.png |   Bin 0 -> 3102 bytes
 .../src/main/webapp/images/info-msg-icon.png    |   Bin 0 -> 1194 bytes
 .../src/main/webapp/images/lastLine.png         |   Bin 0 -> 948 bytes
 gemfire-pulse/src/main/webapp/images/line.png   |   Bin 0 -> 929 bytes
 .../src/main/webapp/images/mask-bg.png          |   Bin 0 -> 940 bytes
 .../webapp/images/membersName_arror-off.png     |   Bin 0 -> 1148 bytes
 .../main/webapp/images/membersName_arror-on.png |   Bin 0 -> 1170 bytes
 gemfire-pulse/src/main/webapp/images/minus.png  |   Bin 0 -> 2959 bytes
 .../webapp/images/normal-locators-others.png    |   Bin 0 -> 2025 bytes
 .../src/main/webapp/images/normal-locators.png  |   Bin 0 -> 1995 bytes
 .../images/normal-manager-locator-others.png    |   Bin 0 -> 2037 bytes
 .../webapp/images/normal-manager-locator.png    |   Bin 0 -> 2029 bytes
 .../webapp/images/normal-managers-others.png    |   Bin 0 -> 2027 bytes
 .../src/main/webapp/images/normal-managers.png  |   Bin 0 -> 1997 bytes
 .../src/main/webapp/images/normal-others.png    |   Bin 0 -> 1988 bytes
 .../src/main/webapp/images/normal-otheruser.png |   Bin 0 -> 1968 bytes
 .../main/webapp/images/normal-status-icon.png   |   Bin 0 -> 1955 bytes
 gemfire-pulse/src/main/webapp/images/normal.png |   Bin 0 -> 1110 bytes
 .../src/main/webapp/images/orange-msg-icon.png  |   Bin 0 -> 1194 bytes
 .../src/main/webapp/images/pivotal-logo.png     |   Bin 0 -> 4302 bytes
 gemfire-pulse/src/main/webapp/images/plus.png   |   Bin 0 -> 1178 bytes
 .../src/main/webapp/images/plusMinusIcon.png    |   Bin 0 -> 1192 bytes
 .../src/main/webapp/images/popup-arrow.png      |   Bin 0 -> 1075 bytes
 .../main/webapp/images/popup-close-button.png   |   Bin 0 -> 1026 bytes
 .../images/pulse-monitoring-gemfirexd-old.png   |   Bin 0 -> 6606 bytes
 .../images/pulse-monitoring-gemfirexd.png       |   Bin 0 -> 4440 bytes
 .../webapp/images/pulse-monitoring-sqlfire.png  |   Bin 0 -> 6467 bytes
 .../src/main/webapp/images/pulse-monitoring.png |   Bin 0 -> 4741 bytes
 .../src/main/webapp/images/radio-off.png        |   Bin 0 -> 1252 bytes
 .../src/main/webapp/images/radio-on.png         |   Bin 0 -> 1306 bytes
 gemfire-pulse/src/main/webapp/images/radio.png  |   Bin 0 -> 2476 bytes
 .../src/main/webapp/images/regionIcons.png      |   Bin 0 -> 1495 bytes
 .../src/main/webapp/images/rightBorder.png      |   Bin 0 -> 927 bytes
 .../src/main/webapp/images/searchIcon.png       |   Bin 0 -> 1592 bytes
 .../src/main/webapp/images/seperator.png        |   Bin 0 -> 929 bytes
 gemfire-pulse/src/main/webapp/images/server.png |   Bin 0 -> 1233 bytes
 .../webapp/images/severe-locators-others.png    |   Bin 0 -> 2026 bytes
 .../src/main/webapp/images/severe-locators.png  |   Bin 0 -> 1980 bytes
 .../images/severe-manager-locator-others.png    |   Bin 0 -> 2032 bytes
 .../webapp/images/severe-manager-locator.png    |   Bin 0 -> 2026 bytes
 .../webapp/images/severe-managers-others.png    |   Bin 0 -> 2026 bytes
 .../src/main/webapp/images/severe-managers.png  |   Bin 0 -> 1985 bytes
 .../src/main/webapp/images/severe-msg-icon.png  |   Bin 0 -> 1194 bytes
 .../src/main/webapp/images/severe-others.png    |   Bin 0 -> 2007 bytes
 .../src/main/webapp/images/severe-otheruser.png |   Bin 0 -> 1959 bytes
 .../main/webapp/images/severe-status-icon.png   |   Bin 0 -> 2218 bytes
 gemfire-pulse/src/main/webapp/images/severe.png |   Bin 0 -> 1110 bytes
 .../src/main/webapp/images/show_ico.png         |   Bin 0 -> 3296 bytes
 gemfire-pulse/src/main/webapp/images/spacer.png |   Bin 0 -> 922 bytes
 .../src/main/webapp/images/sqlfire.png          |   Bin 0 -> 6467 bytes
 .../src/main/webapp/images/status-down.png      |   Bin 0 -> 1125 bytes
 .../src/main/webapp/images/status-up.png        |   Bin 0 -> 1104 bytes
 .../src/main/webapp/images/subServer.png        |   Bin 0 -> 2201 bytes
 .../src/main/webapp/images/tab-bottom-bg.png    |   Bin 0 -> 929 bytes
 .../src/main/webapp/images/treeView-img.png     |   Bin 0 -> 962 bytes
 .../main/webapp/images/ui-anim_basic_16x16.gif  |   Bin 0 -> 1459 bytes
 .../src/main/webapp/images/ver-spiltter-dot.png |   Bin 0 -> 979 bytes
 .../webapp/images/warning-locators-others.png   |   Bin 0 -> 2048 bytes
 .../src/main/webapp/images/warning-locators.png |   Bin 0 -> 2032 bytes
 .../images/warning-manager-locator-others.png   |   Bin 0 -> 2071 bytes
 .../webapp/images/warning-manager-locator.png   |   Bin 0 -> 2052 bytes
 .../webapp/images/warning-managers-others.png   |   Bin 0 -> 2023 bytes
 .../src/main/webapp/images/warning-managers.png |   Bin 0 -> 2030 bytes
 .../src/main/webapp/images/warning-msg-icon.png |   Bin 0 -> 1194 bytes
 .../src/main/webapp/images/warning-others.png   |   Bin 0 -> 2027 bytes
 .../main/webapp/images/warning-otheruser.png    |   Bin 0 -> 2010 bytes
 .../main/webapp/images/warning-status-icon.png  |   Bin 0 -> 1714 bytes
 .../src/main/webapp/images/warning.png          |   Bin 0 -> 1107 bytes
 .../src/main/webapp/images/yellow-msg-icon.png  |   Bin 0 -> 1194 bytes
 gemfire-pulse/src/main/webapp/index.html        |    67 +
 .../main/webapp/properties/default.properties   |    21 +
 .../webapp/properties/default_en.properties     |    21 +
 .../main/webapp/properties/gemfire.properties   |    45 +
 .../webapp/properties/gemfire_en.properties     |    45 +
 .../main/webapp/properties/gemfirexd.properties |    45 +
 .../webapp/properties/gemfirexd_en.properties   |    45 +
 .../src/main/webapp/properties/index.properties |    18 +
 .../main/webapp/properties/index_fr.properties  |    19 +
 .../main/webapp/properties/sqlfire.properties   |    45 +
 gemfire-pulse/src/main/webapp/regionDetail.html |   567 +
 .../src/main/webapp/scripts/lib/common.js       |   536 +
 .../src/main/webapp/scripts/lib/excanvas.js     |  1416 ++
 .../main/webapp/scripts/lib/grid.locale-en.js   |   169 +
 .../src/main/webapp/scripts/lib/html5.js        |     3 +
 .../src/main/webapp/scripts/lib/jit.js          | 17208 +++++++++++++++++
 .../src/main/webapp/scripts/lib/jquery-1.7.2.js |  9404 +++++++++
 .../webapp/scripts/lib/jquery.generateFile.js   |    77 +
 .../scripts/lib/jquery.i18n.properties.js       |   336 +
 .../webapp/scripts/lib/jquery.jqGrid.src.js     | 12182 ++++++++++++
 .../webapp/scripts/lib/jquery.jscrollpane.js    |  1340 ++
 .../webapp/scripts/lib/jquery.mousewheel.js     |    84 +
 .../webapp/scripts/lib/jquery.placeholder.js    |   106 +
 .../main/webapp/scripts/lib/jquery.sparkline.js |  3001 +++
 .../main/webapp/scripts/lib/jquery.tablednd.js  |   383 +
 .../main/webapp/scripts/lib/jquery.timeago.js   |   193 +
 .../webapp/scripts/lib/jquery.ztree.core-3.5.js |  1650 ++
 .../scripts/lib/jquery.ztree.excheck-3.5.js     |   624 +
 .../src/main/webapp/scripts/lib/tooltip.js      |   357 +
 .../webapp/scripts/multiselect/jquery-ui.js     | 14988 ++++++++++++++
 .../scripts/multiselect/jquery.multiselect.js   |   816 +
 .../main/webapp/scripts/multiselect/prettify.js |  1522 ++
 .../webapp/scripts/pulsescript/MemberDetails.js |  1045 +
 .../scripts/pulsescript/PulseCallbacks.js       |  1735 ++
 .../scripts/pulsescript/PulseFunctions.js       |   227 +
 .../webapp/scripts/pulsescript/clusterDetail.js |  2360 +++
 .../scripts/pulsescript/clusterRGraphMembers.js |  1515 ++
 .../main/webapp/scripts/pulsescript/common.js   |  1626 ++
 .../scripts/pulsescript/pages/DataBrowser.js    |   662 +
 .../pulsescript/pages/DataBrowserQuery.js       |   964 +
 .../pages/DataBrowserQueryHistory.js            |    95 +
 .../webapp/scripts/pulsescript/pages/Login.js   |   170 +
 .../webapp/scripts/pulsescript/pages/index.js   |    26 +
 .../scripts/pulsescript/queryStatistics.js      |   315 +
 .../webapp/scripts/pulsescript/regionView.js    |   757 +
 .../pulse/testbed/GemFireDistributedSystem.java |   323 +
 .../tools/pulse/testbed/GemfireTopology.java    |    24 +
 .../tools/pulse/testbed/PropFileHelper.java     |   115 +
 .../pulse/testbed/PropMockDataUpdater.java      |   515 +
 .../gemfire/tools/pulse/testbed/TestBed.java    |    84 +
 .../tools/pulse/testbed/driver/PulseUITest.java |   289 +
 .../pulse/testbed/driver/TomcatHelper.java      |    77 +
 .../tools/pulse/tests/AggregateStatement.java   |   217 +
 .../pulse/tests/AggregateStatementMBean.java    |   168 +
 .../pulse/tests/DataBrowserResultLoader.java    |    84 +
 .../pulse/tests/GemFireXDAggregateTable.java    |    46 +
 .../tests/GemFireXDAggregateTableMBean.java     |    28 +
 .../tools/pulse/tests/GemFireXDCluster.java     |    95 +
 .../pulse/tests/GemFireXDClusterMBean.java      |    32 +
 .../tools/pulse/tests/GemFireXDMember.java      |    80 +
 .../tools/pulse/tests/GemFireXDMemberMBean.java |    31 +
 .../gemfire/tools/pulse/tests/JMXBaseBean.java  |    67 +
 .../tools/pulse/tests/JMXProperties.java        |    47 +
 .../gemfire/tools/pulse/tests/Member.java       |   193 +
 .../gemfire/tools/pulse/tests/MemberMBean.java  |    86 +
 .../tools/pulse/tests/PulseAutomatedTest.java   |   785 +
 .../tools/pulse/tests/PulseBaseTest.java        |   686 +
 .../gemfire/tools/pulse/tests/PulseTest.java    |  1060 +
 .../tools/pulse/tests/PulseTestData.java        |   106 +
 .../tools/pulse/tests/PulseTestLocators.java    |   225 +
 .../gemfire/tools/pulse/tests/Region.java       |   192 +
 .../gemfire/tools/pulse/tests/RegionMBean.java  |    59 +
 .../tools/pulse/tests/RegionOnMember.java       |    96 +
 .../tools/pulse/tests/RegionOnMemberMBean.java  |    50 +
 .../gemfire/tools/pulse/tests/Server.java       |   253 +
 .../gemfire/tools/pulse/tests/ServerObject.java |   264 +
 .../tools/pulse/tests/ServerObjectMBean.java    |    79 +
 .../gemfire/tools/pulse/tests/TomcatHelper.java |    97 +
 .../pulse/tests/junit/BaseServiceTest.java      |   250 +
 .../junit/ClusterSelectedRegionServiceTest.java |   350 +
 ...ClusterSelectedRegionsMemberServiceTest.java |   362 +
 .../junit/MemberGatewayHubServiceTest.java      |   423 +
 .../src/test/resources/NoDataFound1.txt         |     1 +
 .../src/test/resources/NoDataFound2.txt         |    35 +
 .../src/test/resources/NoDataFound3.txt         |     6 +
 gemfire-pulse/src/test/resources/message.txt    |     1 +
 .../src/test/resources/test.properties          |   326 +
 gemfire-pulse/src/test/resources/test1.txt      |     5 +
 gemfire-pulse/src/test/resources/test2.txt      |     7 +
 gemfire-pulse/src/test/resources/test3.txt      |     5 +
 gemfire-pulse/src/test/resources/test4.txt      |     4 +
 gemfire-pulse/src/test/resources/test5.txt      |     7 +
 gemfire-pulse/src/test/resources/test6.txt      |    11 +
 gemfire-pulse/src/test/resources/test7.txt      |    13 +
 .../resources/testNullObjectsAtRootLevel1.txt   |    25 +
 .../resources/testNullObjectsAtRootLevel2.txt   |    30 +
 .../src/test/resources/testQueryResult.txt      |   198 +
 .../src/test/resources/testQueryResult1000.txt  |  1023 +
 .../testQueryResultArrayAndArrayList.txt        |     8 +
 .../test/resources/testQueryResultArrayList.txt |     6 +
 .../resources/testQueryResultArrayOfList.txt    |    15 +
 .../resources/testQueryResultClusterSmall.txt   |    23 +
 .../testQueryResultClusterWithStruct.txt        |    10 +
 .../test/resources/testQueryResultHashMap.txt   |     8 +
 .../resources/testQueryResultHashMapSmall.txt   |    12 +
 .../src/test/resources/testQueryResultSmall.txt |    12 +
 .../resources/testQueryResultWithStruct.txt     |  1744 ++
 .../testQueryResultWithStructSmall.txt          |    15 +
 gemfire-pulse/src/test/resources/test_pp.txt    |     7 +
 .../src/test/resources/testbed.properties       |   157 +
 gradle/rat.gradle                               |    30 +-
 settings.gradle                                 |     1 +
 520 files changed, 126450 insertions(+), 2785 deletions(-)
----------------------------------------------------------------------



[56/70] incubator-geode git commit: GEODE-803: Updating headers on WAN and CQ code

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
index 79a34c8..4acaaf4 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANConflationDUnitTest.java
@@ -1,12 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-/**
- * 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.parallel;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
index fd87d1e..48786a7 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPersistenceEnabledGatewaySenderDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.parallel;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java
index 228cdad..aa83f68 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationClientServerDUnitTest.java
@@ -1,12 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-/**
- * 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.parallel;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
index 8eae664..e1c315a 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationConcurrentOpsDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.parallel;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
index c9f7054..a43f4ba 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.parallel;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java
index c2ef6f3..9708684 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANPropagationLoopBackDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.parallel;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
index 728bade..c846254 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelWANStatsDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.parallel;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
index 24ea4cd..54a641c 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderDistributedDeadlockDUnitTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.internal.cache.wan.serial;
 
 import com.gemstone.gemfire.cache.CacheFactory;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
index 85c45f7..d0251e8 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderEventListenerDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.serial;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
index bdaec73..b9e4f7f 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderOperationsDUnitTest.java
@@ -1,12 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-/**
- * 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.serial;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
index 240d7f2..3995d65 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderQueueDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.serial;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
index fed9202..a95e9e4 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPersistenceEnabledGatewaySenderDUnitTest.java
@@ -1,12 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-/**
- * 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.serial;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
index 8c1e9e5..af13221 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.serial;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java
index e33c6a2..81a66ac 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.serial;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java
index ddf4901..5356ffb 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.serial;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationsFeatureDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationsFeatureDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationsFeatureDUnitTest.java
index d0b984d..3e3e5b9 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationsFeatureDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationsFeatureDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.serial;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
index dff58bf..39f4d34 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.serial;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
index 6f9347c..bebf631 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.wancommand;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
index 196d631..5be0c45 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewayReceiverDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.wancommand;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java
index 0ddd6e6..91a731a 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandCreateGatewaySenderDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.wancommand;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
index acc57c2..1314eda 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStartDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.wancommand;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
index 3d4819c..5c44015 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewayReceiverStopDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.wancommand;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java
index 8fd000b..9d106d6 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStartDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.wancommand;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java
index 7be34e6..4ed98cc 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandGatewaySenderStopDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.wancommand;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
index 3b4f198..da31a5c 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandListDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.wancommand;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
index d58d052..54b43a1 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandPauseResumeDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.wancommand;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
index c760ed1..346e6e8 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WanCommandStatusDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.wancommand;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java
index e699264..3fd4a88 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/WANManagementDUnitTest.java
@@ -1,12 +1,19 @@
 /*
- *  =========================================================================
- *  Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- *  ========================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package com.gemstone.gemfire.management;
 
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
index e2cb31b..b35f230 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.management.internal.configuration;
 
 import com.gemstone.gemfire.LogWriter;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java
index e2e1f83..908fa65 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestRemoteClusterDUnitTest.java
@@ -1,10 +1,18 @@
 /*
- *  =========================================================================
- *  Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- *  ========================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.management.internal.pulse;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/resources/.keepme
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/resources/.keepme b/gemfire-wan/src/test/resources/.keepme
deleted file mode 100644
index e69de29..0000000


[30/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
new file mode 100644
index 0000000..d667b1d
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
@@ -0,0 +1,3356 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.tier.sockets;
+
+import java.util.Iterator;
+
+import org.junit.Ignore;
+
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.InterestResultPolicy;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.client.Pool;
+import com.gemstone.gemfire.cache.client.PoolManager;
+import com.gemstone.gemfire.cache.client.ServerRefusedConnectionException;
+import com.gemstone.gemfire.cache.client.internal.PoolImpl;
+import com.gemstone.gemfire.cache.query.CqAttributes;
+import com.gemstone.gemfire.cache.query.CqAttributesFactory;
+import com.gemstone.gemfire.cache.query.CqException;
+import com.gemstone.gemfire.cache.query.CqExistsException;
+import com.gemstone.gemfire.cache.query.CqListener;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.cache.query.RegionNotFoundException;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.internal.cache.PoolFactoryImpl;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+
+import dunit.AsyncInvocation;
+import dunit.DistributedTestCase;
+import dunit.Host;
+import dunit.VM;
+
+public class DurableClientSimpleDUnitTest extends DurableClientTestCase {
+
+  public DurableClientSimpleDUnitTest(String name) {
+    super(name);
+  }
+  /**
+   * Test that a durable client correctly receives updates.
+   */
+  public void testSimpleDurableClientUpdate() {
+    // Start a server
+    int serverPort = ((Integer) this.server1VM.invoke(CacheServerTestUtil.class,
+        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+        .intValue();
+
+    // Start a durable client that is not kept alive on the server when it stops
+    // normally
+    final String durableClientId = getName() + "_client";
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE});
+
+    // Send clientReady message
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
+      public void run2() throws CacheException {
+        CacheServerTestUtil.getCache().readyForEvents();
+      }
+    });
+
+    // Have the durable client register interest in all keys
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Register interest") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Register interest in all keys
+        region.registerInterestRegex(".*", InterestResultPolicy.NONE, true);
+      }
+    });
+
+    // Start normal publisher client
+    this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName});
+
+    // Publish some entries
+    final int numberOfEntries = 10;
+    this.publisherClientVM.invoke(new CacheSerializableRunnable("Register interest") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Publish some entries
+        for (int i=0; i<numberOfEntries; i++) {
+          String keyAndValue = String.valueOf(i);
+          region.put(keyAndValue, keyAndValue);
+        }
+      }
+    });
+    
+    // Verify the durable client received the updates
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Verify updates") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Get the listener and wait for the appropriate number of events
+        CacheServerTestUtil.ControlListener listener = (CacheServerTestUtil.ControlListener) region
+                .getAttributes().getCacheListeners()[0];
+        listener.waitWhileNotEnoughEvents(30000, numberOfEntries);
+        assertEquals(numberOfEntries, listener.events.size());
+      }
+    });
+    
+    // Stop the durable client
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    
+    // Stop the publisher client
+    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    
+    // Stop the server
+    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+  }
+
+  /**
+   * Test that a durable client VM with multiple BridgeClients correctly
+   * registers on the server.
+   */
+  public void testMultipleBridgeClientsInSingleDurableVM() {
+    // Start a server
+    int serverPort = ((Integer) this.server1VM.invoke(CacheServerTestUtil.class,
+        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+        .intValue();
+
+    // Start a durable client with 2 regions (and 2 BridgeClients) that is not
+    // kept alive on the server when it stops normally
+    final String durableClientId = getName() + "_client";
+    final String regionName1 = regionName + "1";
+    final String regionName2 = regionName + "2";
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClients", 
+        new Object[] {getClientPool(getServerHostName(durableClientVM.getHost()), serverPort, true), regionName1, regionName2, getClientDistributedSystemProperties(durableClientId)});
+
+    // Send clientReady message
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
+      public void run2() throws CacheException {
+        assertEquals(2, PoolManager.getAll().size());
+        CacheServerTestUtil.getCache().readyForEvents();
+      }
+    });
+
+    // Verify durable clients on server
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {       
+        // Get the CacheClientNotifier
+        CacheClientNotifier notifier = getBridgeServer().getAcceptor()
+            .getCacheClientNotifier();
+        
+        // Iterate the CacheClientProxies
+        checkNumberOfClientProxies(2);
+        String firstProxyRegionName = null;
+        for (Iterator i = notifier.getClientProxies().iterator(); i.hasNext();) {
+          CacheClientProxy proxy = (CacheClientProxy) i.next();
+          assertTrue(proxy.isDurable());
+          assertEquals(durableClientId, proxy.getDurableId());
+          assertEquals(DistributionConfig.DEFAULT_DURABLE_CLIENT_TIMEOUT, proxy.getDurableTimeout());
+          
+          // Verify the two HA region names aren't the same
+          if (firstProxyRegionName == null) {
+            firstProxyRegionName = proxy.getHARegionName();
+          } else {
+            assertTrue(!firstProxyRegionName.equals(proxy.getHARegionName()));
+          }
+        }
+      }
+    });
+    
+    // Stop the durable client
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    
+    // Verify the durable client is no longer on the server
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        checkNumberOfClientProxies(0);
+      }
+    });
+    
+    // Stop the server
+    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+  }
+  
+  /**
+   * Test that a second VM with the same durable id cannot connect to the server
+   * while the first VM is connected. Also, verify that the first client is not
+   * affected by the second one attempting to connect.
+   */
+  public void XtestMultipleVMsWithSameDurableId() {
+    // Start a server
+    final int serverPort = ((Integer) this.server1VM.invoke(CacheServerTestUtil.class,
+        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+        .intValue();
+
+    // Start a durable client that is not kept alive on the server when it
+    // stops normally
+    final String durableClientId = getName() + "_client";
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE});
+
+    // Send clientReady message
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
+      public void run2() throws CacheException {
+        CacheServerTestUtil.getCache().readyForEvents();
+      }
+    });
+
+    // Have the durable client register interest in all keys
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Register interest") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Register interest in all keys
+        region.registerInterestRegex(".*", InterestResultPolicy.NONE);
+      }
+    });
+
+    // Attempt to start another durable client VM with the same id.
+    this.publisherClientVM.invoke(new CacheSerializableRunnable("Create another durable client") {
+      public void run2() throws CacheException {
+        getSystem(getClientDistributedSystemProperties(durableClientId));
+        PoolFactoryImpl pf = (PoolFactoryImpl)PoolManager.createFactory();
+        pf.init(getClientPool(getServerHostName(publisherClientVM.getHost()), serverPort, true));
+        try {
+          pf.create("uncreatablePool");
+          fail("Should not have been able to create the pool");
+        } catch (ServerRefusedConnectionException e) {
+          // expected exception
+          disconnectFromDS();
+        } catch (Exception e) {
+          fail("Should not have gotten here", e);
+        }
+      }
+    });
+
+    // Verify durable client on server
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        checkNumberOfClientProxies(1);
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+        
+        // Verify that it is durable and its properties are correct
+        assertTrue(proxy.isDurable());
+        assertEquals(durableClientId, proxy.getDurableId());
+        assertEquals(DistributionConfig.DEFAULT_DURABLE_CLIENT_TIMEOUT, proxy.getDurableTimeout());
+      }
+    });
+    
+    // Start normal publisher client
+    this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName});
+
+    // Publish some entries
+    final int numberOfEntries = 10;
+    this.publisherClientVM.invoke(new CacheSerializableRunnable("Register interest") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Publish some entries
+        for (int i=0; i<numberOfEntries; i++) {
+          String keyAndValue = String.valueOf(i);
+          region.put(keyAndValue, keyAndValue);
+        }
+      }
+    });
+      
+    // Verify the durable client received the updates
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Verify updates") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Get the listener and wait for the appropriate number of events
+        CacheServerTestUtil.ControlListener listener = (CacheServerTestUtil.ControlListener) region
+                .getAttributes().getCacheListeners()[0];
+        listener.waitWhileNotEnoughEvents(30000, numberOfEntries);
+        assertEquals(numberOfEntries, listener.events.size());
+      }
+    });
+    
+    // Stop the publisher client
+    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    
+    // Stop the durable client
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    
+    // Stop the server
+    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+  }
+
+  /**
+   * Test that the server correctly processes starting two durable clients.
+   */
+  public void testSimpleTwoDurableClients() {
+    // Start a server
+    int serverPort = ((Integer) this.server1VM.invoke(CacheServerTestUtil.class,
+        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+        .intValue();
+
+    // Start a durable client that is not kept alive on the server when it
+    // stops normally
+    final String durableClientId = getName() + "_client";
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId)});
+
+    // Send clientReady message
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
+      public void run2() throws CacheException {
+        CacheServerTestUtil.getCache().readyForEvents();
+      }
+    });
+
+    // Start another durable client that is not kept alive on the server when
+    // it stops normally. Use the 'publisherClientVM' as a durable client.
+    VM durableClient2VM = this.publisherClientVM;
+    final String durableClientId2 = getName() + "_client2";
+    durableClient2VM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(durableClient2VM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId2)});
+    
+    // Send clientReady message
+    durableClient2VM.invoke(new CacheSerializableRunnable("Send clientReady") {
+      public void run2() throws CacheException {
+        CacheServerTestUtil.getCache().readyForEvents();
+      }
+    });
+
+    // Verify durable clients on server
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Get the CacheClientNotifier
+        CacheClientNotifier notifier = getBridgeServer().getAcceptor()
+            .getCacheClientNotifier();
+        
+        // Iterate the CacheClientProxies and verify they are correct
+        checkNumberOfClientProxies(2);
+        boolean durableClient1Found=false, durableClient2Found=false;
+        for (Iterator i = notifier.getClientProxies().iterator(); i.hasNext();) {
+          CacheClientProxy proxy = (CacheClientProxy) i.next();
+          assertTrue(proxy.isDurable());
+          if (proxy.getDurableId().equals(durableClientId)) {
+            durableClient1Found = true;
+          }
+          if (proxy.getDurableId().equals(durableClientId2)) {
+            durableClient2Found = true;
+          }
+          assertEquals(DistributionConfig.DEFAULT_DURABLE_CLIENT_TIMEOUT, proxy.getDurableTimeout());
+        }
+        assertTrue(durableClient1Found);
+        assertTrue(durableClient2Found);
+      }
+    });
+    
+    // Stop the durable clients
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    durableClient2VM.invoke(CacheServerTestUtil.class, "closeCache");
+    
+    // Stop the server
+    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+  }
+  
+  /**
+   * Test that starting a durable client on multiple servers (one live and one
+   * not live) is processed correctly.
+   */
+  @Ignore("Disabled for bug 52043")
+  public void DISABLED_testDurableClientMultipleServersOneLive() {
+    // Start server 1
+    final int server1Port = ((Integer) this.server1VM.invoke(CacheServerTestUtil.class,
+        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+        .intValue();
+
+    // Start server 2
+    final int server2Port = ((Integer) this.server2VM.invoke(CacheServerTestUtil.class,
+        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+        .intValue();
+    
+    // Stop server 2
+    this.server2VM.invoke(CacheServerTestUtil.class, "closeCache");
+    
+    // Start a durable client that is kept alive on the server when it stops
+    // normally
+    final String durableClientId = getName() + "_client";
+    final int durableClientTimeout = 60; // keep the client alive for 60 seconds
+    //final boolean durableClientKeepAlive = true; // keep the client alive when it stops normally
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(durableClientVM.getHost()), server1Port, server2Port, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE});
+
+    // Send clientReady message
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
+      public void run2() throws CacheException {
+        CacheServerTestUtil.getCache().readyForEvents();
+      }
+    });
+
+    // Have the durable client register interest in all keys
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Register interest") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Register interest in all keys
+        region.registerInterestRegex(".*", InterestResultPolicy.NONE, true);
+      }
+    });
+
+    // Verify durable client on server1
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        checkNumberOfClientProxies(1);
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+
+        // Verify that it is durable and its properties are correct
+        assertTrue(proxy.isDurable());
+        assertEquals(durableClientId, proxy.getDurableId());
+        assertEquals(durableClientTimeout, proxy.getDurableTimeout());
+      }
+    });
+
+    // Start normal publisher client
+    this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(publisherClientVM.getHost()), server1Port, server2Port, false), regionName});
+
+    // Publish some entries
+    final int numberOfEntries = 10;
+    this.publisherClientVM.invoke(new CacheSerializableRunnable("Register interest") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Publish some entries
+        for (int i=0; i<numberOfEntries; i++) {
+          String keyAndValue = String.valueOf(i);
+          region.put(keyAndValue, keyAndValue);
+        }
+      }
+    });
+    
+    // Verify the durable client received the updates
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Verify updates") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Get the listener and wait for the appropriate number of events
+        CacheServerTestUtil.ControlListener listener = (CacheServerTestUtil.ControlListener) region
+                .getAttributes().getCacheListeners()[0];
+        listener.waitWhileNotEnoughEvents(30000, numberOfEntries);
+        assertEquals("Events were" + listener.events, numberOfEntries, listener.events.size());
+      }
+    });
+    
+    try {
+      java.lang.Thread.sleep(10000);
+    }
+    catch (InterruptedException ex) {
+      fail("interrupted");
+    }
+    
+    // Stop the durable client
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache", new Object[] {new Boolean(true)});
+    
+    // Verify the durable client still exists on the server
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+      }
+    });
+
+    // Publish some more entries
+    this.publisherClientVM.invoke(new CacheSerializableRunnable("Register interest") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Publish some entries
+        for (int i=0; i<numberOfEntries; i++) {
+          String keyAndValue = String.valueOf(i);
+          region.put(keyAndValue, keyAndValue);
+        }
+      }
+    });
+    
+    // Re-start the durable client
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(durableClientVM.getHost()), server1Port, server2Port, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE});
+
+    // Send clientReady message
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
+      public void run2() throws CacheException {
+        CacheServerTestUtil.getCache().readyForEvents();
+      }
+    });
+
+    // Verify durable client on server
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        checkNumberOfClientProxies(1);
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+        
+        // Verify that it is durable and its properties are correct
+        assertTrue(proxy.isDurable());
+        assertEquals(durableClientId, proxy.getDurableId());
+      }
+    });
+        
+    // Verify the durable client received the updates held for it on the server
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Verify updates") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Get the listener and wait for the appropriate number of events
+        CacheServerTestUtil.ControlListener listener = (CacheServerTestUtil.ControlListener) region
+                .getAttributes().getCacheListeners()[0];
+        listener.waitWhileNotEnoughEvents(30000, numberOfEntries);
+        assertEquals("Events were" + listener.events, numberOfEntries, listener.events.size());
+      }
+    });
+    
+    // Stop the durable client
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    
+    // Stop the publisher client
+    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    
+    // Stop server 1
+    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+  }
+    
+  /**
+   * Test that updates to two durable clients are processed correctly.
+   */
+  public void testTwoDurableClientsStartStopUpdate() {
+    // Start a server
+    int serverPort = ((Integer) this.server1VM.invoke(CacheServerTestUtil.class,
+        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+        .intValue();
+
+    // Start a durable client that is kept alive on the server when it stops
+    // normally
+    final String durableClientId = getName() + "_client";
+    final int durableClientTimeout = 60; // keep the client alive for 60 seconds
+    //final boolean durableClientKeepAlive = true; // keep the client alive when it stops normally
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE});
+
+    // Send clientReady message
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
+      public void run2() throws CacheException {
+        CacheServerTestUtil.getCache().readyForEvents();
+      }
+    });
+
+    // Have the durable client register interest in all keys
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Register interest") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Register interest in all keys
+        region.registerInterestRegex(".*", InterestResultPolicy.NONE, true);
+      }
+    });
+    
+    // Start another durable client that is not kept alive on the server when
+    // it stops normally. Use the 'server2VM' as the second durable client.
+    VM durableClient2VM = this.server2VM;
+    final String durableClientId2 = getName() + "_client2";
+    durableClient2VM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(durableClient2VM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId2, durableClientTimeout), Boolean.TRUE});
+    
+    // Send clientReady message
+    durableClient2VM.invoke(new CacheSerializableRunnable("Send clientReady") {
+      public void run2() throws CacheException {
+        CacheServerTestUtil.getCache().readyForEvents();
+      }
+    });
+
+    // Have the durable client register interest in all keys
+    durableClient2VM.invoke(new CacheSerializableRunnable("Register interest") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Register interest in all keys
+        region.registerInterestRegex(".*", InterestResultPolicy.NONE, true);
+      }
+    });
+    
+    // Verify durable clients on server
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Get the CacheClientNotifier
+        CacheClientNotifier notifier = getBridgeServer().getAcceptor()
+            .getCacheClientNotifier();
+        
+        // Iterate the CacheClientProxies and verify they are correct
+        checkNumberOfClientProxies(2);
+        boolean durableClient1Found=false, durableClient2Found=false;
+        for (Iterator i = notifier.getClientProxies().iterator(); i.hasNext();) {
+          CacheClientProxy proxy = (CacheClientProxy) i.next();
+          assertTrue(proxy.isDurable());
+          if (proxy.getDurableId().equals(durableClientId)) {
+            durableClient1Found = true;
+          }
+          if (proxy.getDurableId().equals(durableClientId2)) {
+            durableClient2Found = true;
+          }
+          assertEquals(durableClientTimeout, proxy.getDurableTimeout());
+        }
+        assertTrue(durableClient1Found);
+        assertTrue(durableClient2Found);
+      }
+    });
+    
+    // Start normal publisher client
+    this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName});
+
+    // Publish some entries
+    final int numberOfEntries = 10;
+    this.publisherClientVM.invoke(new CacheSerializableRunnable("Register interest") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Publish some entries
+        for (int i=0; i<numberOfEntries; i++) {
+          String keyAndValue = String.valueOf(i);
+          region.put(keyAndValue, keyAndValue);
+        }
+      }
+    });
+    
+    // Verify durable client 1 received the updates
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Verify updates") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Get the listener and wait for the appropriate number of events
+        CacheServerTestUtil.ControlListener listener = (CacheServerTestUtil.ControlListener) region
+                .getAttributes().getCacheListeners()[0];
+        listener.waitWhileNotEnoughEvents(30000, numberOfEntries);
+        assertEquals(numberOfEntries, listener.events.size());
+      }
+    });
+    
+    // Verify durable client 2 received the updates
+    durableClient2VM.invoke(new CacheSerializableRunnable("Verify updates") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Get the listener and wait for the appropriate number of events
+        CacheServerTestUtil.ControlListener listener = (CacheServerTestUtil.ControlListener) region
+                .getAttributes().getCacheListeners()[0];
+        listener.waitWhileNotEnoughEvents(30000, numberOfEntries);
+        assertEquals(numberOfEntries, listener.events.size());
+      }
+    });
+    
+    // ARB: Wait for queue ack to arrive at server.
+    try {
+      Thread.sleep(1000);
+    } catch (InterruptedException ex) {
+      fail("interrupted");
+    }
+    
+    // Stop the durable clients
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache", new Object[] {new Boolean(true)});
+    durableClient2VM.invoke(CacheServerTestUtil.class, "closeCache", new Object[] {new Boolean(true)});
+    
+    // Verify the durable clients still exist on the server
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Get the CacheClientNotifier
+        CacheClientNotifier notifier = getBridgeServer().getAcceptor()
+            .getCacheClientNotifier();
+        
+        // Iterate the CacheClientProxies and verify they are correct
+        checkNumberOfClientProxies(2);
+        boolean durableClient1Found=false, durableClient2Found=false;
+        for (Iterator i = notifier.getClientProxies().iterator(); i.hasNext();) {
+          CacheClientProxy proxy = (CacheClientProxy) i.next();
+          assertTrue(proxy.isDurable());
+          if (proxy.getDurableId().equals(durableClientId)) {
+            durableClient1Found = true;
+          }
+          if (proxy.getDurableId().equals(durableClientId2)) {
+            durableClient2Found = true;
+          }
+          assertEquals(durableClientTimeout, proxy.getDurableTimeout());
+        }
+        assertTrue(durableClient1Found);
+        assertTrue(durableClient2Found);
+      }
+    });
+
+    // Publish some more entries
+    this.publisherClientVM.invoke(new CacheSerializableRunnable("Register interest") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Publish some entries
+        for (int i=0; i<numberOfEntries; i++) {
+          String keyAndValue = String.valueOf(i);
+          region.put(keyAndValue, keyAndValue);
+        }
+      }
+    });
+    
+    try {
+      java.lang.Thread.sleep(1000);
+    }
+    catch (java.lang.InterruptedException ex) {
+      fail("interrupted");
+    }
+
+    // Verify the durable clients' queues contain the entries
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Get the CacheClientNotifier
+        CacheClientNotifier notifier = getBridgeServer().getAcceptor()
+            .getCacheClientNotifier();
+        
+        // Iterate the CacheClientProxies and verify the queue sizes
+        checkNumberOfClientProxies(2);
+//        boolean durableClient1Found=false, durableClient2Found=false;
+        for (Iterator i = notifier.getClientProxies().iterator(); i.hasNext();) {
+          CacheClientProxy proxy = (CacheClientProxy) i.next();
+          assertEquals(numberOfEntries, proxy.getQueueSize());
+        }
+      }
+    });
+
+    // Re-start durable client 1
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId), Boolean.TRUE});
+
+    // Send clientReady message
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
+      public void run2() throws CacheException {
+        CacheServerTestUtil.getCache().readyForEvents();
+      }
+    });
+
+    // Re-start durable client 2
+    durableClient2VM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(durableClient2VM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId2), Boolean.TRUE});
+
+    // Send clientReady message
+    durableClient2VM.invoke(new CacheSerializableRunnable("Send clientReady") {
+      public void run2() throws CacheException {
+        CacheServerTestUtil.getCache().readyForEvents();
+      }
+    });
+
+    // Verify durable client 1 received the updates held for it on the server
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Verify updates") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Get the listener and wait for the appropriate number of events
+        CacheServerTestUtil.ControlListener listener = (CacheServerTestUtil.ControlListener) region
+                .getAttributes().getCacheListeners()[0];
+        listener.waitWhileNotEnoughEvents(30000, numberOfEntries);
+        assertEquals(numberOfEntries, listener.events.size());
+      }
+    });
+    
+    // Verify durable client 2 received the updates held for it on the server
+    durableClient2VM.invoke(new CacheSerializableRunnable("Verify updates") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Get the listener and wait for the appropriate number of events
+        CacheServerTestUtil.ControlListener listener = (CacheServerTestUtil.ControlListener) region
+                .getAttributes().getCacheListeners()[0];
+        listener.waitWhileNotEnoughEvents(30000, numberOfEntries);
+        assertEquals(numberOfEntries, listener.events.size());
+      }
+    });
+    
+    // Stop durable client 1
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+
+    // Stop durable client 2
+    durableClient2VM.invoke(CacheServerTestUtil.class, "closeCache");
+
+    // Stop the publisher client
+    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    
+    // Stop the server
+    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+  }
+  
+  /**
+   * Tests whether a durable client reconnects properly to two servers.
+   */
+  public void testDurableClientReconnectTwoServers() {
+    // Start server 1
+    Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
+        "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+    
+    // on test flag for periodic ack
+    this.server1VM.invoke(DurableClientTestCase.class, "setTestFlagToVerifyActForMarker",
+        new Object[] { new Boolean(true) });
+    
+    final int server1Port = ports[0].intValue();
+    
+    // Start server 2 using the same mcast port as server 1
+    final int server2Port = ((Integer) this.server2VM.invoke(CacheServerTestUtil.class,
+        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+        .intValue();
+        
+    // Stop server 2
+    this.server2VM.invoke(CacheServerTestUtil.class, "closeCache");
+
+    // Start a durable client that is kept alive on the server when it stops
+    // normally
+    final String durableClientId = getName() + "_client";
+    final int durableClientTimeout = 60; // keep the client alive for 60 seconds
+    //final boolean durableClientKeepAlive = true; // keep the client alive when it stops normally
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(durableClientVM.getHost()), server1Port, server2Port, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE});
+
+    // Send clientReady message
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
+      public void run2() throws CacheException {
+        CacheServerTestUtil.getCache().readyForEvents();
+      }
+    });
+
+    // Have the durable client register interest in all keys
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Register interest") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Register interest in all keys
+        region.registerInterestRegex(".*", InterestResultPolicy.NONE,true);
+      }
+    });
+    
+    // Verify durable client on server 1
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        checkNumberOfClientProxies(1);
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+        
+        // Verify that it is durable and its properties are correct
+        assertTrue(proxy.isDurable());
+        assertEquals(durableClientId, proxy.getDurableId());
+        assertEquals(durableClientTimeout, proxy.getDurableTimeout());
+        verifyReceivedMarkerAck(proxy);
+      }
+    });
+
+    // VJR: wait for ack to go out
+    pause(5000);
+
+    // Stop the durable client
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache", new Object[] {new Boolean(true)});
+    
+    // Verify durable client on server 1
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        checkNumberOfClientProxies(1);
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+      }
+    });
+
+    // Re-start server2
+    this.server2VM.invoke(CacheServerTestUtil.class, "createCacheServer",
+        new Object[] { regionName, new Boolean(true),
+            new Integer(server2Port)});
+        
+    // Start normal publisher client
+    this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(publisherClientVM.getHost()), server1Port, server2Port, false), regionName});
+
+    // Publish some entries
+    final int numberOfEntries = 10;
+    this.publisherClientVM.invoke(new CacheSerializableRunnable("Register interest") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Publish some entries
+        for (int i=0; i<numberOfEntries; i++) {
+          String keyAndValue = String.valueOf(i);
+          region.put(keyAndValue, keyAndValue);
+        }
+      }
+    });
+
+    try {
+      java.lang.Thread.sleep(1000);
+    }
+    catch (java.lang.InterruptedException ex) {
+      fail("interrupted");
+    }
+
+    // Verify the durable client's queue contains the entries
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+        
+        // Verify the queue size
+        assertEquals(numberOfEntries, proxy.getQueueSize());
+      }
+    });
+
+    // Re-start the durable client that is kept alive on the server when it stops
+    // normally
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(durableClientVM.getHost()), server1Port, server2Port, true), regionName, getClientDistributedSystemProperties(durableClientId, durableClientTimeout), Boolean.TRUE});
+
+    // Send clientReady message
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
+      public void run2() throws CacheException {
+        CacheServerTestUtil.getCache().readyForEvents();
+      }
+    });
+
+    // Verify durable client on server 1
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        checkNumberOfClientProxies(1);
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+        
+        // Verify that it is durable and its properties are correct
+        assertTrue(proxy.isDurable());
+        assertEquals(durableClientId, proxy.getDurableId());
+        assertEquals(durableClientTimeout, proxy.getDurableTimeout());
+      }
+    });
+
+    // Verify durable client on server 2
+    this.server2VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        checkNumberOfClientProxies(1);
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+        
+        // Verify that it is durable and its properties are correct
+        assertTrue(proxy.isDurable());
+        assertEquals(durableClientId, proxy.getDurableId());
+        assertEquals(durableClientTimeout, proxy.getDurableTimeout());
+      }
+    });
+
+    // Verify the HA region names are the same on both servers
+    String server1HARegionQueueName= (String) this.server1VM.invoke(DurableClientTestCase.class, "getHARegionQueueName");
+    String server2HARegionQueueName= (String) this.server2VM.invoke(DurableClientTestCase.class, "getHARegionQueueName");
+    assertEquals(server1HARegionQueueName, server2HARegionQueueName);
+    
+    // Verify the durable client received the updates
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Verify updates") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Get the listener and wait for the appropriate number of events
+        CacheServerTestUtil.ControlListener listener = (CacheServerTestUtil.ControlListener) region
+                .getAttributes().getCacheListeners()[0];
+        listener.waitWhileNotEnoughEvents(30000, numberOfEntries);
+        assertEquals(numberOfEntries, listener.events.size());
+      }
+    });
+    
+    // Stop the durable client
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+
+    // Stop the publisher client
+    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+
+    // off test flag for periodic ack
+    this.server1VM.invoke(DurableClientTestCase.class, "setTestFlagToVerifyActForMarker",
+        new Object[] { new Boolean(false) });
+    
+    // Stop server 1
+    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    
+    // Stop server 2
+    this.server2VM.invoke(CacheServerTestUtil.class, "closeCache");
+  }
+  
+  public void testReadyForEventsNotCalledImplicitly() {
+    // Start a server
+    int serverPort = ((Integer) this.server1VM.invoke(CacheServerTestUtil.class,
+        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+        .intValue();
+
+    // Start a durable client that is not kept alive on the server when it
+    // stops normally
+    final String durableClientId = getName() + "_client";
+    // make the client use ClientCacheFactory so it will have a default pool
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "createClientCache", 
+        new Object[] {getClientPool(getServerHostName(durableClientVM.getHost()), serverPort, true), regionName, getClientDistributedSystemProperties(durableClientId)});
+
+    // verify that readyForEvents has not yet been called on the client's default pool
+    this.durableClientVM.invoke(new CacheSerializableRunnable("check readyForEvents not called") {
+      public void run2() throws CacheException {
+        for (Pool p: PoolManager.getAll().values()) {
+          assertEquals(false, ((PoolImpl)p).getReadyForEventsCalled());
+        }
+      }
+    });
+    
+    // Send clientReady message
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
+      public void run2() throws CacheException {
+        CacheServerTestUtil.getCache().readyForEvents();
+      }
+    });
+
+    // Verify durable clients on server
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Get the CacheClientNotifier
+        CacheClientNotifier notifier = getBridgeServer().getAcceptor()
+            .getCacheClientNotifier();
+        
+        // Iterate the CacheClientProxies and verify they are correct
+        checkNumberOfClientProxies(1);
+        boolean durableClient1Found=false, durableClient2Found=false;
+        for (Iterator i = notifier.getClientProxies().iterator(); i.hasNext();) {
+          CacheClientProxy proxy = (CacheClientProxy) i.next();
+          assertTrue(proxy.isDurable());
+          if (proxy.getDurableId().equals(durableClientId)) {
+            durableClient1Found = true;
+          }
+          assertEquals(DistributionConfig.DEFAULT_DURABLE_CLIENT_TIMEOUT, proxy.getDurableTimeout());
+        }
+        assertTrue(durableClient1Found);
+      }
+    });
+    
+    // Stop the durable clients
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+
+    // Stop the server
+    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+  }
+  
+  //This test method is disabled because it is failing
+  //periodically and causing cruise control failures
+  //See bug #47060
+  public void testReadyForEventsNotCalledImplicitlyWithCacheXML() {
+    final String cqName = "cqTest";
+    // Start a server
+    int serverPort = (Integer) this.server1VM.invoke(CacheServerTestUtil.class, "createCacheServerFromXml", new Object[]{ DurableClientTestCase.class.getResource("durablecq-server-cache.xml")});
+
+    // Start a durable client that is not kept alive on the server when it
+    // stops normally
+    final String durableClientId = getName() + "_client";
+    
+    //create client cache from xml
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClientFromXml", new Object[]{ DurableClientTestCase.class.getResource("durablecq-client-cache.xml"), "client", durableClientId, 45, Boolean.FALSE});
+
+    // verify that readyForEvents has not yet been called on all the client's pools
+    this.durableClientVM.invoke(new CacheSerializableRunnable("check readyForEvents not called") {
+      public void run2() throws CacheException {
+        for (Pool p: PoolManager.getAll().values()) {
+          assertEquals(false, ((PoolImpl)p).getReadyForEventsCalled());
+        }
+      }
+    });
+    
+    // Send clientReady message
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
+      public void run2() throws CacheException {
+        CacheServerTestUtil.getCache().readyForEvents();
+      }
+    });
+    
+    //Durable client registers durable cq on server
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Register Cq") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+        
+        // Create CQ Attributes.
+        CqAttributesFactory cqAf = new CqAttributesFactory();
+        
+        // Initialize and set CqListener.
+        CqListener[] cqListeners = { new CacheServerTestUtil.ControlCqListener() };
+        cqAf.initCqListeners(cqListeners);
+        CqAttributes cqa = cqAf.create();
+
+        // Create cq's
+        // Get the query service for the Pool
+        QueryService queryService = CacheServerTestUtil.getPool().getQueryService();
+
+        try { 
+          CqQuery query = queryService.newCq(cqName , "Select * from /" + regionName, cqa, true);
+          query.execute();
+        }
+        catch (CqExistsException e) {
+          fail("Failed due to " + e);
+        }
+        catch (CqException e) {
+          fail("Failed due to " + e);
+        }
+        catch (RegionNotFoundException e) {
+          fail("Could not find specified region:" + regionName + ":" + e);
+        }
+      }
+    });
+
+    // Verify durable client on server1
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        checkNumberOfClientProxies(1);
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+
+        // Verify that it is durable
+        assertTrue(proxy.isDurable());
+        assertEquals(durableClientId, proxy.getDurableId());
+      }
+    });
+    
+    // Start normal publisher client
+    this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName});
+
+    // Publish some entries
+    final int numberOfEntries = 10;
+    this.publisherClientVM.invoke(new CacheSerializableRunnable("publish updates") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Publish some entries
+        for (int i=0; i<numberOfEntries; i++) {
+          String keyAndValue = String.valueOf(i);
+          region.put(keyAndValue, keyAndValue);
+        }
+      }
+    });
+    
+    // Verify the durable client received the updates
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Verify updates") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+        
+        // Get the listener and wait for the appropriate number of events
+        QueryService queryService = CacheServerTestUtil.getPool().getQueryService();
+        CqQuery cqQuery = queryService.getCq(cqName);
+        CacheServerTestUtil.ControlCqListener cqlistener = (CacheServerTestUtil.ControlCqListener) cqQuery.getCqAttributes().getCqListener();
+        cqlistener.waitWhileNotEnoughEvents(30000, numberOfEntries);
+        assertEquals(numberOfEntries, cqlistener.events.size());
+      }
+    });
+    
+     try {
+      Thread.sleep(10000);
+    }
+    catch (InterruptedException e) {
+      fail("interrupted" + e);
+    }
+    
+    // Stop the durable client
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache", new Object[] {new Boolean(true)});
+    
+    // Verify the durable client still exists on the server
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+      }
+    });
+
+    // Publish some more entries
+    this.publisherClientVM.invoke(new CacheSerializableRunnable("Publish additional updates") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Publish some entries
+        for (int i=0; i<numberOfEntries; i++) {
+          String keyAndValue = String.valueOf(i);
+          region.put(keyAndValue, keyAndValue + "lkj");
+        }
+      }
+    });
+    
+    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    
+    // Re-start the durable client
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClientFromXml", new Object[]{ DurableClientTestCase.class.getResource("durablecq-client-cache.xml"), "client", durableClientId, 45,  Boolean.FALSE});
+
+    
+    //Durable client registers durable cq on server
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Register cq") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Create CQ Attributes.
+        CqAttributesFactory cqAf = new CqAttributesFactory();
+        
+        // Initialize and set CqListener.
+        CqListener[] cqListeners = { new CacheServerTestUtil.ControlCqListener() };
+        cqAf.initCqListeners(cqListeners);
+        CqAttributes cqa = cqAf.create();
+
+        // Create cq's
+        // Get the query service for the Pool
+        QueryService queryService = CacheServerTestUtil.getPool().getQueryService();
+
+        try { 
+          CqQuery query = queryService.newCq(cqName , "Select * from /" + regionName, cqa, true);
+          query.execute();
+        }
+        catch (CqExistsException e) {
+          fail("Failed due to " + e);
+        }
+        catch (CqException e) {
+          fail("Failed due to " + e);
+        }
+        catch (RegionNotFoundException e) {
+          fail("Could not find specified region:" + regionName + ":" + e);
+        }
+       
+      }
+    });
+    
+    // Send clientReady message
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
+      public void run2() throws CacheException {
+        CacheServerTestUtil.getCache().readyForEvents();
+      }
+    });
+
+    // Verify durable client on server
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        checkNumberOfClientProxies(1);
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+        
+        // Verify that it is durable and its properties are correct
+        assertTrue(proxy.isDurable());
+        assertEquals(durableClientId, proxy.getDurableId());
+      }
+    });
+        
+    // Verify the durable client received the updates held for it on the server
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Verify updates") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        QueryService queryService = CacheServerTestUtil.getPool().getQueryService();
+
+        CqQuery cqQuery = queryService.getCq(cqName);
+        
+        CacheServerTestUtil.ControlCqListener cqlistener = (CacheServerTestUtil.ControlCqListener) cqQuery.getCqAttributes().getCqListener();
+        cqlistener.waitWhileNotEnoughEvents(30000, numberOfEntries);
+        assertEquals(numberOfEntries, cqlistener.events.size());
+      }
+    });
+    
+    // Stop the durable client
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+
+    // Stop the server
+    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+  }
+  
+  public void testReadyForEventsNotCalledImplicitlyForRegisterInterestWithCacheXML() {
+    final String cqName = "cqTest";
+    regionName = "testReadyForEventsNotCalledImplicitlyWithCacheXML_region";
+    // Start a server
+    int serverPort = (Integer) this.server1VM.invoke(CacheServerTestUtil.class, "createCacheServerFromXmlN", new Object[]{ DurableClientTestCase.class.getResource("durablecq-server-cache.xml")});
+
+    // Start a durable client that is not kept alive on the server when it
+    // stops normally
+    final String durableClientId = getName() + "_client";
+    
+    //create client cache from xml
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClientFromXmlN", new Object[]{ DurableClientTestCase.class.getResource("durablecq-client-cache.xml"), "client", durableClientId, 45, Boolean.TRUE});
+
+    // verify that readyForEvents has not yet been called on all the client's pools
+    this.durableClientVM.invoke(new CacheSerializableRunnable("check readyForEvents not called") {
+      public void run2() throws CacheException {
+        for (Pool p: PoolManager.getAll().values()) {
+          assertEquals(false, ((PoolImpl)p).getReadyForEventsCalled());
+        }
+      }
+    });
+
+    // Send clientReady message
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
+      public void run2() throws CacheException {
+        CacheServerTestUtil.getCache().readyForEvents();
+      }
+    });
+    
+    //Durable client registers durable cq on server
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Register Interest") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+        
+        // Register interest in all keys
+        region.registerInterestRegex(".*", InterestResultPolicy.KEYS_VALUES, true);
+      }
+    });
+
+    // Verify durable client on server1
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        checkNumberOfClientProxies(1);
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+
+        // Verify that it is durable
+        assertTrue(proxy.isDurable());
+        assertEquals(durableClientId, proxy.getDurableId());
+      }
+    });
+    
+    // Start normal publisher client
+    this.publisherClientVM.invoke(CacheServerTestUtil.class, "createCacheClient", 
+        new Object[] {getClientPool(getServerHostName(publisherClientVM.getHost()), serverPort, false), regionName});
+
+    // Publish some entries
+    final int numberOfEntries = 10;
+    this.publisherClientVM.invoke(new CacheSerializableRunnable("publish updates") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Publish some entries
+        for (int i=0; i<numberOfEntries; i++) {
+          String keyAndValue = String.valueOf(i);
+          region.put(keyAndValue, keyAndValue);
+        }
+      }
+    });
+    
+    // Verify the durable client received the updates
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Verify updates") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+        
+        // Get the listener and wait for the appropriate number of events
+        CacheServerTestUtil.ControlListener listener = (CacheServerTestUtil.ControlListener) region
+                .getAttributes().getCacheListeners()[0];
+        listener.waitWhileNotEnoughEvents(30000, numberOfEntries);
+        assertEquals(numberOfEntries, listener.events.size());
+      }
+    });
+    try {
+      Thread.sleep(10000);
+    }
+    catch (InterruptedException e) {
+      fail("interrupted" + e);
+    }
+    // Stop the durable client
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache", new Object[] {new Boolean(true)});
+    
+    // Verify the durable client still exists on the server
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+      }
+    });
+
+    // Publish some more entries
+    this.publisherClientVM.invoke(new CacheSerializableRunnable("Publish additional updates") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Publish some entries
+        for (int i=0; i<numberOfEntries; i++) {
+          String keyAndValue = String.valueOf(i);
+          region.put(keyAndValue, keyAndValue + "lkj");
+        }
+      }
+    });
+    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+    
+    // Re-start the durable client
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "createCacheClientFromXmlN", new Object[]{ DurableClientTestCase.class.getResource("durablecq-client-cache.xml"), "client", durableClientId, 45,  Boolean.TRUE});
+
+    
+    //Durable client registers durable cq on server
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Register interest") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+
+        // Register interest in all keys
+        region.registerInterestRegex(".*", InterestResultPolicy.KEYS_VALUES, true);
+      }
+    });
+    
+    // Send clientReady message
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Send clientReady") {
+      public void run2() throws CacheException {
+        CacheServerTestUtil.getCache().readyForEvents();
+      }
+    });
+
+    // Verify durable client on server
+    this.server1VM.invoke(new CacheSerializableRunnable("Verify durable client") {
+      public void run2() throws CacheException {
+        // Find the proxy
+        checkNumberOfClientProxies(1);
+        CacheClientProxy proxy = getClientProxy();
+        assertNotNull(proxy);
+        
+        // Verify that it is durable and its properties are correct
+        assertTrue(proxy.isDurable());
+        assertEquals(durableClientId, proxy.getDurableId());
+      }
+    });
+        
+    // Verify the durable client received the updates held for it on the server
+    this.durableClientVM.invoke(new CacheSerializableRunnable("Verify updates") {
+      public void run2() throws CacheException {
+        // Get the region
+        Region region = CacheServerTestUtil.getCache().getRegion(regionName);
+        assertNotNull(region);
+        
+        // Get the listener and wait for the appropriate number of events
+        CacheServerTestUtil.ControlListener listener = (CacheServerTestUtil.ControlListener) region
+                .getAttributes().getCacheListeners()[0];
+        listener.waitWhileNotEnoughEvents(30000, numberOfEntries);
+        assertEquals(numberOfEntries, listener.events.size());
+      }
+    });
+    
+    // Stop the durable client
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+
+    // Stop the server
+    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+  }
+  
+  /**
+   * Tests the ha queued events stat
+   * Connects a durable client, registers durable cqs and then shuts down the durable client
+   * Publisher then does puts onto the server
+   * Events are queued up and the stats are checked
+   * Durable client is then reconnected, events are dispatched and stats are rechecked
+   */
+  public void testHAQueueSizeStat() throws Exception {
+    String greaterThan5Query = "select * from /" + regionName + " p where p.ID > 5";
+    String allQuery = "select * from /" + regionName + " p where p.ID > -1";
+    String lessThan5Query = "select * from /" + regionName + " p where p.ID < 5";
+        
+    // Start server 1
+    Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
+        "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+    final int serverPort = ports[0].intValue();
+    
+    final String durableClientId = getName() + "_client";
+  
+    startDurableClient(durableClientVM, durableClientId, serverPort, regionName);
+    //register durable cqs
+    createCq(durableClientVM, "GreaterThan5", greaterThan5Query, true);
+    createCq(durableClientVM, "All", allQuery, true);
+    createCq(durableClientVM, "LessThan5", lessThan5Query, true);
+    //send client ready
+    sendClientReady(durableClientVM);
+      
+    // Verify durable client on server
+    verifyDurableClientOnServer(server1VM, durableClientId);
+          
+    // Stop the durable client
+    this.disconnectDurableClient(true);
+    
+    // Start normal publisher client
+    startClient(publisherClientVM, serverPort, regionName);
+
+    // Publish some entries
+    publishEntries(publisherClientVM, regionName, 10);
+     
+    //verify cq stats are correct
+    checkNumDurableCqs(server1VM, durableClientId, 3);
+    checkHAQueueSize(server1VM, durableClientId, 10, 11);
+
+    //Restart the durable client
+    startDurableClient(durableClientVM, durableClientId, serverPort, regionName);
+  
+    //Reregister durable cqs
+    createCq(durableClientVM, "GreaterThan5", "select * from /" + regionName + " p where p.ID > 5", true);
+    createCq(durableClientVM, "All", "select * from /" + regionName + " p where p.ID > -1", true);
+    createCq(durableClientVM, "LessThan5", "select * from /" + regionName + " p where p.ID < 5", true);
+    //send client ready
+    sendClientReady(durableClientVM);
+  
+    checkCqListenerEvents(durableClientVM, "GreaterThan5", 4 /*numEventsExpected*/, 4/*numEventsToWaitFor*/, 15/*secondsToWait*/);
+    checkCqListenerEvents(durableClientVM, "LessThan5", 5 /*numEventsExpected*/, 5/*numEventsToWaitFor*/, 15/*secondsToWait*/);
+    checkCqListenerEvents(durableClientVM, "All", 10 /*numEventsExpected*/, 10/*numEventsToWaitFor*/, 15/*secondsToWait*/);
+    
+    //Due to the implementation of DurableHARegionQueue where remove is called after dispatch.
+    //This can cause events to linger in the queue due to a "later" ack and only cleared on
+    //the next dispatch.  We need to send one more message to dispatch, that calls remove one more
+    //time and any remaining acks (with or without this final published events ack)
+    flushEntries(server1VM, durableClientVM, regionName);
+    checkHAQueueSize(server1VM, durableClientId, 0, 1);
+        
+    // Stop the durable client
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+
+    // Stop the publisher client
+    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+
+    // Stop the server
+    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+  }
+  
+
+  /**
+   * Tests the ha queued events stat
+   * Connects a durable client, registers durable cqs and then shuts down the durable client
+   * Publisher then does puts onto the server
+   * Events are queued up and the stats are checked
+   * Test sleeps until durable client times out
+   * Stats should now be 0
+   * Durable client is then reconnected, no events should exist and stats are rechecked
+   */
+  public void testHAQueueSizeStatExpired() throws Exception {
+    int timeoutInSeconds = 20;
+    String greaterThan5Query = "select * from /" + regionName + " p where p.ID > 5";
+    String allQuery = "select * from /" + regionName + " p where p.ID > -1";
+    String lessThan5Query = "select * from /" + regionName + " p where p.ID < 5";
+        
+    // Start server 1
+    Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
+        "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+    final int serverPort = ports[0].intValue();
+    final int mcastPort = ports[1].intValue();
+    
+    final String durableClientId = getName() + "_client";
+  
+    startDurableClient(durableClientVM, durableClientId, serverPort, regionName, timeoutInSeconds);
+    //register durable cqs
+    createCq(durableClientVM, "GreaterThan5", greaterThan5Query, true);
+    createCq(durableClientVM, "All", allQuery, true);
+    createCq(durableClientVM, "LessThan5", lessThan5Query, true);
+    //send client ready
+    sendClientReady(durableClientVM);
+      
+    // Verify durable client on server
+    verifyDurableClientOnServer(server1VM, durableClientId);
+          
+    // Stop the durable client
+    this.disconnectDurableClient(true);
+    
+    // Start normal publisher client
+    startClient(publisherClientVM, serverPort, regionName);
+
+    // Publish some entries
+    publishEntries(publisherClientVM, regionName, 10);
+     
+    //verify cq stats are correct
+    checkNumDurableCqs(server1VM, durableClientId, 3);
+    checkHAQueueSize(server1VM, durableClientId, 10, 11);
+
+    //pause until timeout
+    try {
+      Thread.sleep((timeoutInSeconds + 2) * 1000);
+    }
+    catch (InterruptedException ie) {
+      Thread.currentThread().interrupt();
+    }
+    //Restart the durable client
+    startDurableClient(durableClientVM, durableClientId, serverPort, regionName);
+  
+    //Reregister durable cqs
+    createCq(durableClientVM, "GreaterThan5", "select * from /" + regionName + " p where p.ID > 5", true);
+    createCq(durableClientVM, "All", "select * from /" + regionName + " p where p.ID > -1", true);
+    createCq(durableClientVM, "LessThan5", "select * from /" + regionName + " p where p.ID < 5", true);
+    //send client ready
+    sendClientReady(durableClientVM);
+  
+    checkCqListenerEvents(durableClientVM, "GreaterThan5", 0 /*numEventsExpected*/, 1/*numEventsToWaitFor*/, 5/*secondsToWait*/);
+    checkCqListenerEvents(durableClientVM, "LessThan5", 0 /*numEventsExpected*/, 1/*numEventsToWaitFor*/, 5/*secondsToWait*/);
+    checkCqListenerEvents(durableClientVM, "All", 0 /*numEventsExpected*/, 1/*numEventsToWaitFor*/, 5/*secondsToWait*/);
+    
+    //Due to the implementation of DurableHARegionQueue where remove is called after dispatch.
+    //This can cause events to linger in the queue due to a "later" ack and only cleared on
+    //the next dispatch.  We need to send one more message to dispatch, that calls remove one more
+    //time and any remaining acks (with or without this final published events ack)
+    flushEntries(server1VM, durableClientVM, regionName);
+    checkHAQueueSize(server1VM, durableClientId, 0, 1);
+
+    // Stop the durable client
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+
+    // Stop the publisher client
+    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+
+    // Stop the server
+    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+  }
+  
+  /**
+   * Tests the ha queued events stat
+   * Starts up two servers, shuts one down
+   * Connects a durable client, registers durable cqs and then shuts down the durable client
+   * Publisher then does puts onto the server
+   * Events are queued up
+   * Durable client is then reconnected but does not send ready for events
+   * Secondary server is brought back up
+   * Stats are checked
+   * Durable client then reregisters cqs and sends ready for events
+   */
+  public void testHAQueueSizeStatForGII() throws Exception {
+    String greaterThan5Query = "select * from /" + regionName + " p where p.ID > 5";
+    String allQuery = "select * from /" + regionName + " p where p.ID > -1";
+    String lessThan5Query = "select * from /" + regionName + " p where p.ID < 5";
+        
+    // Start server 1
+    Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
+        "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+    final int serverPort = ports[0].intValue();
+    
+    // Start server 2 using the same mcast port as server 1
+    final int serverPort2 = ((Integer) this.server2VM.invoke(CacheServerTestUtil.class,
+        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+        .intValue();
+  
+    //shut down server 2
+    closeCache(server2VM);
+    
+    final String durableClientId = getName() + "_client";
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "disableShufflingOfEndpoints");
+  
+    startDurableClient(durableClientVM, durableClientId, serverPort, serverPort2, regionName);
+  
+    //register durable cqs
+    createCq(durableClientVM, "GreaterThan5", greaterThan5Query, true);
+    createCq(durableClientVM, "All", allQuery, true);
+    createCq(durableClientVM, "LessThan5", lessThan5Query, true);
+    //send client ready
+    sendClientReady(durableClientVM);
+      
+    verifyDurableClientOnServer(server1VM, durableClientId);
+    checkNumDurableCqs(server1VM, durableClientId, 3);
+
+    // Stop the durable client
+    this.disconnectDurableClient(true);
+
+    // Start normal publisher client
+    startClient(publisherClientVM, serverPort, regionName);
+  
+    // Publish some entries
+    publishEntries(publisherClientVM, regionName, 10);
+    
+    // Restart the durable client
+    startDurableClient(durableClientVM, durableClientId, serverPort, serverPort2, regionName);
+    
+    // Re-start server2, at this point it will be the first time server2 has connected to client
+    this.server2VM.invoke(CacheServerTestUtil.class, "createCacheServer",
+        new Object[] { regionName, new Boolean(true),
+            new Integer(serverPort2)});
+    
+    // Verify durable client on server2
+    verifyDurableClientOnServer(server2VM, durableClientId);
+    
+    //verify cqs and stats on server 2.  These events are through gii, stats should be correct
+    checkNumDurableCqs(server2VM, durableClientId, 3);
+    checkHAQueueSize(server2VM, durableClientId, 10, 11);
+    
+    closeCache(server1VM);
+    
+    //Reregister durable cqs
+    createCq(durableClientVM, "GreaterThan5", "select * from /" + regionName + " p where p.ID > 5", true);
+    createCq(durableClientVM, "All", "select * from /" + regionName + " p where p.ID > -1", true);
+    createCq(durableClientVM, "LessThan5", "select * from /" + regionName + " p where p.ID < 5", true);
+    //send client ready
+    sendClientReady(durableClientVM);
+    
+    //verify cq listeners received events
+    checkCqListenerEvents(durableClientVM, "GreaterThan5", 4 /*numEventsExpected*/, 4/*numEventsToWaitFor*/, 15/*secondsToWait*/);
+    checkCqListenerEvents(durableClientVM, "LessThan5", 5 /*numEventsExpected*/, 5/*numEventsToWaitFor*/, 15/*secondsToWait*/);
+    checkCqListenerEvents(durableClientVM, "All", 10 /*numEventsExpected*/, 10/*numEventsToWaitFor*/, 15/*secondsToWait*/);
+    
+    //Verify stats are 0 for server2 (we failed over)
+    flushEntries(server2VM, durableClientVM, regionName);
+    checkHAQueueSize(server2VM, durableClientId, 0, 1);
+    
+    checkCqStatOnServer(server2VM, durableClientId, "LessThan5", 0);
+    checkCqStatOnServer(server2VM, durableClientId, "GreaterThan5", 0);
+    checkCqStatOnServer(server2VM, durableClientId, "All", 0);
+
+    // Stop the durable client
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+
+    // Stop the publisher client
+    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+
+    // Stop the servers
+    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+    this.server2VM.invoke(CacheServerTestUtil.class, "closeCache");
+  }
+  
+  /**
+   * Tests the ha queued cq stat
+   */
+  public void testHAQueuedCqStat() throws Exception {
+    String greaterThan5Query = "select * from /" + regionName + " p where p.ID > 5";
+    String allQuery = "select * from /" + regionName + " p where p.ID > -1";
+    String lessThan5Query = "select * from /" + regionName + " p where p.ID < 5";
+        
+    // Start server 1
+    Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
+        "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+    final int serverPort = ports[0].intValue();
+    final int mcastPort = ports[1].intValue();
+    
+    final String durableClientId = getName() + "_client";
+  
+    startDurableClient(durableClientVM, durableClientId, serverPort, regionName);
+    //register durable cqs
+    createCq(durableClientVM, "GreaterThan5", greaterThan5Query, true);
+    createCq(durableClientVM, "All", allQuery, true);
+    createCq(durableClientVM, "LessThan5", lessThan5Query, true);
+    //send client ready
+    sendClientReady(durableClientVM);
+      
+    // Verify durable client on server
+    verifyDurableClientOnServer(server1VM, durableClientId);
+          
+    // Stop the durable client
+    this.disconnectDurableClient(true);
+    
+    // Start normal publisher client
+    startClient(publisherClientVM, serverPort, regionName);
+
+    // Publish some entries
+    publishEntries(publisherClientVM, regionName, 10);
+     
+    //verify cq stats are correct
+    checkNumDurableCqs(server1VM, durableClientId, 3);
+    checkCqStatOnServer(server1VM, durableClientId, "All", 10);
+    checkCqStatOnServer(server1VM, durableClientId, "GreaterThan5", 4);
+    checkCqStatOnServer(server1VM, durableClientId, "LessThan5", 5);
+
+    //Restart the durable client
+    startDurableClient(durableClientVM, durableClientId, serverPort, regionName);
+  
+    //Reregister durable cqs
+    createCq(durableClientVM, "GreaterThan5", "select * from /" + regionName + " p where p.ID > 5", true);
+    createCq(durableClientVM, "All", "select * from /" + regionName + " p where p.ID > -1", true);
+    createCq(durableClientVM, "LessThan5", "select * from /" + regionName + " p where p.ID < 5", true);
+    //send client ready
+    sendClientReady(durableClientVM);
+  
+    checkCqListenerEvents(durableClientVM, "GreaterThan5", 4 /*numEventsExpected*/, 4/*numEventsToWaitFor*/, 15/*secondsToWait*/);
+    checkCqListenerEvents(durableClientVM, "LessThan5", 5 /*numEventsExpected*/, 5/*numEventsToWaitFor*/, 15/*secondsToWait*/);
+    checkCqListenerEvents(durableClientVM, "All", 10 /*numEventsExpected*/, 10/*numEventsToWaitFor*/, 15/*secondsToWait*/);
+    
+
+    //Due to the implementation of DurableHARegionQueue where remove is called after dispatch.
+    //This can cause events to linger in the queue due to a "later" ack and only cleared on
+    //the next dispatch.  We need to send one more message to dispatch, that calls remove one more
+    //time and any remaining acks (with or without this final published events ack)
+    flushEntries(server1VM, durableClientVM, regionName);
+    
+    checkCqStatOnServer(server1VM, durableClientId, "LessThan5", 0);
+    checkCqStatOnServer(server1VM, durableClientId, "GreaterThan5", 0);
+    checkCqStatOnServer(server1VM, durableClientId, "All", 0);
+        
+    // Stop the durable client
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+
+    // Stop the publisher client
+    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+
+    // Stop the server
+    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+  }
+  /**
+   * @throws Exception
+   */
+  public void testHAQueuedCqStatOnSecondary() throws Exception {
+    String greaterThan5Query = "select * from /" + regionName + " p where p.ID > 5";
+    String allQuery = "select * from /" + regionName + " p where p.ID > -1";
+    String lessThan5Query = "select * from /" + regionName + " p where p.ID < 5";
+        
+    // Start server 1
+    Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
+        "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+    final int serverPort = ports[0].intValue();
+    
+    // Start server 2 using the same mcast port as server 1
+    final int serverPort2 = ((Integer) this.server2VM.invoke(CacheServerTestUtil.class,
+        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+        .intValue();
+    
+    final String durableClientId = getName() + "_client";
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "disableShufflingOfEndpoints");
+  
+    startDurableClient(durableClientVM, durableClientId, serverPort, serverPort2, regionName);
+  
+    //register durable cqs
+    createCq(durableClientVM, "GreaterThan5", greaterThan5Query, true);
+    createCq(durableClientVM, "All", allQuery, true);
+    createCq(durableClientVM, "LessThan5", lessThan5Query, true);
+    //send client ready
+    sendClientReady(durableClientVM);
+      
+    //Verify durable client on server 2
+    verifyDurableClientOnServer(server2VM, durableClientId);
+    
+    //Verify durable client on server
+    verifyDurableClientOnServer(server1VM, durableClientId);
+  
+    //Stop the durable client
+    this.disconnectDurableClient(true);
+    
+    // Start normal publisher client
+    startClient(publisherClientVM, serverPort, regionName);
+  
+    // Publish some entries
+    publishEntries(publisherClientVM, regionName, 10);
+       
+    //verify cq stats are correct on both servers
+    checkNumDurableCqs(server1VM, durableClientId, 3);
+    checkCqStatOnServer(server1VM, durableClientId, "All", 10);
+    checkCqStatOnServer(server1VM, durableClientId, "GreaterThan5", 4);
+    checkCqStatOnServer(server1VM, durableClientId, "LessThan5", 5);
+    
+    //verify cq stats are correct
+    checkNumDurableCqs(server2VM, durableClientId, 3);
+    checkCqStatOnServer(server2VM, durableClientId, "All", 10);
+    checkCqStatOnServer(server2VM, durableClientId, "GreaterThan5", 4);
+    checkCqStatOnServer(server2VM, durableClientId, "LessThan5", 5);
+      
+    //Restart the durable client
+    startDurableClient(durableClientVM, durableClientId, serverPort, serverPort2, regionName);
+    
+    //Reregister durable cqs
+    createCq(durableClientVM, "GreaterThan5", "select * from /" + regionName + " p where p.ID > 5", true);
+    createCq(durableClientVM, "All", "select * from /" + regionName + " p where p.ID > -1", true);
+    createCq(durableClientVM, "LessThan5", "select * from /" + regionName + " p where p.ID < 5", true);
+    //send client ready
+    sendClientReady(durableClientVM);
+      
+    checkCqListenerEvents(durableClientVM, "GreaterThan5", 4 /*numEventsExpected*/, 4/*numEventsToWaitFor*/, 15/*secondsToWait*/);
+    checkCqListenerEvents(durableClientVM, "LessThan5", 5 /*numEventsExpected*/, 5/*numEventsToWaitFor*/, 15/*secondsToWait*/);
+    checkCqListenerEvents(durableClientVM, "All", 10 /*numEventsExpected*/, 10/*numEventsToWaitFor*/, 15/*secondsToWait*/);
+    
+    //Verify stats are 0 for both servers
+    flushEntries(server1VM, durableClientVM, regionName);
+    
+    checkCqStatOnServer(server1VM, durableClientId, "LessThan5", 0);
+    checkCqStatOnServer(server1VM, durableClientId, "GreaterThan5", 0);
+    checkCqStatOnServer(server1VM, durableClientId, "All", 0);
+    checkCqStatOnServer(server2VM, durableClientId, "LessThan5", 0);
+    checkCqStatOnServer(server2VM, durableClientId, "GreaterThan5", 0);
+    checkCqStatOnServer(server2VM, durableClientId, "All", 0);
+        
+    // Stop the durable client
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+
+    // Stop the publisher client
+    this.publisherClientVM.invoke(CacheServerTestUtil.class, "closeCache");
+
+    // Stop the server
+    this.server1VM.invoke(CacheServerTestUtil.class, "closeCache");
+  }
+  
+  
+  /**
+   * Server 2 comes up, client connects and registers cqs, server 2 then disconnects
+   * events are put into region
+   * client goes away
+   * server 2 comes back up and should get a gii
+   * check stats
+   * server 1 goes away
+   * client comes back and receives all events
+   * stats should still be correct
+   * 
+   * @throws Exception
+   */
+  public void testHAQueuedCqStatForGII() throws Exception {
+    String greaterThan5Query = "select * from /" + regionName + " p where p.ID > 5";
+    String allQuery = "select * from /" + regionName + " p where p.ID > -1";
+    String lessThan5Query = "select * from /" + regionName + " p where p.ID < 5";
+        
+    // Start server 1
+    Integer[] ports = ((Integer[]) this.server1VM.invoke(CacheServerTestUtil.class,
+        "createCacheServerReturnPorts", new Object[] {regionName, new Boolean(true)}));
+    final int serverPort = ports[0].intValue();
+    
+    // Start server 2 using the same mcast port as server 1
+    final int serverPort2 = ((Integer) this.server2VM.invoke(CacheServerTestUtil.class,
+        "createCacheServer", new Object[] {regionName, new Boolean(true)}))
+        .intValue();
+  
+    // Start a durable client that is kept alive on the server when it stops
+    // normally
+    final String durableClientId = getName() + "_client";
+    this.durableClientVM.invoke(CacheServerTestUtil.class, "disableShufflingOfEndpoints");
+  
+    startDurableClient(durableClientVM, durableClientId, serverPort, serverPort2, regionName);
+  
+    //register durable cqs
+    createCq(durableClientVM, "GreaterThan5", greaterThan5Query, true);
+    createCq(durable

<TRUNCATED>

[02/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java
new file mode 100644
index 0000000..ddf4901
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java
@@ -0,0 +1,431 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.wan.serial;
+
+
+import com.gemstone.gemfire.CancelException;
+import com.gemstone.gemfire.cache.CacheClosedException;
+import com.gemstone.gemfire.internal.cache.ForceReattemptException;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+
+import dunit.AsyncInvocation;
+
+public class SerialWANPropogation_PartitionedRegionDUnitTest extends WANTestBase {
+
+  private static final long serialVersionUID = 1L;
+
+  public SerialWANPropogation_PartitionedRegionDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+  }
+  
+  
+  public void testPartitionedSerialPropagation() throws Exception {
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    //vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+        1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 1000 });
+  }
+
+  public void testBothReplicatedAndPartitionedSerialPropagation()
+      throws Exception {
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+    vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+        1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 1000 });
+  }
+
+  public void testSerialReplicatedAndPartitionedPropagation() throws Exception {
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial",
+        2, false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial",
+        2, false, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "lnSerial", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "lnSerial", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "lnSerial", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "lnSerial", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "lnSerial", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "lnSerial", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "lnSerial", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "lnSerial", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+    vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+        1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 1000 });
+  }
+
+  public void testSerialReplicatedAndSerialPartitionedPropagation()
+      throws Exception {
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial1",
+        2, false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial1",
+        2, false, 100, 10, false, false, null, true });
+
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial2",
+        2, false, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial2",
+        2, false, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "lnSerial1", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "lnSerial1", isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "lnSerial1", isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "lnSerial1", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "lnSerial2", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "lnSerial2", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "lnSerial2", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "lnSerial2", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial1" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial1" });
+
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial2" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial2" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+    vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+        1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 1000 });
+  }
+  
+  public void testPartitionedSerialPropagationToTwoWanSites() throws Exception {
+
+    Integer lnPort = createFirstLocatorWithDSId(1);
+    Integer nyPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] {2, lnPort });
+    Integer tkPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] {3,lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver",
+        new Object[] {nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver",
+        new Object[] {tkPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial1",
+        2, false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial1",
+        2, false, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial2",
+        3, false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial2",
+        3, false, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial1" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial1" });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial2" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial2" });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "lnSerial1,lnSerial2", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "lnSerial1,lnSerial2", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "lnSerial1,lnSerial2", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "lnSerial1,lnSerial2", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+        1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 1000 });
+  }
+
+  public void testPartitionedSerialPropagationHA() throws Exception {
+    addExpectedException("Broken pipe");
+    addExpectedException("Connection reset");
+    addExpectedException("Unexpected IOException");
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    //do initial 100 puts to create all the buckets
+    vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 100 });
+    
+    addExpectedException(CancelException.class.getName());
+    addExpectedException(CacheClosedException.class.getName());
+    addExpectedException(ForceReattemptException.class.getName());
+    //start async puts
+    AsyncInvocation inv = vm5.invokeAsync(WANTestBase.class, "doPuts",
+        new Object[] { testName + "_PR", 1000 });
+    //close the cache on vm4 in between the puts
+    vm4.invoke(WANTestBase.class, "killSender", new Object[] {});
+
+    inv.join();
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 1000 });
+  }
+
+  public void testPartitionedSerialPropagationWithParallelThreads()
+      throws Exception {
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "doMultiThreadedPuts", new Object[] {
+        testName + "_PR", 1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 1000 });
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationsFeatureDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationsFeatureDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationsFeatureDUnitTest.java
new file mode 100644
index 0000000..d0b984d
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationsFeatureDUnitTest.java
@@ -0,0 +1,364 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.wan.serial;
+
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase.MyGatewayEventFilter;
+
+
+public class SerialWANPropogationsFeatureDUnitTest extends WANTestBase{
+
+  private static final long serialVersionUID = 1L;
+
+  public SerialWANPropogationsFeatureDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+  }
+  
+  public void testSerialReplicatedWanWithOverflow() {
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, "createFirstLocatorWithDSId",
+        new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver",
+        new Object[] {nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver",
+        new Object[] {nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "doHeavyPuts", new Object[] {
+        testName + "_RR", 120 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 120 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 120 });
+  }
+
+  public void testSerialReplicatedWanWithPersistence() {
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, true, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+
+  }
+
+  public void testReplicatedSerialPropagationWithConflation() throws Exception {
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 1000, true, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 1000, true, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+  }
+  
+  public void testReplicatedSerialPropagationWithParallelThreads()
+      throws Exception {
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "doMultiThreadedPuts", new Object[] {
+        testName + "_RR", 1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+  }
+  
+  public void testSerialPropogationWithFilter() throws Exception {
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, "createFirstLocatorWithDSId",
+        new Object[] {1});
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] {2,lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false,
+        new MyGatewayEventFilter(), true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false,
+        new MyGatewayEventFilter(), true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 800 });
+  }
+
+  public void testReplicatedSerialPropagationWithFilter() throws Exception {
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false,
+        new MyGatewayEventFilter(), true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false,
+        new MyGatewayEventFilter(), true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName, null, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName, null, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName, "ln", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName, "ln", isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName, "ln", isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName, "ln", isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 800 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 800 });
+  }
+  
+  public void testReplicatedSerialPropagationWithFilter_AfterAck()
+      throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm6.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm7.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm2.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender",
+        new Object[] { "ln", 2, false, 100, 10, false, false,
+            new MyGatewayEventFilter_AfterAck(), true });
+    vm5.invoke(WANTestBase.class, "createSender",
+        new Object[] { "ln", 2, false, 100, 10, false, false,
+            new MyGatewayEventFilter_AfterAck(), true });
+
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName, null, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName, null, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName, "ln", isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName, "ln", isOffHeap() });
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName, "ln", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName, "ln", isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 1000 });
+
+    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
+        0 });
+    vm5.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln",
+        0 });
+
+    Integer vm4Acks = (Integer)vm4.invoke(WANTestBase.class,
+        "validateAfterAck", new Object[] { "ln"});
+    Integer vm5Acks = (Integer)vm5.invoke(WANTestBase.class,
+        "validateAfterAck", new Object[] { "ln"});
+
+    assertEquals(2000, (vm4Acks + vm5Acks));
+
+    vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 1000 });
+    vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 1000 });
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
new file mode 100644
index 0000000..dff58bf
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
@@ -0,0 +1,588 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.wan.serial;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase.MyGatewayEventFilter;
+
+import dunit.AsyncInvocation;
+
+public class SerialWANStatsDUnitTest extends WANTestBase {
+  
+  private static final long serialVersionUID = 1L;
+
+  public SerialWANStatsDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+    addExpectedException("java.net.ConnectException");
+    addExpectedException("java.net.SocketException");
+    addExpectedException("Unexpected IOException");
+  }
+  
+  public void testReplicatedSerialPropagation() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+
+    vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    
+    pause(2000);
+    vm2.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {100, 1000, 1000 });
+    
+    vm4.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"ln",
+      0, 1000, 1000, 1000});
+    vm4.invoke(WANTestBase.class, "checkBatchStats", new Object[] {"ln",
+      100});
+    
+    vm5.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"ln",
+      0, 1000, 0, 0});
+    vm5.invoke(WANTestBase.class, "checkBatchStats", new Object[] {"ln",
+      0});
+    
+  }
+  
+  public void testReplicatedSerialPropagationWithMultipleDispatchers() throws Exception {
+	Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+		"createFirstLocatorWithDSId", new Object[] { 1 });
+	Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+		"createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+	vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+	vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+	vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+	vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+	vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+	vm4.invoke(WANTestBase.class, "createSenderWithMultipleDispatchers", new Object[] { "ln", 2,
+		false, 100, 10, false, false, null, true, 2, OrderPolicy.KEY });
+	vm5.invoke(WANTestBase.class, "createSenderWithMultipleDispatchers", new Object[] { "ln", 2,
+		false, 100, 10, false, false, null, true, 2, OrderPolicy.KEY });
+
+	vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+		testName + "_RR", null, isOffHeap()  });
+
+	vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+	vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+	vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+		testName + "_RR", "ln", isOffHeap()  });
+	vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+		testName + "_RR", "ln", isOffHeap()  });
+	vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+		testName + "_RR", "ln", isOffHeap()  });
+	vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+		testName + "_RR", "ln", isOffHeap()  });
+
+	vm5.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+		1000 });
+
+	vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+		testName + "_RR", 1000 });
+	    
+	pause(2000);
+	vm2.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {100, 1000, 1000 });
+	    
+	vm4.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"ln",
+		0, 1000, 1000, 1000});
+	vm4.invoke(WANTestBase.class, "checkBatchStats", new Object[] {"ln",
+		100});
+	    
+	vm5.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"ln",
+		0, 1000, 0, 0});
+	vm5.invoke(WANTestBase.class, "checkBatchStats", new Object[] {"ln",
+		0});
+	    
+	  }
+  
+  public void testWANStatsTwoWanSites() throws Exception {
+
+    Integer lnPort = createFirstLocatorWithDSId(1);
+    Integer nyPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer tkPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 3, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial1",
+        2, false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial1",
+        2, false, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial2",
+        3, false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "lnSerial2",
+        3, false, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial1" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial1" });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial2" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "lnSerial2" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "lnSerial1,lnSerial2", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "lnSerial1,lnSerial2", isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "lnSerial1,lnSerial2", isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "lnSerial1,lnSerial2", isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR",
+        1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 1000 });
+    
+    pause(2000);
+    vm2.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {100, 1000, 1000 });
+    vm3.invoke(WANTestBase.class, "checkGatewayReceiverStats", new Object[] {100, 1000, 1000 });
+    
+    vm4.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"lnSerial1",
+      0, 1000, 1000, 1000});
+    vm4.invoke(WANTestBase.class, "checkBatchStats", new Object[] {"lnSerial1",
+      100});
+    vm4.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"lnSerial2",
+      0, 1000, 1000, 1000});
+    vm4.invoke(WANTestBase.class, "checkBatchStats", new Object[] {"lnSerial2",
+      100});
+    vm5.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"lnSerial1",
+      0, 1000, 0, 0});
+    vm5.invoke(WANTestBase.class, "checkBatchStats", new Object[] {"lnSerial1",
+      0});
+    vm5.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"lnSerial2",
+      0, 1000, 0, 0});
+    vm5.invoke(WANTestBase.class, "checkBatchStats", new Object[] {"lnSerial2",
+      0});
+    
+  }
+
+  public void testReplicatedSerialPropagationHA() throws Exception {
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+    
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap()  });
+    
+    AsyncInvocation inv1 = vm5.invokeAsync(WANTestBase.class, "doPuts",
+        new Object[] { testName + "_RR", 10000 });
+    pause(2000);
+    AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "killSender", new Object[] { "ln" });
+    Boolean isKilled = Boolean.FALSE;
+    try {
+      isKilled = (Boolean)inv2.getResult();
+    }
+    catch (Throwable e) {
+      fail("Unexpected exception while killing a sender");
+    }
+    AsyncInvocation inv3 = null; 
+    if(!isKilled){
+      inv3 = vm5.invokeAsync(WANTestBase.class, "killSender", new Object[] { "ln" });
+      inv3.join();
+    }
+    inv1.join();
+    inv2.join();
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR", 10000 });
+  
+    vm2.invoke(WANTestBase.class, "checkGatewayReceiverStatsHA", new Object[] {1000, 10000, 10000 });
+    
+    vm5.invoke(WANTestBase.class, "checkStats_Failover", new Object[] {"ln", 10000});
+  }
+  
+  public void testReplicatedSerialPropagationUNPorcessedEvents() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    //these are part of remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    //these are part of local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    //senders are created on local site
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 20, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 20, false, false, null, true });
+
+    //create one RR (RR_1) on remote site
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", null, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", null, isOffHeap()  });
+
+    //create another RR (RR_2) on remote site
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", null, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", null, isOffHeap()  });
+    
+    //start the senders on local site
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    //create one RR (RR_1) on local site
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+
+    //create another RR (RR_2) on local site
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", "ln", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", "ln", isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", "ln", isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_2", "ln", isOffHeap()  });
+    
+    //start puts in RR_1 in another thread
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR_1", 1000 });
+    //do puts in RR_2 in main thread
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_RR_2", 500 });
+    //sleep for some time to let all the events propagate to remote site
+    Thread.sleep(20);
+    //vm4.invoke(WANTestBase.class, "verifyQueueSize", new Object[] { "ln", 0 });
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR_1", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR_2", 500 });
+    
+    pause(2000);
+    vm4.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"ln",
+      0, 1500, 1500, 1500});
+    vm4.invoke(WANTestBase.class, "checkBatchStats", new Object[] {"ln",
+      75});
+    vm4.invoke(WANTestBase.class, "checkUnProcessedStats", new Object[] {"ln", 0});
+    
+    
+    vm5.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"ln",
+      0, 1500, 0, 0});
+    vm5.invoke(WANTestBase.class, "checkBatchStats", new Object[] {"ln",
+      0});
+    vm5.invoke(WANTestBase.class, "checkUnProcessedStats", new Object[] {"ln", 1500});
+  }
+  
+  /**
+   * 
+   * Disabled - see ticket #52118
+   * 
+   * 1 region and sender configured on local site and 1 region and a 
+   * receiver configured on remote site. Puts to the local region are in progress.
+   * Remote region is destroyed in the middle.
+   * 
+   * @throws Exception
+   */
+  public void testReplicatedSerialPropagationWithRemoteRegionDestroy() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    //these are part of remote site
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    //these are part of local site
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    //senders are created on local site
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 100, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 100, false, false, null, true });
+
+    //create one RR (RR_1) on remote site
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", null, isOffHeap()  });
+
+    //start the senders on local site
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    //create one RR (RR_1) on local site
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR_1", "ln", isOffHeap()  });
+
+    //start puts in RR_1 in another thread
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_RR_1", 20000 });
+    //destroy RR_1 in remote site
+    vm2.invoke(WANTestBase.class, "destroyRegion", new Object[] { testName + "_RR_1", 500});
+    
+    try {
+      inv1.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail();
+    }
+
+    //verify that all is well in local site. All the events should be present in local region
+    vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_RR_1", 20000 });
+    //assuming some events might have been dispatched before the remote region was destroyed,
+    //sender's region queue will have events less than 1000 but the queue will not be empty.
+    //NOTE: this much verification might be sufficient in DUnit. Hydra will take care of 
+    //more in depth validations.
+    vm4.invoke(WANTestBase.class, "verifyRegionQueueNotEmpty", new Object[] {"ln" });
+    
+    vm4.invoke(WANTestBase.class, "checkBatchStats", new Object[] {"ln", true, true});
+    
+    vm5.invoke(WANTestBase.class, "checkUnProcessedStats", new Object[] {"ln", 20000});
+    
+    vm2.invoke(WANTestBase.class, "checkExcepitonStats", new Object[] {1});
+    
+  }
+  
+  public void testSerialPropogationWithFilter() throws Exception {
+
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class, "createFirstLocatorWithDSId",
+        new Object[] {1});
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] {2,lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false,
+        new MyGatewayEventFilter(), true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false,
+        new MyGatewayEventFilter(), true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 1, 100, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null, 1, 100, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName, 1000 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 800 });
+    
+    pause(2000);
+    vm4.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"ln",
+      0, 1000, 900, 800});
+    vm4.invoke(WANTestBase.class, "checkEventFilteredStats", new Object[] {"ln",
+      200});
+    vm4.invoke(WANTestBase.class, "checkBatchStats", new Object[] {"ln",
+      80});
+    vm4.invoke(WANTestBase.class, "checkUnProcessedStats", new Object[] {"ln", 0});
+    
+    
+    vm5.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"ln",
+      0, 1000, 0, 0});
+    vm5.invoke(WANTestBase.class, "checkBatchStats", new Object[] {"ln",
+      0});
+    vm5.invoke(WANTestBase.class, "checkUnProcessedStats", new Object[] {"ln",900});
+  }
+  
+  public void testSerialPropagationConflation() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] {lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, true, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap()  });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap()  });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap()  });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, "ln", 0, 100, isOffHeap()  });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "pauseSenderAndWaitForDispatcherToPause", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null,1, 100, isOffHeap()  });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName, null,1, 100, isOffHeap()  });
+
+    final Map keyValues = new HashMap();
+    final Map updateKeyValues = new HashMap();
+    for(int i=0; i< 1000; i++) {
+      keyValues.put(i, i);
+    }
+    
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, keyValues });
+
+    pause(5000);
+    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size() });
+    for(int i=0;i<500;i++) {
+      updateKeyValues.put(i, i+"_updated");
+    }
+    
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues });
+
+    pause(5000);
+    
+    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size()  + updateKeyValues.size() });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, 0 });
+    
+    vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues });
+
+    pause(5000);
+    
+    vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size()  + updateKeyValues.size() });
+
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+
+    keyValues.putAll(updateKeyValues);
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName, keyValues.size() });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName, keyValues.size() });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
+        testName, keyValues });
+    vm3.invoke(WANTestBase.class, "validateRegionContents", new Object[] {
+        testName, keyValues });
+    
+    pause(2000);
+    vm4.invoke(WANTestBase.class, "checkQueueStats", new Object[] {"ln",
+      0, 2000, 2000, 1500});
+    vm4.invoke(WANTestBase.class, "checkConflatedStats", new Object[] {"ln",
+      500});
+  }
+    
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
new file mode 100644
index 0000000..6f9347c
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/wancommand/WANCommandTestBase.java
@@ -0,0 +1,505 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.wan.wancommand;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
+import javax.management.remote.JMXConnectorServer;
+
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.DiskStore;
+import com.gemstone.gemfire.cache.DiskStoreFactory;
+import com.gemstone.gemfire.cache.wan.GatewayEventFilter;
+import com.gemstone.gemfire.cache.wan.GatewayReceiver;
+import com.gemstone.gemfire.cache.wan.GatewayReceiverFactory;
+import com.gemstone.gemfire.cache.wan.GatewaySender;
+import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
+import com.gemstone.gemfire.cache.wan.GatewaySenderFactory;
+import com.gemstone.gemfire.cache.wan.GatewayTransportFilter;
+import com.gemstone.gemfire.distributed.DistributedMember;
+import com.gemstone.gemfire.distributed.Locator;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.internal.AvailablePortHelper;
+import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
+import com.gemstone.gemfire.management.ManagementService;
+import com.gemstone.gemfire.management.internal.cli.commands.CliCommandTestBase;
+
+import dunit.Host;
+import dunit.SerializableRunnable;
+import dunit.VM;
+
+public class WANCommandTestBase extends CliCommandTestBase{
+
+  static Cache cache;
+  private JMXConnectorServer jmxConnectorServer;
+  private ManagementService managementService;
+//  public String jmxHost;
+//  public int jmxPort;
+
+  static VM vm0;
+  static VM vm1;
+  static VM vm2;
+  static VM vm3;
+  static VM vm4;
+  static VM vm5;
+  static VM vm6;
+  static VM vm7;
+
+  public WANCommandTestBase(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+    final Host host = Host.getHost(0);
+    vm0 = host.getVM(0);
+    vm1 = host.getVM(1);
+    vm2 = host.getVM(2);
+    vm3 = host.getVM(3);
+    vm4 = host.getVM(4);
+    vm5 = host.getVM(5);
+    vm6 = host.getVM(6);
+    vm7 = host.getVM(7);
+    enableManagement();
+  }
+
+  public static Integer createFirstLocatorWithDSId(int dsId) {
+    WANCommandTestBase test = new WANCommandTestBase(testName);
+    int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
+    props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port + "]");
+    props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost");
+    InternalDistributedSystem ds = test.getSystem(props);
+    cache = CacheFactory.create(ds);
+    return port;
+  }
+
+  public static Integer createFirstRemoteLocator(int dsId, int remoteLocPort) {
+    WANCommandTestBase test = new WANCommandTestBase(testName);
+    int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
+    props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port + "]");
+    props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost");
+    props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + remoteLocPort + "]");
+    test.getSystem(props);
+    return port;
+  }
+
+  public static void createCache(Integer locPort){
+    WANCommandTestBase test = new WANCommandTestBase(testName);
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]");
+    InternalDistributedSystem ds = test.getSystem(props);
+    cache = CacheFactory.create(ds);
+  }
+
+  public static void createCacheWithGroups(Integer locPort, String groups){
+    WANCommandTestBase test = new WANCommandTestBase(testName);
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]");
+    props.setProperty(DistributionConfig.GROUPS_NAME, groups);
+    InternalDistributedSystem ds = test.getSystem(props);
+    cache = CacheFactory.create(ds);
+  }
+
+  public static void createSender(String dsName, int remoteDsId,
+      boolean isParallel, Integer maxMemory,
+      Integer batchSize, boolean isConflation, boolean isPersistent,
+      GatewayEventFilter filter, boolean isManulaStart) {
+    File persistentDirectory = new File(dsName +"_disk_"+System.currentTimeMillis()+"_" + VM.getCurrentVMNum());
+    persistentDirectory.mkdir();
+    DiskStoreFactory dsf = cache.createDiskStoreFactory();
+    File [] dirs1 = new File[] {persistentDirectory};
+    if(isParallel) {
+      GatewaySenderFactory gateway = cache.createGatewaySenderFactory();
+      gateway.setParallel(true);
+      gateway.setMaximumQueueMemory(maxMemory);
+      gateway.setBatchSize(batchSize);
+      gateway.setManualStart(isManulaStart);
+      if (filter != null) {
+        gateway.addGatewayEventFilter(filter);
+      }
+      if(isPersistent) {
+        gateway.setPersistenceEnabled(true);
+        gateway.setDiskStoreName(dsf.setDiskDirs(dirs1).create(dsName).getName());
+      }
+      else {
+        DiskStore store = dsf.setDiskDirs(dirs1).create(dsName);
+        gateway.setDiskStoreName(store.getName());
+      }
+      gateway.setBatchConflationEnabled(isConflation);
+      gateway.create(dsName, remoteDsId);
+
+    }else {
+      GatewaySenderFactory gateway = cache.createGatewaySenderFactory();
+      gateway.setMaximumQueueMemory(maxMemory);
+      gateway.setBatchSize(batchSize);
+      gateway.setManualStart(isManulaStart);
+      if (filter != null) {
+        gateway.addGatewayEventFilter(filter);
+      }
+      gateway.setBatchConflationEnabled(isConflation);
+      if(isPersistent) {
+        gateway.setPersistenceEnabled(true);
+        gateway.setDiskStoreName(dsf.setDiskDirs(dirs1).create(dsName).getName());
+      }
+      else {
+        DiskStore store = dsf.setDiskDirs(dirs1).create(dsName);
+        gateway.setDiskStoreName(store.getName());
+      }
+      gateway.create(dsName, remoteDsId);
+    }
+  }
+
+  public static void startSender(String senderId){
+    final ExpectedException exln = addExpectedException("Could not connect");
+    try {
+      Set<GatewaySender> senders = cache.getGatewaySenders();
+      GatewaySender sender = null;
+      for (GatewaySender s : senders) {
+        if (s.getId().equals(senderId)) {
+          sender = s;
+          break;
+        }
+      }
+      sender.start();
+    } finally {
+      exln.remove();
+    }
+  }
+
+  public static void pauseSender(String senderId){
+    final ExpectedException exln = addExpectedException("Could not connect");
+    try {
+      Set<GatewaySender> senders = cache.getGatewaySenders();
+      GatewaySender sender = null;
+      for (GatewaySender s : senders) {
+        if (s.getId().equals(senderId)) {
+          sender = s;
+          break;
+        }
+      }
+      sender.pause();
+    } finally {
+      exln.remove();
+    }
+  }
+
+  public static int createAndStartReceiver(int locPort) {
+    WANCommandTestBase test = new WANCommandTestBase(testName);
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort
+        + "]");
+
+    InternalDistributedSystem ds = test.getSystem(props);
+    cache = CacheFactory.create(ds);
+    GatewayReceiverFactory fact = cache.createGatewayReceiverFactory();
+    int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    fact.setStartPort(port);
+    fact.setEndPort(port);
+    fact.setManualStart(true);
+    GatewayReceiver receiver = fact.create();
+    try {
+         receiver.start();
+    } catch (IOException e) {
+      e.printStackTrace();
+      fail("Test " + test.getName() + " failed to start GatewayRecevier");
+    }
+    return port;
+  }
+
+  public static int createReceiver(int locPort) {
+    WANCommandTestBase test = new WANCommandTestBase(testName);
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort
+        + "]");
+
+    InternalDistributedSystem ds = test.getSystem(props);
+    cache = CacheFactory.create(ds);
+    GatewayReceiverFactory fact = cache.createGatewayReceiverFactory();
+    int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    fact.setStartPort(port);
+    fact.setEndPort(port);
+    fact.setManualStart(true);
+    GatewayReceiver receiver = fact.create();
+    return port;
+  }
+
+  public static int createReceiverWithGroup(int locPort, String groups) {
+    WANCommandTestBase test = new WANCommandTestBase(testName);
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort
+        + "]");
+    props.setProperty(DistributionConfig.GROUPS_NAME, groups);
+
+    InternalDistributedSystem ds = test.getSystem(props);
+    cache = CacheFactory.create(ds);
+    GatewayReceiverFactory fact = cache.createGatewayReceiverFactory();
+    int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    fact.setStartPort(port);
+    fact.setEndPort(port);
+    fact.setManualStart(true);
+    GatewayReceiver receiver = fact.create();
+    return port;
+  }
+
+  public static void startReceiver() {
+    WANCommandTestBase test = new WANCommandTestBase(testName);
+    try {
+      Set<GatewayReceiver> receivers = cache.getGatewayReceivers();
+      for (GatewayReceiver receiver : receivers) {
+        receiver.start();
+      }
+    } catch (IOException e) {
+      e.printStackTrace();
+      fail("Test " + test.getName() + " failed to start GatewayRecevier");
+    }
+  }
+
+  public static void stopReceiver() {
+    WANCommandTestBase test = new WANCommandTestBase(testName);
+    Set<GatewayReceiver> receivers = cache.getGatewayReceivers();
+    for (GatewayReceiver receiver : receivers) {
+      receiver.stop();
+    }
+  }
+
+  public static int createAndStartReceiverWithGroup(int locPort, String groups) {
+    WANCommandTestBase test = new WANCommandTestBase(testName);
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort
+        + "]");
+    props.setProperty(DistributionConfig.GROUPS_NAME, groups);
+
+    InternalDistributedSystem ds = test.getSystem(props);
+    cache = CacheFactory.create(ds);
+    GatewayReceiverFactory fact = cache.createGatewayReceiverFactory();
+    int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    fact.setStartPort(port);
+    fact.setEndPort(port);
+    fact.setManualStart(true);
+    GatewayReceiver receiver = fact.create();
+    try {
+      receiver.start();
+    } catch (IOException e) {
+      e.printStackTrace();
+      fail("Test " + test.getName() + " failed to start GatewayRecevier on port " + port);
+    }
+    return port;
+  }
+
+  public static DistributedMember getMember(){
+    return cache.getDistributedSystem().getDistributedMember();
+  }
+
+
+  public static int getLocatorPort(){
+    return Locator.getLocators().get(0).getPort();
+  }
+
+  /**
+   * Enable system property gemfire.disableManagement false in each VM.
+   *
+   * @throws Exception
+   */
+  public void enableManagement() {
+    invokeInEveryVM(new SerializableRunnable("Enable Management") {
+      public void run() {
+        System.setProperty(InternalDistributedSystem.DISABLE_MANAGEMENT_PROPERTY, "false");
+      }
+    });
+
+  }
+
+  public static void verifySenderState(String senderId, boolean isRunning, boolean isPaused) {
+    final ExpectedException exln = addExpectedException("Could not connect");
+    try {
+      Set<GatewaySender> senders = cache.getGatewaySenders();
+      AbstractGatewaySender sender = null;
+      for (GatewaySender s : senders) {
+        if (s.getId().equals(senderId)) {
+          sender = (AbstractGatewaySender) s;
+          break;
+        }
+      }
+
+      assertEquals(isRunning, sender.isRunning());
+      assertEquals(isPaused, sender.isPaused());
+    } finally {
+      exln.remove();
+    }
+  }
+
+  public static void verifySenderAttributes(String senderId, int remoteDsID,
+      boolean isParallel, boolean manualStart, int socketBufferSize,
+      int socketReadTimeout, boolean enableBatchConflation, int batchSize,
+      int batchTimeInterval, boolean enablePersistence,
+      boolean diskSynchronous, int maxQueueMemory, int alertThreshold,
+      int dispatcherThreads, OrderPolicy orderPolicy,
+      List<String> expectedGatewayEventFilters,
+      List<String> expectedGatewayTransportFilters) {
+
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    AbstractGatewaySender sender = null;
+    for (GatewaySender s : senders) {
+      if (s.getId().equals(senderId)) {
+        sender = (AbstractGatewaySender)s;
+        break;
+      }
+    }
+    assertEquals("remoteDistributedSystemId", remoteDsID, sender
+        .getRemoteDSId());
+    assertEquals("isParallel", isParallel, sender.isParallel());
+    assertEquals("manualStart", manualStart, sender.isManualStart());
+    assertEquals("socketBufferSize", socketBufferSize, sender
+        .getSocketBufferSize());
+    assertEquals("socketReadTimeout", socketReadTimeout, sender
+        .getSocketReadTimeout());
+    assertEquals("enableBatchConflation", enableBatchConflation, sender
+        .isBatchConflationEnabled());
+    assertEquals("batchSize", batchSize, sender.getBatchSize());
+    assertEquals("batchTimeInterval", batchTimeInterval, sender
+        .getBatchTimeInterval());
+    assertEquals("enablePersistence", enablePersistence, sender
+        .isPersistenceEnabled());
+    assertEquals("diskSynchronous", diskSynchronous, sender.isDiskSynchronous());
+    assertEquals("maxQueueMemory", maxQueueMemory, sender
+        .getMaximumQueueMemory());
+    assertEquals("alertThreshold", alertThreshold, sender.getAlertThreshold());
+    assertEquals("dispatcherThreads", dispatcherThreads, sender
+        .getDispatcherThreads());
+    assertEquals("orderPolicy", orderPolicy, sender.getOrderPolicy());
+
+    // verify GatewayEventFilters
+    if (expectedGatewayEventFilters != null) {
+      assertEquals("gatewayEventFilters", expectedGatewayEventFilters.size(),
+          sender.getGatewayEventFilters().size());
+
+      List<GatewayEventFilter> actualGatewayEventFilters = sender
+          .getGatewayEventFilters();
+      List<String> actualEventFilterClassnames = new ArrayList<String>(
+          actualGatewayEventFilters.size());
+      for (GatewayEventFilter filter : actualGatewayEventFilters) {
+        actualEventFilterClassnames.add(filter.getClass().getName());
+      }
+
+      for (String expectedGatewayEventFilter : expectedGatewayEventFilters) {
+        if (!actualEventFilterClassnames.contains(expectedGatewayEventFilter)) {
+          fail("GatewayEventFilter " + expectedGatewayEventFilter
+              + " is not added to the GatewaySender");
+        }
+      }
+    }
+
+    // verify GatewayTransportFilters
+    if (expectedGatewayTransportFilters != null) {
+      assertEquals("gatewayTransportFilters", expectedGatewayTransportFilters
+          .size(), sender.getGatewayTransportFilters().size());
+      List<GatewayTransportFilter> actualGatewayTransportFilters = sender
+          .getGatewayTransportFilters();
+      List<String> actualTransportFilterClassnames = new ArrayList<String>(
+          actualGatewayTransportFilters.size());
+      for (GatewayTransportFilter filter : actualGatewayTransportFilters) {
+        actualTransportFilterClassnames.add(filter.getClass().getName());
+      }
+
+      for (String expectedGatewayTransportFilter : expectedGatewayTransportFilters) {
+        if (!actualTransportFilterClassnames
+            .contains(expectedGatewayTransportFilter)) {
+          fail("GatewayTransportFilter " + expectedGatewayTransportFilter
+              + " is not added to the GatewaySender.");
+        }
+      }
+    }
+  }
+
+  public static void verifyReceiverState(boolean isRunning) {
+    WANCommandTestBase test = new WANCommandTestBase(testName);
+    Set<GatewayReceiver> receivers = cache.getGatewayReceivers();
+    for (GatewayReceiver receiver : receivers) {
+      assertEquals(isRunning, receiver.isRunning());
+    }
+  }
+
+  public static void verifyReceiverCreationWithAttributes(boolean isRunning,
+      int startPort, int endPort, String bindAddress, int maxTimeBetweenPings,
+      int socketBufferSize, List<String> expectedGatewayTransportFilters) {
+
+    WANCommandTestBase test = new WANCommandTestBase(testName);
+    Set<GatewayReceiver> receivers = cache.getGatewayReceivers();
+    assertEquals("Number of receivers is incorrect", 1, receivers.size());
+    for (GatewayReceiver receiver : receivers) {
+      assertEquals("isRunning", isRunning, receiver.isRunning());
+      assertEquals("startPort", startPort, receiver.getStartPort());
+      assertEquals("endPort", endPort, receiver.getEndPort());
+      assertEquals("bindAddress", bindAddress, receiver.getBindAddress());
+      assertEquals("maximumTimeBetweenPings", maxTimeBetweenPings, receiver
+          .getMaximumTimeBetweenPings());
+      assertEquals("socketBufferSize", socketBufferSize, receiver
+          .getSocketBufferSize());
+
+      // verify GatewayTransportFilters
+      if (expectedGatewayTransportFilters != null) {
+        assertEquals("gatewayTransportFilters", expectedGatewayTransportFilters
+            .size(), receiver.getGatewayTransportFilters().size());
+        List<GatewayTransportFilter> actualGatewayTransportFilters = receiver
+            .getGatewayTransportFilters();
+        List<String> actualTransportFilterClassnames = new ArrayList<String>(
+            actualGatewayTransportFilters.size());
+        for (GatewayTransportFilter filter : actualGatewayTransportFilters) {
+          actualTransportFilterClassnames.add(filter.getClass().getName());
+        }
+
+        for (String expectedGatewayTransportFilter : expectedGatewayTransportFilters) {
+          if (!actualTransportFilterClassnames
+              .contains(expectedGatewayTransportFilter)) {
+            fail("GatewayTransportFilter " + expectedGatewayTransportFilter
+                + " is not added to the GatewayReceiver.");
+          }
+        }
+      }
+    }
+  }
+
+  public void tearDown2() throws Exception {
+    super.tearDown2();
+    closeCache();
+    vm0.invoke(WANCommandTestBase.class, "closeCache");
+    vm1.invoke(WANCommandTestBase.class, "closeCache");
+    vm2.invoke(WANCommandTestBase.class, "closeCache");
+    vm3.invoke(WANCommandTestBase.class, "closeCache");
+    vm4.invoke(WANCommandTestBase.class, "closeCache");
+    vm5.invoke(WANCommandTestBase.class, "closeCache");
+    vm6.invoke(WANCommandTestBase.class, "closeCache");
+    vm7.invoke(WANCommandTestBase.class, "closeCache");
+  }
+
+  public static void closeCache() {
+    if (cache != null && !cache.isClosed()) {
+      cache.close();
+      cache.getDistributedSystem().disconnect();
+    }
+  }
+}



[11/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
new file mode 100644
index 0000000..5aac8f1
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
@@ -0,0 +1,1981 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.wan.parallel;
+
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionDestroyedException;
+import com.gemstone.gemfire.internal.cache.PartitionedRegion;
+import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
+import com.gemstone.gemfire.internal.cache.wan.GatewaySenderException;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+
+import dunit.AsyncInvocation;
+import dunit.DistributedTestCase;
+import dunit.RMIException;
+import dunit.DistributedTestCase.ExpectedException;
+
+/**
+ * DUnit test for operations on ParallelGatewaySender
+ * 
+ * @author pdeole
+ *
+ */
+public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase {
+  private static final long serialVersionUID = 1L;
+  
+  public ParallelGatewaySenderOperationsDUnitTest(String name) {
+    super(name);
+  }
+  
+  public void setUp() throws Exception {
+    super.setUp();
+    addExpectedException("Broken pipe||Unexpected IOException");
+  }
+  
+  public void testParallelGatewaySenderWithoutStarting() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+    
+    vm4.invoke(WANTestBase.class, "verifySenderStoppedState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "verifySenderStoppedState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "verifySenderStoppedState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "verifySenderStoppedState", new Object[] { "ln" });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 0 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 0 });
+  }
+  
+  /**
+   * Defect 44323 (ParallelGatewaySender should not be started on Accessor node)
+   */
+  public void testParallelGatewaySenderStartOnAccessorNode() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegionAsAccessor", new Object[] {
+        testName + "_PR", "ln", 1, 100 });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegionAsAccessor", new Object[] {
+        testName + "_PR", "ln", 1, 100 });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    
+    //start the senders
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    pause(2000);
+    
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 1000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 1000 });
+  }
+
+  
+  /**
+   * Normal scenario in which the sender is paused in between.
+   * @throws Exception
+   */
+  public void testParallelPropagationSenderPause() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    //make sure all the senders are running before doing any puts
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    //FIRST RUN: now, the senders are started. So, start the puts
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 100 });
+    
+    //now, pause all of the senders
+    vm4.invoke(WANTestBase.class, "pauseSenderAndWaitForDispatcherToPause", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSenderAndWaitForDispatcherToPause", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSenderAndWaitForDispatcherToPause", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSenderAndWaitForDispatcherToPause", new Object[] { "ln" });
+    
+    //SECOND RUN: keep one thread doing puts to the region
+    vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+    
+    //verify region size remains on remote vm and is restricted below a specified limit (i.e. number of puts in the first run)
+    vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {testName + "_PR", 100 });
+  }
+
+  /**
+   * Normal scenario in which a paused sender is resumed.
+   * @throws Exception
+   */
+  public void testParallelPropagationSenderResume() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    //make sure all the senders are running before doing any puts
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    //now, the senders are started. So, start the puts
+    vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+    
+    //now, pause all of the senders
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    
+    //sleep for a second or two
+    pause(2000);
+    
+    //resume the senders
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    
+    pause(2000);
+    
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    
+    //find the region size on remote vm
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 1000 });
+ 
+  }
+  
+  /**
+   * Negative scenario in which a sender that is stopped (and not paused) is resumed.
+   * Expected: resume is only valid for pause. If a sender which is stopped is resumed,
+   * it will not be started again.
+   * 
+   * @throws Exception
+   */
+  public void testParallelPropagationSenderResumeNegativeScenario() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 1, 100, isOffHeap() });
+  
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    //wait till the senders are running
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+
+    //start the puts
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 100 });
+
+    //let the queue drain completely
+    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln", 0 });
+    
+    //stop the senders
+    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    
+    //now, try to resume a stopped sender
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    
+    //do more puts
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+    
+    //validate region size on remote vm to contain only the events put in local site 
+    //before the senders are stopped.
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 100 });
+  }
+
+  /**
+   * Normal scenario in which a sender is stopped.
+   * @throws Exception
+   */
+  public void testParallelPropagationSenderStop() throws Exception {
+    addExpectedException("Broken pipe");
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    //make sure all the senders are running before doing any puts
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    //FIRST RUN: now, the senders are started. So, do some of the puts
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 100 });
+    
+    //now, stop all of the senders
+    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    
+    //SECOND RUN: keep one thread doing puts
+    vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+    
+    //verify region size remains on remote vm and is restricted below a specified limit (number of puts in the first run)
+    vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {testName + "_PR", 100 });
+  }
+
+  /**
+   * Normal scenario in which a sender is stopped and then started again.
+   * @throws Exception
+   */
+  public void testParallelPropagationSenderStartAfterStop() throws Exception {
+    addExpectedException("Broken pipe");
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    //make sure all the senders are running before doing any puts
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    //FIRST RUN: now, the senders are started. So, do some of the puts
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 200 });
+    
+    //now, stop all of the senders
+    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+    vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+    vm6.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+    vm7.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+    
+    pause(2000);
+    
+    //SECOND RUN: do some of the puts after the senders are stopped
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+    
+    //Region size on remote site should remain same and below the number of puts done in the FIRST RUN
+    vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {testName + "_PR", 200 });
+    
+    //start the senders again
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    //Region size on remote site should remain same and below the number of puts done in the FIRST RUN
+    vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {testName + "_PR", 200 });
+
+    //SECOND RUN: do some more puts
+    AsyncInvocation async = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+    async.join();
+    
+    pause(2000);
+    
+    //verify all the buckets on all the sender nodes are drained
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    
+    //verify the events propagate to remote site
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 1000 });
+    
+    vm4.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+    vm5.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+    vm6.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+    vm7.invoke(WANTestBase.class, "validateQueueSizeStat", new Object[] { "ln", 0 });
+  }
+
+  /**
+   * Normal scenario in which a sender is stopped and then started again.
+   * Differs from above test case in the way that when the sender is starting from
+   * stopped state, puts are simultaneously happening on the region by another thread.
+   * @throws Exception
+   */
+  public void testParallelPropagationSenderStartAfterStop_Scenario2() throws Exception {
+    addExpectedException("Broken pipe");
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    //make sure all the senders are running before doing any puts
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    getLogWriter().info("All the senders are now started");
+    
+    //FIRST RUN: now, the senders are started. So, do some of the puts
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 200 });
+    
+    getLogWriter().info("Done few puts");
+    
+    //now, stop all of the senders
+    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    
+    getLogWriter().info("All the senders are stopped");
+    pause(2000);
+    
+    //SECOND RUN: do some of the puts after the senders are stopped
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+    getLogWriter().info("Done some more puts in second run");
+    
+    //Region size on remote site should remain same and below the number of puts done in the FIRST RUN
+    vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {testName + "_PR", 200 });
+    
+    //SECOND RUN: start async puts on region
+    AsyncInvocation async = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 5000 });
+    getLogWriter().info("Started high number of puts by async thread");
+
+    getLogWriter().info("Starting the senders at the same time");
+    //when puts are happening by another thread, start the senders
+    vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    getLogWriter().info("All the senders are started");
+    
+    async.join();
+        
+    pause(2000);
+    
+    //verify all the buckets on all the sender nodes are drained
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    
+    //verify that the queue size ultimately becomes zero. That means all the events propagate to remote site.
+    vm4.invoke(WANTestBase.class, "validateQueueContents", new Object[] { "ln", 0 });
+  }
+  
+  /**
+   * Normal scenario in which a sender is stopped and then started again on accessor node.
+   * @throws Exception
+   */
+  public void testParallelPropagationSenderStartAfterStopOnAccessorNode() throws Exception {
+    addExpectedException("Broken pipe");
+    addExpectedException("Connection reset");
+    addExpectedException("Unexpected IOException");
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegionAsAccessor", new Object[] {
+        testName + "_PR", "ln", 1, 100 });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegionAsAccessor", new Object[] {
+        testName + "_PR", "ln", 1, 100 });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    //make sure all the senders are not running on accessor nodes and running on non-accessor nodes
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    //FIRST RUN: now, the senders are started. So, do some of the puts
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 200 });
+    
+    //now, stop all of the senders
+    vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" });
+    
+    pause(2000);
+    
+    //SECOND RUN: do some of the puts after the senders are stopped
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+    
+    //Region size on remote site should remain same and below the number of puts done in the FIRST RUN
+    vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {testName + "_PR", 200 });
+    
+    //start the senders again
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    //Region size on remote site should remain same and below the number of puts done in the FIRST RUN
+    vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {testName + "_PR", 200 });
+
+    //SECOND RUN: do some more puts
+    AsyncInvocation async = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+    async.join();
+    pause(5000);
+    
+    //verify all buckets drained only on non-accessor nodes.
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    
+    //verify the events propagate to remote site
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {testName + "_PR", 1000 });
+  }
+
+  
+  /**
+   * Normal scenario in which a combinations of start, pause, resume operations
+   * is tested
+   */
+  public void testStartPauseResumeParallelGatewaySender() throws Exception {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    getLogWriter().info("Created cache on local site");
+    
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    
+    getLogWriter().info("Created senders on local site");
+    
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    getLogWriter().info("Created PRs on local site");
+    
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    getLogWriter().info("Created PRs on remote site");
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 1000 });
+    getLogWriter().info("Done 1000 puts on local site");
+    
+    //Since puts are already done on userPR, it will have the buckets created. 
+    //During sender start, it will wait until those buckets are created for shadowPR as well.
+    //Start the senders in async threads, so colocation of shadowPR will be complete and 
+    //missing buckets will be created in PRHARedundancyProvider.createMissingBuckets().
+    vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" });
+    
+    getLogWriter().info("Started senders on local site");
+    
+    vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR", 5000 });
+    getLogWriter().info("Done 5000 puts on local site");
+    
+    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    getLogWriter().info("Paused senders on local site");
+    
+    vm4.invoke(WANTestBase.class, "verifySenderPausedState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "verifySenderPausedState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "verifySenderPausedState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "verifySenderPausedState", new Object[] { "ln" });
+    
+    AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
+        new Object[] { testName + "_PR", 1000 });
+    getLogWriter().info("Started 1000 async puts on local site");
+
+    vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+    getLogWriter().info("Resumed senders on local site");
+
+    vm4.invoke(WANTestBase.class, "verifySenderResumedState", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "verifySenderResumedState", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "verifySenderResumedState", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "verifySenderResumedState", new Object[] { "ln" });
+
+    try {
+      inv1.join();
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+      fail("Interrupted the async invocation.");
+    }
+    
+    //verify all buckets drained on all sender nodes.
+    vm4.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm5.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm6.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+    vm7.invoke(WANTestBase.class, "validateParallelSenderQueueAllBucketsDrained", new Object[] {"ln"});
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 5000 });
+    vm3.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+      testName + "_PR", 5000 });
+  }
+  
+  // to test that when userPR is locally destroyed, shadow Pr is also locally
+  // destroyed and on recreation usrePr , shadow Pr is also recreated.
+  public void testParallelGatewaySender_SingleNode_UserPR_localDestroy_RecreateRegion() throws Exception {
+    addExpectedException("RegionDestroyedException");
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    try {
+      vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+
+      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+          true, 100, 10, false, false, null, false });
+
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 10, isOffHeap() });
+
+      getLogWriter().info("Created PRs on local site");
+
+      vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", null, 1, 10, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+          10 });
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10 });
+
+      // since sender is paused, no dispatching
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 0 });
+
+      vm4.invoke(WANTestBase.class, "localDestroyRegion",
+          new Object[] { testName + "_PR" });
+
+      // since shodowPR is locally destroyed, so no data to dispatch
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 0 });
+
+      vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 10, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
+          testName + "_PR", 10, 20 });
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10 });
+
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10 });
+    } finally {
+      vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+        "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+    }
+  }
+  
+  public void testParallelGatewaySender_SingleNode_UserPR_Destroy_RecreateRegion() throws Exception {
+    addExpectedException("RegionDestroyedException");
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    try {
+      vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+
+      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+          true, 100, 10, false, false, null, false });
+
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 10, isOffHeap() });
+
+      getLogWriter().info("Created PRs on local site");
+
+      vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", null, 1, 10, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+          10 });
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10 });
+
+      // since resume is paused, no dispatching
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 0 });
+
+      vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "destroyRegion", new Object[] { testName
+          + "_PR" });
+
+      // before destoy, there is wait for queue to drain, so data will be
+      // dispatched
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10 });
+
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 10, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
+          testName + "_PR", 10, 20 });
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10 });
+
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 20 });
+
+    } finally {
+      vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+    }
+  }
+  
+  
+  public void testParallelGatewaySender_SingleNode_UserPR_Close_RecreateRegion() throws Exception {
+    ExpectedException exp = addExpectedException(RegionDestroyedException.class
+        .getName());
+    try {
+      Integer lnPort = (Integer) vm0.invoke(WANTestBase.class,
+          "createFirstLocatorWithDSId", new Object[] { 1 });
+      Integer nyPort = (Integer) vm1.invoke(WANTestBase.class,
+          "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+      vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+      try {
+        vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+            "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+            new Object[] { lnPort });
+
+        getLogWriter().info("Created cache on local site");
+
+        getLogWriter().info("Created senders on local site");
+
+        vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+            true, 100, 10, false, false, null, false });
+
+        vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+        vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+
+        vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+            testName + "_PR", "ln", 1, 10, isOffHeap() });
+
+        getLogWriter().info("Created PRs on local site");
+
+        vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+            testName + "_PR", null, 1, 10, isOffHeap() });
+
+        vm4.invoke(WANTestBase.class, "doPuts", new Object[] {
+            testName + "_PR", 10 });
+
+        vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+            testName + "_PR", 10 });
+
+        // since resume is paused, no dispatching
+        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+            testName + "_PR", 0 });
+
+        vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+            "closeRegion", new Object[] { testName + "_PR" });
+
+        vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+
+        pause(500); // paused if there is any element which is received on
+                    // remote
+                    // site
+
+        // before close, there is wait for queue to drain, so data will be
+        // dispatched
+        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+            testName + "_PR", 0 });
+
+        vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+            testName + "_PR", "ln", 1, 10, isOffHeap() });
+
+        vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
+            testName + "_PR", 10, 20 });
+
+        vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+            testName + "_PR", 10 });
+
+        vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+            testName + "_PR", 10 });
+      } finally {
+        vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+            "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+      }
+    } finally {
+      exp.remove();
+    }
+  }
+  
+  //to test that while localDestroy is in progress, put operation does not successed
+  public void testParallelGatewaySender_SingleNode_UserPR_localDestroy_SimultenuousPut_RecreateRegion() throws Exception {
+    addExpectedException("RegionDestroyedException");
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    try {
+      vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+
+      getLogWriter().info("Created cache on local site");
+
+      getLogWriter().info("Created senders on local site");
+
+      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+          true, 100, 10, false, false, null, false });
+
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 10, isOffHeap() });
+
+      getLogWriter().info("Created PRs on local site");
+
+      vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", null, 1, 10, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+          10 });
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10 });
+
+      // since resume is paused, no dispatching
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 0 });
+
+      AsyncInvocation putAsync = vm4.invokeAsync(WANTestBase.class,
+          "doPutsFrom", new Object[] { testName + "_PR", 100, 2000 });
+      AsyncInvocation localDestroyAsync = vm4.invokeAsync(WANTestBase.class,
+          "localDestroyRegion", new Object[] { testName + "_PR" });
+      try {
+        putAsync.join();
+        localDestroyAsync.join();
+      } catch (InterruptedException e) {
+        e.printStackTrace();
+        fail("Interrupted the async invocation.");
+      }
+
+      if (localDestroyAsync.getException() != null) {
+        fail("Not Expected Exception got", putAsync.getException());
+      }
+
+      if (putAsync.getException() != null
+          && !(putAsync.getException() instanceof RegionDestroyedException)) {
+        fail("Expected RegionDestroyedException but got",
+            putAsync.getException());
+      }
+
+      vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+
+      pause(500); // paused if there is any element which is received on remote
+                  // site
+
+      // since shodowPR is locally destroyed, so no data to dispatch
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 0 });
+
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 10, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
+          testName + "_PR", 10, 20 });
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10 });
+
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10 });
+
+    } finally {
+      vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+    }
+  }
+  
+  public void testParallelGatewaySender_SingleNode_UserPR_Destroy_SimultenuousPut_RecreateRegion() throws Exception {
+    addExpectedException("RegionDestroyedException");
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    try {
+      vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+
+      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+          true, 100, 10, false, false, null, false });
+
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 10, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "addCacheListenerAndDestroyRegion", new Object[] {
+        testName + "_PR"});
+      
+      getLogWriter().info("Created PRs on local site");
+
+      vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", null, 1, 10, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+          10 });
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10 });
+
+      // since resume is paused, no dispatching
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 0 });
+
+      vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+
+      AsyncInvocation putAsync = vm4.invokeAsync(WANTestBase.class,
+          "doPutsFrom", new Object[] { testName + "_PR", 10, 101 });
+      try {
+        putAsync.join();
+      } catch (InterruptedException e) {
+        e.printStackTrace();
+        fail("Interrupted the async invocation.");
+      }
+
+      if (putAsync.getException() != null
+          && !(putAsync.getException() instanceof RegionDestroyedException)) {
+        fail("Expected RegionDestroyedException but got",
+            putAsync.getException());
+      }
+
+      // before destroy, there is wait for queue to drain, so data will be
+      // dispatched
+      vm2.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "validateRegionSizeWithinRange", new Object[] { testName + "_PR", 10,
+              101 }); // possible size is more than 10
+
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 10, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
+          testName + "_PR", 10, 20 });
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10 });
+
+      vm2.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "validateRegionSizeWithinRange", new Object[] { testName + "_PR", 20,
+              101 });// possible size is more than 20
+
+    } finally {
+      vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+    }
+  }
+  
+  public void testParallelGatewaySender_SingleNode_UserPR_Destroy_NodeDown() throws Exception {
+    addExpectedException("RegionDestroyedException");
+    addExpectedException("Connection reset");
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    try {
+      vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+      vm5.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+      vm6.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+
+      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+          true, 100, 10, false, false, null, false });
+      vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+          true, 100, 10, false, false, null, false });
+      vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+          true, 100, 10, false, false, null, false });
+
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+      vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+      vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+      vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+      vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 10, isOffHeap() });
+      vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 10, isOffHeap() });
+      vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 10, isOffHeap() });
+
+      getLogWriter().info("Created PRs on local site");
+
+      vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", null, 1, 10, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+          10000 });
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10000 });
+
+      // since resume is paused, no dispatching
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 0 });
+
+      vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+      vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+      vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+
+      pause(200);
+      AsyncInvocation localDestroyAsync = vm4.invokeAsync(WANTestBase.class,
+          "destroyRegion", new Object[] { testName + "_PR" });
+
+      AsyncInvocation closeAsync = vm4.invokeAsync(WANTestBase.class,
+          "closeCache");
+      try {
+        localDestroyAsync.join();
+        closeAsync.join();
+      } catch (InterruptedException e) {
+        e.printStackTrace();
+        fail("Interrupted the async invocation.");
+      }
+
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10000 });// possible size is more than 20
+
+    } finally {
+      vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+      vm5.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+      vm6.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+    }
+  }
+  
+  public void testParallelGatewaySender_SingleNode_UserPR_Close_SimultenuousPut_RecreateRegion() throws Exception {
+    addExpectedException("RegionDestroyedException");
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    try {
+      vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+
+      getLogWriter().info("Created cache on local site");
+
+      getLogWriter().info("Created senders on local site");
+
+      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+          true, 100, 10, false, false, null, false });
+
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 10, isOffHeap() });
+
+      getLogWriter().info("Created PRs on local site");
+
+      vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", null, 1, 10, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+          10 });
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10 });
+
+      // since resume is paused, no dispatching
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 0 });
+
+      AsyncInvocation putAsync = vm4.invokeAsync(WANTestBase.class,
+          "doPutsFrom", new Object[] { testName + "_PR", 10, 2000 });
+      AsyncInvocation localDestroyAsync = vm4.invokeAsync(
+          ParallelGatewaySenderOperationsDUnitTest.class, "closeRegion",
+          new Object[] { testName + "_PR" });
+      try {
+        putAsync.join();
+        localDestroyAsync.join();
+      } catch (InterruptedException e) {
+        e.printStackTrace();
+        fail("Interrupted the async invocation.");
+      }
+
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 0 });
+
+      vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });
+
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 10, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
+          testName + "_PR", 10, 20 });
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10 });
+
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10 });
+    } finally {
+      vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+    }
+  }
+  
+  public void testParallelGatewaySenders_SingleNode_UserPR_localDestroy_RecreateRegion()
+      throws Exception {
+    addExpectedException("RegionDestroyedException");
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer tkPort = (Integer)vm2.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 3, lnPort });
+    Integer pnPort = (Integer)vm3.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 4, lnPort });
+
+    vm4.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm5.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
+    vm6.invoke(WANTestBase.class, "createReceiver", new Object[] { pnPort });
+
+    try {
+      vm7.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+
+      getLogWriter().info("Created cache on local site");
+
+      vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+          true, 100, 10, false, false, null, true });
+
+      vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln2", 3,
+          true, 100, 10, false, false, null, true });
+
+      vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln3", 4,
+          true, 100, 10, false, false, null, true });
+
+      vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
+      vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln2" });
+      vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln3" });
+
+      vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln1,ln2,ln3", 1, 10, isOffHeap() });
+
+      getLogWriter().info("Created PRs on local site");
+
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", null, 1, 10, isOffHeap() });
+      vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", null, 1, 10, isOffHeap() });
+      vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", null, 1, 10, isOffHeap() });
+
+      vm7.invoke(WANTestBase.class, "doPuts", new Object[] { testName + "_PR",
+          10 });
+      
+      vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+        testName + "_PR", 10 });
+      vm7.invoke(WANTestBase.class, "validateQueueContents",
+          new Object[] { "ln1", 0 });
+      vm7.invoke(WANTestBase.class, "validateQueueContents",
+          new Object[] { "ln2", 0 });
+      vm7.invoke(WANTestBase.class, "validateQueueContents",
+          new Object[] { "ln3", 0 });
+      
+      vm7.invoke(WANTestBase.class, "localDestroyRegion",
+          new Object[] { testName + "_PR" });
+
+      vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln1,ln2,ln3", 1, 10, isOffHeap() });
+
+      vm7.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
+          testName + "_PR", 10, 20 });
+
+      vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 10 });
+
+      vm7.invoke(WANTestBase.class, "validateQueueContents",
+          new Object[] { "ln1", 0 });
+      vm7.invoke(WANTestBase.class, "validateQueueContents",
+          new Object[] { "ln2", 0 });
+      vm7.invoke(WANTestBase.class, "validateQueueContents",
+          new Object[] { "ln3", 0 });
+      
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 20 });
+      vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 20 });
+      vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 20 });
+    } finally {
+      vm7.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+    }
+  }
+  
+  public void testParallelGatewaySender_MultipleNode_UserPR_localDestroy_Recreate() throws Exception {
+    addExpectedException("RegionDestroyedException");
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    try {
+      vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+      vm5.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 100, isOffHeap() });
+      vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+          true, 100, 10, false, false, null, true });
+      vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+          true, 100, 10, false, false, null, true });
+
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+      vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+      getLogWriter().info("Created PRs on local site");
+
+      vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", null, 1, 100, isOffHeap() });
+
+      AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
+          new Object[] { testName + "_PR", 1000 });
+      pause(1000);
+      vm5.invoke(WANTestBase.class, "localDestroyRegion",
+          new Object[] { testName + "_PR" });
+
+      try {
+        inv1.join();
+      } catch (InterruptedException ex) {
+        ex.printStackTrace();
+        fail("Interrupted the async invocation.");
+      }
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 1000 });
+
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 1000 });
+
+      vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
+          testName + "_PR", 1000, 2000 });
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 2000 });
+
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 2000 });
+    } finally {
+      vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+      vm5.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+    }
+  }
+  
+  public void testParallelGatewaySenders_MultiplNode_UserPR_localDestroy_Recreate()
+      throws Exception {
+    addExpectedException("RegionDestroyedException");
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer tkPort = (Integer)vm2.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 3, lnPort });
+
+    vm6.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm7.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
+    try {
+      vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+      vm5.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+
+      vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln1,ln2", 1, 100, isOffHeap() });
+      vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln1,ln2", 1, 100, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+          true, 100, 10, false, false, null, true });
+      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln2", 3,
+          true, 100, 10, false, false, null, true });
+      vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+          true, 100, 10, false, false, null, true });
+      vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln2", 3,
+          true, 100, 10, false, false, null, true });
+
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln2" });
+      vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
+      vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln2" });
+
+      vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", null, 1, 100, isOffHeap() });
+      vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", null, 1, 100, isOffHeap() });
+
+      AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts",
+          new Object[] { testName + "_PR", 1000 });
+      pause(1000);
+      vm5.invoke(WANTestBase.class, "localDestroyRegion",
+          new Object[] { testName + "_PR" });
+
+      try {
+        inv1.join();
+      } catch (InterruptedException ex) {
+        ex.printStackTrace();
+        fail("Interrupted the async invocation.");
+      }
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 1000 });
+
+      vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 1000 });
+      vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 1000 });
+
+      vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+          testName + "_PR", "ln1,ln2", 1, 100, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "doPutsFrom", new Object[] {
+          testName + "_PR", 1000, 2000 });
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 2000 });
+
+      vm6.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 2000 });
+      vm7.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          testName + "_PR", 2000 });
+    } finally {
+      vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+      vm5.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+    }
+  }
+  
+  public void testParallelGatewaySender_ColocatedPartitionedRegions_localDestroy() throws Exception {
+    addExpectedException("RegionDestroyedException");
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    try {
+      vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+      vm5.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+
+      vm4.invoke(WANTestBase.class,
+          "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
+              "ln", 1, 100, isOffHeap() });
+      vm5.invoke(WANTestBase.class,
+          "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
+              "ln", 1, 100, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+          true, 100, 10, false, false, null, true });
+      vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+          true, 100, 10, false, false, null, true });
+
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+      vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+      getLogWriter().info("Created PRs on local site");
+
+      vm2.invoke(WANTestBase.class,
+          "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
+              null, 1, 100, isOffHeap() });
+
+      AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class,
+          "putcolocatedPartitionedRegion", new Object[] { 2000 });
+      pause(1000);
+
+      try {
+        vm5.invoke(WANTestBase.class, "localDestroyRegion",
+            new Object[] { customerRegionName });
+      } catch (Exception ex) {
+        assertTrue(ex.getCause() instanceof UnsupportedOperationException);
+      }
+
+      try {
+        inv1.join();
+      } catch (Exception e) {
+        fail("Unexpected exception", e);
+      }
+
+      vm4.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          customerRegionName, 2000 });
+      vm5.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          customerRegionName, 2000 });
+      vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
+          customerRegionName, 2000 });
+    } finally {
+      vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+      vm5.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+    }
+    
+  }
+  
+  public void testParallelGatewaySender_ColocatedPartitionedRegions_destroy() throws Exception {
+    addExpectedException("RegionDestroyedException");
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    try {
+      vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+      vm5.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME",
+          new Object[] { lnPort });
+
+      vm4.invoke(WANTestBase.class,
+          "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
+              "ln", 1, 100, isOffHeap() });
+      vm5.invoke(WANTestBase.class,
+          "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
+              "ln", 1, 100, isOffHeap() });
+
+      vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+          true, 100, 10, false, false, null, true });
+      vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+          true, 100, 10, false, false, null, true });
+
+      vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+      vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+      getLogWriter().info("Created PRs on local site");
+
+      vm2.invoke(WANTestBase.class,
+          "createCustomerOrderShipmentPartitionedRegion", new Object[] { null,
+              null, 1, 100, isOffHeap() });
+
+      AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class,
+          "putcolocatedPartitionedRegion", new Object[] { 2000 });
+      pause(1000);
+
+      try {
+        vm5.invoke(WANTestBase.class, "destroyRegion",
+            new Object[] { customerRegionName });
+      } catch (Exception ex) {
+        assertTrue(ex.getCause() instanceof IllegalStateException);
+        return;
+      }
+      fail("Excpeted UnsupportedOperationException");
+    } finally {
+      vm4.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+      vm5.invoke(ParallelGatewaySenderOperationsDUnitTest.class,
+          "clear_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME");
+    }
+  }
+  
+  /**
+   * Since the sender is attached to a region and in use, it can not be
+   * destroyed. Hence, exception is thrown by the sender API.
+   */
+  public void testDestroyParallelGatewaySenderExceptionScenario() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true,
+        100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true,
+        100, 10, false, false, null, true });
+    vm6.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true,
+        100, 10, false, false, null, true });
+    vm7.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true,
+        100, 10, false, false, null, true });
+
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm6.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+    vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 100, isOffHeap() });
+
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm6.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm7.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 100, isOffHeap() });
+
+    // make sure all the senders ar

<TRUNCATED>


[35/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
new file mode 100755
index 0000000..061655a
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
@@ -0,0 +1,1204 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.util.Properties;
+
+import com.gemstone.gemfire.Delta;
+import com.gemstone.gemfire.DeltaTestImpl;
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.AttributesMutator;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.EntryEvent;
+import com.gemstone.gemfire.cache.ExpirationAction;
+import com.gemstone.gemfire.cache.ExpirationAttributes;
+import com.gemstone.gemfire.cache.InterestPolicy;
+import com.gemstone.gemfire.cache.PartitionAttributes;
+import com.gemstone.gemfire.cache.PartitionAttributesFactory;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionAttributes;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.SubscriptionAttributes;
+import com.gemstone.gemfire.cache.client.PoolManager;
+import com.gemstone.gemfire.cache.client.internal.PoolImpl;
+import com.gemstone.gemfire.cache.query.CqAttributes;
+import com.gemstone.gemfire.cache.query.CqAttributesFactory;
+import com.gemstone.gemfire.cache.query.CqEvent;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
+import com.gemstone.gemfire.cache.util.CqListenerAdapter;
+import com.gemstone.gemfire.compression.Compressor;
+import com.gemstone.gemfire.compression.SnappyCompressor;
+import com.gemstone.gemfire.distributed.DistributedSystem;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.internal.AvailablePort;
+import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier;
+import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy;
+import com.gemstone.gemfire.internal.cache.tier.sockets.ConflationDUnitTest;
+
+import dunit.DistributedTestCase;
+import dunit.Host;
+import dunit.SerializableRunnable;
+import dunit.VM;
+
+/**
+ * 
+ * Tests the PR delta propagation functionality.
+ * 
+ */
+public class PRDeltaPropagationDUnitTest extends DistributedTestCase {
+  
+  private final static Compressor compressor = SnappyCompressor.getDefaultInstance();
+
+  private static final long serialVersionUID = 1L;
+
+  protected static Cache cache = null;
+
+  protected static VM dataStore1 = null;
+
+  protected static VM dataStore2 = null;
+
+  protected static VM dataStore3 = null;
+
+  protected static VM client1 = null;
+
+  protected static Region deltaPR = null;
+  
+  private static final int NO_PUTS = 10;
+  
+  private static PRDeltaTestImpl prDelta = null;
+  
+  static PoolImpl pool = null;
+  
+  public static String DELTA_KEY = "DELTA_KEY";
+  
+  public static String LAST_KEY = "LAST_KEY";
+  
+  static boolean isFailed = false;
+  private static boolean procced = false;
+  
+  private static boolean forOldNewCQVarification = false;
+  
+  private static boolean isBadToDelta = false;
+
+  private static boolean isBadFromDelta = false;
+
+  /** name of the test region */
+  private static final String REGION_NAME = "PRDeltaPropagationDUnitTest_Region";
+
+  /*
+   * cq 
+   */
+  //private static final String CQ = "SELECT * FROM "+Region.SEPARATOR+REGION_NAME;
+  private static final String CQ = "SELECT * FROM "+Region.SEPARATOR+REGION_NAME + " p where p.intVar < 9";
+    
+  private static int numValidCqEvents = 0;
+  static boolean lastKeyReceived = false;
+  private static boolean queryUpdateExecuted = false;
+  private static boolean queryDestroyExecuted = false;
+  private static boolean notADeltaInstanceObj = false;
+
+  public PRDeltaPropagationDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+    Host host = Host.getHost(0);
+    dataStore1 = host.getVM(0);
+    dataStore2 = host.getVM(1);
+    client1 = host.getVM(2);
+    dataStore3 = host.getVM(3);
+    
+    DeltaTestImpl.resetDeltaInvokationCounters();
+    dataStore1.invoke(PRDeltaPropagationDUnitTest.class,
+        "resetAll");
+    dataStore2.invoke(PRDeltaPropagationDUnitTest.class,
+        "resetAll");
+    dataStore3.invoke(PRDeltaPropagationDUnitTest.class,
+    "resetAll");
+  }
+
+  /**
+   *  1) Put delta objects on accessor node.
+   *  2) From accessor to primary delta gets propagated as part of <code>PutMessage</code> delta.
+   *  3) From primary to secondary delta gets propagated as part RR distribution.
+   * 
+   */
+  public void testDeltaPropagationForPR() throws Throwable {
+    createCacheInAllPRVms();
+    createDeltaPR(Boolean.FALSE);
+    put();
+    Boolean deltaUsed1 = (Boolean)dataStore1.invoke(
+        PRDeltaPropagationDUnitTest.class, "checkForDelta");
+    Boolean deltaUsed2 = (Boolean)dataStore2.invoke(
+        PRDeltaPropagationDUnitTest.class, "checkForDelta");
+    assertTrue("Delta Propagation Not Used in PR", (deltaUsed1 && deltaUsed2));
+  }
+
+  /**
+   * Check delta propagation works properly with PR failover.    
+   */
+
+  public void testDeltaPropagationForPRFailover() throws Throwable {
+    Object args[] = new Object[] { REGION_NAME, new Integer(1), new Integer(50),
+        new Integer(8), Boolean.FALSE, null };
+    Integer port1 = (Integer)dataStore1.invoke(
+        PRDeltaPropagationDUnitTest.class, "createCacheServerWithPR", args);
+    Integer port2 = (Integer)dataStore2.invoke(
+        PRDeltaPropagationDUnitTest.class, "createCacheServerWithPR", args);
+    // Do puts after slowing the dispatcher.
+    dataStore1.invoke(ConflationDUnitTest.class, "setIsSlowStart",
+        new Object[] { "60000" });
+    dataStore2.invoke(ConflationDUnitTest.class, "setIsSlowStart",
+        new Object[] { "60000" });
+    createClientCache(port1,port2);
+    client1.invoke(PRDeltaPropagationDUnitTest.class,"createClientCache", new Object[] {port1,port2});
+    
+    int deltaSent = putsWhichReturnsDeltaSent();
+    
+    VM primary = null;
+    VM secondary = null;
+    if (pool.getPrimaryPort() == port1) {
+      primary = dataStore1;
+      secondary = dataStore2;
+    }
+    else {
+      primary = dataStore2;
+      secondary = dataStore1;
+    }
+    
+    primary.invoke(PRDeltaPropagationDUnitTest.class, "closeCache");
+    Thread.sleep(5000);    
+    secondary.invoke(ConflationDUnitTest.class, "unsetIsSlowStart");
+    
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "waitForLastKey");    
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "checkDeltaInvoked", new Object[]{new Integer(deltaSent)});    
+  }
+
+  public void testDeltaPropagationForPRFailoverWithCompression() throws Throwable {
+    Object args[] = new Object[] { REGION_NAME, new Integer(1), new Integer(50),
+        new Integer(8), Boolean.FALSE, compressor };
+    Integer port1 = (Integer)dataStore1.invoke(
+        PRDeltaPropagationDUnitTest.class, "createCacheServerWithPR", args);
+    Integer port2 = (Integer)dataStore2.invoke(
+        PRDeltaPropagationDUnitTest.class, "createCacheServerWithPR", args);
+    
+    dataStore1.invoke(new SerializableRunnable() {
+      public void run() { assertTrue(cache.getRegion(REGION_NAME).getAttributes().getCompressor() != null); }
+      });
+
+    // Do puts after slowing the dispatcher.    
+    dataStore1.invoke(ConflationDUnitTest.class, "setIsSlowStart",
+        new Object[] { "60000" });
+    dataStore2.invoke(ConflationDUnitTest.class, "setIsSlowStart",
+        new Object[] { "60000" });
+    createClientCache(port1,port2);
+    client1.invoke(PRDeltaPropagationDUnitTest.class,"createClientCache", new Object[] {port1,port2});
+    
+    int deltaSent = putsWhichReturnsDeltaSent();
+    
+    VM primary = null;
+    VM secondary = null;
+    if (pool.getPrimaryPort() == port1) {
+      primary = dataStore1;
+      secondary = dataStore2;
+    }
+    else {
+      primary = dataStore2;
+      secondary = dataStore1;
+    }
+    
+    primary.invoke(PRDeltaPropagationDUnitTest.class, "closeCache");
+    Thread.sleep(5000);    
+    secondary.invoke(ConflationDUnitTest.class, "unsetIsSlowStart");
+    
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "waitForLastKey");    
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "checkDeltaInvoked", new Object[]{new Integer(deltaSent)});    
+  }
+  
+  /**
+   * Check full object gets resend if delta can not be applied    
+   */
+
+  public void testDeltaPropagationForPRWithExpiry() throws Throwable {
+    createCacheInAllPRVms();
+    createDeltaPR(Boolean.TRUE);
+    putWithExpiry();
+    dataStore1.invoke(PRDeltaPropagationDUnitTest.class, "checkForFullObject");
+    dataStore2.invoke(PRDeltaPropagationDUnitTest.class, "checkForFullObject");
+  }
+
+  /**
+   *  1) Put delta objects on client feeder connected PR accessor bridge server.
+   *  2) From accessor to data store delta gets propagated as part of <code>PutMessage</code> delta.
+   *  3) From data store to client delta should get propagated.
+   * 
+   */
+  public void testDeltaPropagationPRAccessorAsBridgeServer() throws Throwable {
+    Object args1[] = new Object[] { REGION_NAME, new Integer(0), new Integer(0),
+        new Integer(8), Boolean.FALSE, null };
+    Object args2[] = new Object[] { REGION_NAME, new Integer(0), new Integer(50),
+        new Integer(8), Boolean.FALSE, null };
+    Integer port2 = (Integer)dataStore2.invoke(
+        PRDeltaPropagationDUnitTest.class, "createCacheServerWithPR", args2);
+    Integer port1 = (Integer)dataStore1.invoke(
+        PRDeltaPropagationDUnitTest.class, "createCacheServerWithPR", args1);
+    createClientCache(port1, new Boolean(true), new Boolean(false), new Boolean(false));
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "createClientCache",
+        new Object[] { port2, new Boolean(true), new Boolean(false), new Boolean(false)});    
+    int deltaSent = putsWhichReturnsDeltaSent();
+    
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "waitForLastKey");    
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "checkDeltaInvoked", new Object[]{new Integer(deltaSent)});    
+  }
+  
+  /**
+   * 1) Put delta objects on client feeder connected PR accessor bridge server.
+   * 2) From accessor to data store delta gets propagated as part of
+   * <code>PutMessage</code> delta.
+   * 3) Exception occurs when applying delta on
+   * datastore node. This invalid delta exception propagated back to client
+   * through accessor. 
+   * 4) Client sends full object in response.
+   * 
+   */
+  public void testDeltaPropagationPRAccessorAsBridgeServerWithDeltaException() throws Throwable {
+    Object args1[] = new Object[] { REGION_NAME, new Integer(0), new Integer(0),
+        new Integer(8), Boolean.FALSE, null };
+    Object args2[] = new Object[] { REGION_NAME, new Integer(0), new Integer(50),
+        new Integer(8), Boolean.FALSE, null };
+    Integer port2 = (Integer)dataStore2.invoke(
+        PRDeltaPropagationDUnitTest.class, "createCacheServerWithPR", args2);
+    Integer port1 = (Integer)dataStore1.invoke(
+        PRDeltaPropagationDUnitTest.class, "createCacheServerWithPR", args1);
+    createClientCache(port1, new Boolean(false), new Boolean(false),  new Boolean(false));
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "createClientCache",
+        new Object[] { port2, new Boolean(true) , new Boolean(false), new Boolean(false)});    
+
+    // feed delta
+    DeltaTestImpl test = new DeltaTestImpl();
+    deltaPR.put(DELTA_KEY, test);
+
+    test.setIntVar(10);
+    deltaPR.put(DELTA_KEY, test);
+
+    // perform invalidate on accessor
+    dataStore2.invoke(PRDeltaPropagationDUnitTest.class, "invalidateDeltaKey");
+    
+    /*Thread.sleep(2000);*/
+
+    test = new DeltaTestImpl();
+    test.setStr("DELTA");
+    deltaPR.put(DELTA_KEY, test);
+
+/*    putWithExpiry();*/    
+    deltaPR.put(LAST_KEY, "");    
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "waitForLastKey");    
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "checkForFullObject");    
+  }
+  
+  /**
+   * 1) Put delta objects on client feeder with data policy as empty, connected PR accessor bridge server.
+   * 2) From accessor to data store delta gets propagated as part of
+   * <code>PutMessage</code> delta.
+   * 3) Exception occurs when applying delta on
+   * datastore node. This invalid delta exception propagated back to client
+   * through accessor. 
+   * 4) Client sends full object in response.
+   * 
+   */
+  public void testDeltaPropagationClientEmptyPRAccessorAsBridgeServerWithDeltaException()
+      throws Throwable {
+    Object args1[] = new Object[] { REGION_NAME, new Integer(0),
+        new Integer(0), new Integer(8), Boolean.FALSE, null };
+    Object args2[] = new Object[] { REGION_NAME, new Integer(0),
+        new Integer(50), new Integer(8), Boolean.FALSE, null };
+    Integer port2 = (Integer)dataStore2.invoke(
+        PRDeltaPropagationDUnitTest.class, "createCacheServerWithPR", args2);
+    Integer port1 = (Integer)dataStore1.invoke(
+        PRDeltaPropagationDUnitTest.class, "createCacheServerWithPR", args1);
+    createClientCache(port1, new Boolean(false), new Boolean(true),  new Boolean(false));
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "createClientCache",
+        new Object[] { port2, new Boolean(true), new Boolean(false), new Boolean(false)});
+    
+    // feed delta
+    DeltaTestImpl test = new DeltaTestImpl();
+    deltaPR.put(DELTA_KEY, test);
+
+    test.setIntVar(10);
+    deltaPR.put(DELTA_KEY, test);
+
+    // perform invalidate on accessor
+    dataStore2.invoke(PRDeltaPropagationDUnitTest.class, "invalidateDeltaKey");
+
+    test = new DeltaTestImpl();
+    test.setStr("DELTA");
+    deltaPR.put(DELTA_KEY, test);
+    
+    deltaPR.put(LAST_KEY, "");
+    
+    checkToDeltaCounter(new Integer(2));
+    
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "waitForLastKey");
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "checkForFullObject");
+    
+  }
+  
+  /**
+   * 1) Put delta objects on client feeder connected accessor bridge server.
+   * 2) From accessor to data store delta gets propagated as part of
+   * <code>UpdateMessage</code> delta. 
+   * 3) Exception occurs when applying delta on
+   * datastore node. This invalid delta exception propagated back to client
+   * through accessor. 
+   * 4) Client sends full object in response.
+   * 
+   */
+  public void testDeltaPropagationReplicatedRegionPeerWithDeltaException() throws Throwable {
+    Object args1[] = new Object[] {Boolean.FALSE, Boolean.TRUE};
+    Object args2[] = new Object[] {Boolean.TRUE, Boolean.FALSE};
+//  server 1 with empty data policy
+    Integer port1 = (Integer)dataStore1.invoke(
+        PRDeltaPropagationDUnitTest.class, "createServerCache", args1);
+    
+    // server 2 with non empty data policy
+   dataStore2.invoke(
+        PRDeltaPropagationDUnitTest.class, "createServerCache", args2);
+    
+    createClientCache(port1, Boolean.FALSE, Boolean.FALSE,  Boolean.FALSE);
+
+    // feed delta
+    DeltaTestImpl test = new DeltaTestImpl();
+    deltaPR.put(DELTA_KEY, test);
+
+    test.setIntVar(10);
+    deltaPR.put(DELTA_KEY, test);
+
+    // perform invalidate on accessor
+    dataStore2.invoke(PRDeltaPropagationDUnitTest.class, "invalidateDeltaKey");
+
+    test = new DeltaTestImpl();
+    test.setStr("DELTA");
+    deltaPR.put(DELTA_KEY, test);
+
+    deltaPR.put(LAST_KEY, "");
+    
+    dataStore2.invoke(PRDeltaPropagationDUnitTest.class, "waitForLastKey");
+    // check and reset isFailed flag
+    dataStore2.invoke(PRDeltaPropagationDUnitTest.class, "checkIsFailed");
+    
+    dataStore2.invoke(PRDeltaPropagationDUnitTest.class, "fromDeltaCounter",
+        new Object[] { new Integer(1) });
+  }
+  
+  /**
+   * 1) Put delta objects on feeder connected accessor bridge server.
+   * 2) Second client attached to datastore. Register CQ.
+   * 3) Varifies that no data loss, event revcieved on second client 
+   */
+  public void testCqClientConnectAccessorAndDataStore()
+      throws Throwable {
+    Object args1[] = new Object[] { REGION_NAME, new Integer(1),
+        new Integer(0), new Integer(8), Boolean.FALSE, null };
+    Object args2[] = new Object[] { REGION_NAME, new Integer(1),
+        new Integer(50), new Integer(8), Boolean.FALSE, null };
+    Integer port2 = (Integer)dataStore2.invoke(PRDeltaPropagationDUnitTest.class,
+        "createCacheServerWithPR", args2);
+    Integer port1 = (Integer)dataStore1.invoke(
+        PRDeltaPropagationDUnitTest.class, "createCacheServerWithPR", args1);
+
+    // client attached to accessor server1
+    createClientCache(port1, new Boolean(false), new Boolean(true),
+        new Boolean(false));
+    
+    // enable CQ listner validation for this test for this client
+    client1.invoke(PRDeltaPropagationDUnitTest.class,
+        "setForOldNewCQVarification", new Object[] { new Boolean(true) });
+    
+    // Not registering any interest but register cq server2
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "createClientCache",
+        new Object[] { port2, new Boolean(false), new Boolean(false),
+            new Boolean(true) });
+    
+    // check cloning is disabled
+    dataStore1.invoke(PRDeltaPropagationDUnitTest.class, "checkCloning");
+    dataStore2.invoke(PRDeltaPropagationDUnitTest.class, "checkCloning");
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "checkCloning");
+    checkCloning();
+    
+    // feed delta
+    DeltaTestImpl test = new DeltaTestImpl(8, "");
+    deltaPR.put(DELTA_KEY, test);
+
+    test.setIntVar(10);
+    deltaPR.put(DELTA_KEY, test);
+
+    deltaPR.put(LAST_KEY, new DeltaTestImpl(5, ""));
+    
+    // wait for last key
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "waitForLastKey");
+    // full object, server will send full object as only CQ are registered
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "fromDeltaCounter",
+        new Object[] { new Integer(0) });
+    boolean failed = ((Boolean)client1.invoke(
+        PRDeltaPropagationDUnitTest.class, "isFailed")).booleanValue();
+    // no cq events should get miss
+    assertTrue("EVENT Missed", failed == true);
+    
+    // region size should be zero in second client as no registration happens
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "checkRegionSize",
+        new Object[] { new Integer(0)});
+  }
+  
+  /**
+   * Toplogy: PR: Accessor, dataStore.
+   * client and client1 connected to PR accessor; 
+   * client puts delta objects on dataStore via accessor
+   * Accesor gets adjunctMessage about put
+   * Verify on client1 that queryUpdate and queryDestroy are executed properly
+   */
+  public void testClientOnAccessorReceivesCqEvents()
+      throws Throwable {
+    Object args1[] = new Object[] { REGION_NAME, new Integer(1),
+        new Integer(0), new Integer(8), Boolean.FALSE, null };
+    Object args2[] = new Object[] { REGION_NAME, new Integer(1),
+        new Integer(50), new Integer(8), Boolean.FALSE, null };
+    dataStore2.invoke(PRDeltaPropagationDUnitTest.class,
+        "createCacheServerWithPR", args2);
+    Integer port1 = (Integer)dataStore1.invoke(
+        PRDeltaPropagationDUnitTest.class, "createCacheServerWithPR", args1);
+
+    // both clients are attached to accessor
+    createClientCache(port1, new Boolean(false), new Boolean(true),
+        new Boolean(false));
+    // no register interest but register cq
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "createClientCache",
+        new Object[] { port1, new Boolean(false), new Boolean(false),
+            new Boolean(true) });
+
+    // feed delta
+    // This delta obj satisfies CQ
+    DeltaTestImpl test = new DeltaTestImpl(8,"");
+    deltaPR.put(DELTA_KEY, test);
+
+    // newValue does not satisfy CQ while oldValue does
+    test.setIntVar(10);
+    deltaPR.put(DELTA_KEY, test);
+
+    deltaPR.put(LAST_KEY, new DeltaTestImpl(8,""));
+
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "waitForLastKey");
+    boolean flag = ((Boolean)client1.invoke(PRDeltaPropagationDUnitTest.class,
+        "verifyQueryUpdateExecuted")).booleanValue();
+    assertTrue("client update cq not executed properly", flag);
+    flag = ((Boolean)client1.invoke(PRDeltaPropagationDUnitTest.class,
+        "verifyQueryDestroyExecuted")).booleanValue();
+    assertTrue("client destroy cq not executed properly", flag);        
+  }
+
+  /**
+   * Toplogy: PR: Accessor,DataStore,Bridge server;
+   * configured for 2 buckets and redundancy 1
+   * DataStore has primary while BridgeServer has secondary of bucket.
+   * client connects to PR Accessor
+   * client1 connects to PR BridgeServer
+   * client1 registers CQ
+   * client puts delta objects on accessor
+   * Verify on client1 that queryUpdate and queryDestroy are executed properly
+   */  
+  public void testCQClientOnRedundantBucketReceivesCQEvents()
+      throws Throwable {
+    // args for accessor
+    Object args1[] = new Object[] { REGION_NAME, new Integer(1),
+        new Integer(0), new Integer(2), Boolean.FALSE, null };
+    // args for dataStore with 2 buckets
+    Object args2[] = new Object[] { REGION_NAME, new Integer(1),
+        new Integer(50), new Integer(2), Boolean.FALSE, null };
+      
+    // dataStore2 is DataStore
+    // implicit put of DELTA_KEY creates primary bucket on dataStore2
+    dataStore2.invoke(PRDeltaPropagationDUnitTest.class,
+        "createCacheServerWithPR", args2);
+    // dataStore3 is BridgeServer
+    // this has secondary bucket
+    Integer port3 = (Integer)dataStore3.invoke(
+        PRDeltaPropagationDUnitTest.class, "createCacheServerWithPR", args2);
+    // dataStore1 is accessor
+    Integer port1 = (Integer)dataStore1.invoke(
+        PRDeltaPropagationDUnitTest.class, "createCacheServerWithPR", args1);
+  
+    // this client is attached to accessor - (port1)
+    createClientCache(port1, new Boolean(false), new Boolean(true),
+        new Boolean(false));
+    // client1 is attached to BridgeServer dataStore3
+    // client1 does not registerInterest but registers cq
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "createClientCache",
+        new Object[] { port3, new Boolean(false), new Boolean(false),
+            new Boolean(true) });
+
+    // create delta keys (1 primary 1 redundant bucket on each dataStore)
+    DeltaTestImpl test = new DeltaTestImpl(8, "");
+    deltaPR.put(DELTA_KEY, test);
+
+    test.setIntVar(10);
+    deltaPR.put(DELTA_KEY, test);
+
+    deltaPR.put(LAST_KEY, new DeltaTestImpl(8, ""));
+  
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "waitForLastKey");
+    // verify no delta is sent by server to client1
+    dataStore3.invoke(PRDeltaPropagationDUnitTest.class, "verifyDeltaSent",
+        new Object[] { Integer.valueOf(1) });
+    boolean flag = ((Boolean)client1.invoke(PRDeltaPropagationDUnitTest.class,
+        "verifyQueryUpdateExecuted")).booleanValue();
+    assertTrue("client update cq not executed properly", flag);
+    flag = ((Boolean)client1.invoke(PRDeltaPropagationDUnitTest.class,
+        "verifyQueryDestroyExecuted")).booleanValue();
+    assertTrue("client destroy cq not executed properly", flag);        
+  }
+
+  /**
+   * Toplogy: PR: Accessor,DataStore,Bridge server;
+   * configured for 2 buckets and redundancy 1
+   * DataStore has primary while BridgeServer has secondary of bucket.
+   * client connects to PR Accessor
+   * client1 connects to PR BridgeServer
+   * client1 registers Interest as well as CQ
+   * client puts delta objects on accessor
+   * Verify that client1 receives 2 deltas for 2 updates (due to RI)
+   * Verify on client1 that queryUpdate and queryDestroy are executed properly
+   */  
+  public void testCQRIClientOnRedundantBucketReceivesDeltaAndCQEvents()
+      throws Throwable {
+    // args for accessor
+    Object args1[] = new Object[] { REGION_NAME, new Integer(1),
+        new Integer(0), new Integer(2), Boolean.FALSE, null };
+    // args for dataStore with 2 buckets
+    Object args2[] = new Object[] { REGION_NAME, new Integer(1),
+        new Integer(50), new Integer(2), Boolean.FALSE, null };    
+  
+    // dataStore2 is DataStore
+    // implicit put of DELTA_KEY creates primary bucket on dataStore2
+    dataStore2.invoke(PRDeltaPropagationDUnitTest.class,
+        "createCacheServerWithPR", args2);
+    // dataStore3 is BridgeServer
+    // this has secondary bucket
+    Integer port3 = (Integer)dataStore3.invoke(
+        PRDeltaPropagationDUnitTest.class, "createCacheServerWithPR", args2);
+    // dataStore1 is accessor
+    Integer port1 = (Integer)dataStore1.invoke(
+        PRDeltaPropagationDUnitTest.class, "createCacheServerWithPR", args1);
+  
+    // this client is attached to accessor - (port1)
+    createClientCache(port1, new Boolean(false), new Boolean(true),
+        new Boolean(false));
+    // client1 is attached to BridgeServer dataStore3
+    // client1 registers Interest as well as cq
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "createClientCache",
+        new Object[] { port3, new Boolean(true), new Boolean(false),
+            new Boolean(true) });
+
+    // create delta keys (1 primary 1 redundant bucket on each dataStore)
+    DeltaTestImpl test = new DeltaTestImpl(8, "");
+    deltaPR.put(DELTA_KEY, test);
+
+    test.setIntVar(10);
+    deltaPR.put(DELTA_KEY, test);
+  
+    deltaPR.put(LAST_KEY, new DeltaTestImpl(8, ""));
+  
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "waitForLastKey");
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "fromDeltaCounter",
+        new Object[] { new Integer(1) });
+    boolean flag = ((Boolean)client1.invoke(PRDeltaPropagationDUnitTest.class,
+        "verifyQueryUpdateExecuted")).booleanValue();
+    assertTrue("client update cq not executed properly", flag);
+    flag = ((Boolean)client1.invoke(PRDeltaPropagationDUnitTest.class,
+        "verifyQueryDestroyExecuted")).booleanValue();
+    assertTrue("client destroy cq not executed properly", flag);        
+  }
+
+  /**
+   *  1) Put delta objects on client feeder connected to PR accessor bridge server.
+   *  2) From accessor to data store delta gets propagated as part of <code>PutMessage</code> delta.
+   *  3) From data store to accessor delta + full value gets propagated as part of Adjunct Message.
+   *  4) From accessor to client delta should get propagated.
+   * 
+   */
+  public void testDeltaPropagationWithAdjunctMessaging() throws Throwable {
+    Object args1[] = new Object[] { REGION_NAME, new Integer(0), new Integer(0),
+        new Integer(8), Boolean.FALSE, null };
+    Object args2[] = new Object[] { REGION_NAME, new Integer(0), new Integer(50),
+        new Integer(8), Boolean.FALSE, null };
+    dataStore2.invoke(PRDeltaPropagationDUnitTest.class,
+        "createCacheServerWithPR", args2);
+    Integer port1 = (Integer)dataStore1.invoke(
+        PRDeltaPropagationDUnitTest.class, "createCacheServerWithPR", args1);
+    createClientCache(port1, new Boolean(true), new Boolean(false), new Boolean(false));
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "createClientCache",
+        new Object[] { port1, new Boolean(true), new Boolean(false), new Boolean(false)});    
+    int deltaSent = putsWhichReturnsDeltaSent();
+    
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "waitForLastKey");    
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "checkDeltaInvoked", new Object[]{new Integer(deltaSent)});    
+  }
+  
+  /**
+   *  1) Accessor is a Feeder.From accessor to data store delta gets propagated as part of <code>PutMessage</code> delta.
+   *  2) From data store to accessor delta + full value gets propagted as part of Adjunct Message.
+   *  3) From accessor to a client with data policy normal delta should get propagated.
+   *  4) From accessor to client with data policy empty full value should get propagated.
+   * 
+   */
+  public void testDeltaPropagationWithAdjunctMessagingForEmptyClient() throws Throwable {
+    Object args1[] = new Object[] { REGION_NAME, new Integer(0), new Integer(0),
+        new Integer(8), Boolean.FALSE, null };
+    Object args2[] = new Object[] { REGION_NAME, new Integer(0), new Integer(50),
+        new Integer(8), Boolean.FALSE, null };
+    dataStore2.invoke(PRDeltaPropagationDUnitTest.class,
+        "createCacheServerWithPR", args2);
+    Integer port1 = (Integer)dataStore1.invoke(
+        PRDeltaPropagationDUnitTest.class, "createCacheServerWithPR", args1);
+    //Empty data policy on client
+    createClientCache(port1, new Boolean(true), new Boolean(true), new Boolean(false));
+    
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "createClientCache",
+        new Object[] { port1, new Boolean(true), new Boolean(false), new Boolean(false)});    
+    
+    //Feed on an accessor
+    int deltaSent =  (Integer)dataStore1.invoke(
+        PRDeltaPropagationDUnitTest.class,"putsWhichReturnsDeltaSent");
+    
+    waitForLastKey();
+    checkDeltaInvoked(new Integer(0));
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "waitForLastKey");    
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "checkDeltaInvoked", new Object[]{new Integer(deltaSent)});    
+  }
+  
+  /**
+   *  1) One accessor and one datastore is defined with a PR with zero redundant copies.
+   *  2) Client is connected only to the accessor.
+   *  3) One delta put is performed on datastore.
+   *  4) Flag to cause toDelta() throw an exception is set on datastore.
+   *  5) Another delta put is performed on datastore.
+   *  6) Verify that the second delta put fails and value on datastore is same as the one put by first delta update. 
+   */
+  public void testDeltaPropagationWithAdjunctMessagingAndBadDelta() throws Throwable {
+    Object accessor[] = new Object[] { REGION_NAME, 0, 0, 8, Boolean.FALSE, null };
+    Object dataStore[] = new Object[] { REGION_NAME, 0, 50, 8, Boolean.FALSE, null };
+
+    dataStore2.invoke(PRDeltaPropagationDUnitTest.class,
+        "createCacheServerWithPR", dataStore);
+    Integer port1 = (Integer)dataStore1.invoke(
+        PRDeltaPropagationDUnitTest.class, "createCacheServerWithPR", accessor);
+
+    createClientCache(port1, true, false, false);
+
+    PRDeltaTestImpl val1 = new PRDeltaTestImpl();
+    val1.setIntVar(11);
+    dataStore2.invoke(PRDeltaPropagationDUnitTest.class, "put", new Object[]{val1});
+
+    dataStore2.invoke(PRDeltaPropagationDUnitTest.class, "setBadToDelta", new Object[]{true});
+    try {
+      PRDeltaTestImpl val2 = new PRDeltaTestImpl();
+      val2.setIntVar(22);
+      dataStore2.invoke(PRDeltaPropagationDUnitTest.class, "put", new Object[]{val2});
+      fail("Did not expect successful delta put.");
+    } catch (Exception e) {
+      // expected
+    }
+    dataStore2.invoke(PRDeltaPropagationDUnitTest.class, "checkVal", new Object[]{val1});
+  }
+  
+  public static void checkToDeltaCounter(Integer count) {
+    assertTrue("ToDelta counters do not match, expected: " + count.intValue()
+        + ", actual: " + DeltaTestImpl.getToDeltaInvokations(), DeltaTestImpl
+        .getToDeltaInvokations() == count.intValue());
+    DeltaTestImpl.resetDeltaInvokationCounters();
+  }
+
+  
+  
+  // check and reset delta counters
+  public static void fromDeltaCounter(Integer count) {
+    assertTrue("FromDelta counters do not match, expected: " + count.intValue()
+        + ", but actual: " + DeltaTestImpl.getFromDeltaInvokations(),
+        DeltaTestImpl.getFromDeltaInvokations() == count.intValue());
+    DeltaTestImpl.resetDeltaInvokationCounters();
+  }
+  
+  public static void checkIsFailed() {
+    assertFalse("Full value is not recieved by server", isFailed);
+  }
+  
+  public static Boolean isFailed() {
+    return isFailed;
+  }
+  
+  public static void checkRegionSize(Integer i) {
+    assertTrue("Region size is not zero ",
+        cache.getRegion(REGION_NAME).size() == i);
+  }
+  
+  public static void checkCloning() {
+    assertFalse("Cloning is enabled ", cache.getRegion(REGION_NAME)
+        .getAttributes().getCloningEnabled());
+  }
+  
+  public static void invalidateDeltaKey(){
+    deltaPR.invalidate(DELTA_KEY);
+  }
+  
+  public static void createCacheInVm() {
+    new PRDeltaPropagationDUnitTest("temp").createCache(new Properties());
+  }
+
+  public void createCache(Properties props) {
+    try {
+      DistributedSystem ds = getSystem(props);
+      assertNotNull(ds);
+      ds.disconnect();
+      ds = getSystem(props);
+      cache = CacheFactory.create(ds);
+      assertNotNull(cache);
+    }
+    catch (Exception e) {
+      fail("Failed while creating the cache", e);
+    }
+  }
+
+  private static void createDeltaPR(Boolean flag) {
+    Object args[] = new Object[] { "DeltaPR", new Integer(1), new Integer(50),
+        new Integer(8), flag, null };
+    createPR("DeltaPR", new Integer(1), new Integer(0), new Integer(8), flag, null);
+    dataStore1.invoke(PRDeltaPropagationDUnitTest.class, "createPR", args);
+    dataStore2.invoke(PRDeltaPropagationDUnitTest.class, "createPR", args);
+
+  }
+
+  public static void createPR(String partitionedRegionName, Integer redundancy,
+      Integer localMaxMemory, Integer totalNumBuckets, Boolean setExpiry, Compressor compressor) {
+
+    PartitionAttributesFactory paf = new PartitionAttributesFactory();
+    PartitionAttributes prAttr = paf.setRedundantCopies(redundancy.intValue())
+        .setLocalMaxMemory(localMaxMemory.intValue()).setTotalNumBuckets(
+            totalNumBuckets.intValue()).create();
+    AttributesFactory attr = new AttributesFactory();
+    attr.setPartitionAttributes(prAttr);
+    attr.setDataPolicy(DataPolicy.PARTITION);
+    attr.setConcurrencyChecksEnabled(true);
+    if (setExpiry) {
+      attr.setStatisticsEnabled(true);
+      attr.setEntryIdleTimeout(new ExpirationAttributes(1,
+          ExpirationAction.INVALIDATE));
+    }
+    if (compressor != null) {
+      attr.setCompressor(compressor);
+    }
+    //attr.setEvictionAttributes(EvictionAttributes.createLRUEntryAttributes(5));
+    assertNotNull(cache);
+    deltaPR = cache.createRegion(partitionedRegionName, attr.create());
+    assertNotNull(deltaPR);
+    getLogWriter().info(
+        "Partitioned Region " + partitionedRegionName
+            + " created Successfully :" + deltaPR);
+  }
+
+  public static Integer createCacheServerWithPR(String partitionedRegionName,
+      Integer redundancy, Integer localMaxMemory, Integer totalNumBuckets,
+      Boolean setExpiry, Compressor compressor) {
+    new PRDeltaPropagationDUnitTest("temp").createCache(new Properties());
+    createPR(partitionedRegionName, redundancy, localMaxMemory,
+        totalNumBuckets, setExpiry, compressor);
+    assertNotNull(deltaPR);
+    deltaPR.put(DELTA_KEY, new PRDeltaTestImpl());
+    
+    CacheServer server1 = cache.addCacheServer();
+    assertNotNull(server1);
+    int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    server1.setPort(port);
+    try {
+      server1.start();
+    }
+    catch (IOException e) {
+      fail("Failed to start the Server", e);
+    }
+    assertTrue(server1.isRunning());
+    return new Integer(server1.getPort());
+  }
+
+  public static Integer createServerCache(Boolean isListAttach,
+      Boolean isEmpty) throws Exception {
+
+    Properties props = new Properties();
+    new PRDeltaPropagationDUnitTest("temp").createCache(props);
+    AttributesFactory factory = new AttributesFactory();
+    factory.setScope(Scope.DISTRIBUTED_ACK);
+    factory.setConcurrencyChecksEnabled(true);
+    if (isEmpty.booleanValue()) {
+      factory.setDataPolicy(DataPolicy.EMPTY);
+    }
+    else {
+      factory.setDataPolicy(DataPolicy.REPLICATE);
+    }
+    
+    lastKeyReceived = false;
+    RegionAttributes attrs = factory.create();
+    deltaPR = cache.createRegion(REGION_NAME, attrs);
+    AttributesMutator am = deltaPR.getAttributesMutator();
+    if (isListAttach.booleanValue()) {
+      am.addCacheListener(new CacheListenerAdapter() {
+        public void afterCreate(EntryEvent event) {
+          if (event.getNewValue() == null)
+            isFailed = true;
+
+          if (event.getKey().equals(LAST_KEY)) {
+            lastKeyReceived = true;
+          }
+        }
+        
+        public void afterUpdate(EntryEvent event) {
+          if (event.getNewValue() == null)
+            isFailed = true;
+          }
+      });
+    }
+
+    CacheServer server = cache.addCacheServer();
+    int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    server.setPort(port);
+    // ensures updates to be sent instead of invalidations
+    server.setNotifyBySubscription(true);
+    server.start();
+    return new Integer(server.getPort());
+  }
+  
+  public static void createClientCache(Integer port1,
+      Boolean subscriptionEnable, Boolean isEmpty, Boolean isCq) throws Exception {
+    PRDeltaPropagationDUnitTest test = new PRDeltaPropagationDUnitTest("temp");
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "");
+    test.createCache(props);
+
+    lastKeyReceived = false;
+    queryUpdateExecuted = false;
+    queryDestroyExecuted = false;
+    notADeltaInstanceObj = false;
+    isFailed = false;
+    procced = false;
+    numValidCqEvents=0;
+    PoolImpl p = (PoolImpl)PoolManager.createFactory().addServer("localhost",
+        port1).setSubscriptionEnabled(true)
+        .setSubscriptionRedundancy(0).setThreadLocalConnections(true)
+        .setMinConnections(6).setReadTimeout(20000).setPingInterval(10000)
+        .setRetryAttempts(5).create("PRDeltaPropagationDUnitTestPool");
+
+    AttributesFactory factory = new AttributesFactory();
+    factory.setScope(Scope.LOCAL);
+    factory.setConcurrencyChecksEnabled(true);
+    
+    if(isEmpty.booleanValue()){
+      factory.setSubscriptionAttributes(new SubscriptionAttributes(
+          InterestPolicy.ALL));
+      factory.setDataPolicy(DataPolicy.EMPTY);
+    }
+    
+    factory.setPoolName(p.getName());
+    factory.setCloningEnabled(false);
+    factory.addCacheListener(new CacheListenerAdapter(){
+    public void afterCreate(EntryEvent event) {
+        if (LAST_KEY.equals(event.getKey())) {          
+        lastKeyReceived = true;
+      }}});
+
+    RegionAttributes attrs = factory.create();
+    deltaPR = cache.createRegion(REGION_NAME, attrs);
+    //deltaPR.create(DELTA_KEY, new PRDeltaTestImpl());
+    if(subscriptionEnable.booleanValue())
+      deltaPR.registerInterest("ALL_KEYS");
+    pool = p;
+    if (isCq.booleanValue()) {
+      CqAttributesFactory cqf = new CqAttributesFactory();
+      CqListenerAdapter cqlist = new CqListenerAdapter() {
+        @SuppressWarnings("synthetic-access")
+        public void onEvent(CqEvent cqEvent) {
+          if (LAST_KEY.equals(cqEvent.getKey().toString())) {
+            lastKeyReceived = true;
+          }
+          else if (!(cqEvent.getNewValue() instanceof Delta)) {
+            notADeltaInstanceObj = true;
+          } 
+          else if( cqEvent.getQueryOperation().isUpdate() &&
+              cqEvent.getBaseOperation().isUpdate() &&
+              DELTA_KEY.equals(cqEvent.getKey().toString())) {            
+            queryUpdateExecuted = true;            
+          } 
+          else if( cqEvent.getQueryOperation().isDestroy() &&
+              cqEvent.getBaseOperation().isUpdate() &&
+              DELTA_KEY.equals(cqEvent.getKey().toString())) {            
+            queryDestroyExecuted = true;
+          }
+          
+          if (forOldNewCQVarification) {
+            if (DELTA_KEY.equals(cqEvent.getKey().toString())) {
+              if(numValidCqEvents == 0 && ((DeltaTestImpl)cqEvent
+                  .getNewValue()).getIntVar() == 8){
+                procced = true;
+              }else if (procced && numValidCqEvents == 1 && ((DeltaTestImpl)cqEvent
+                  .getNewValue()).getIntVar() == 10) {
+                // this tell us that every thing is fine
+                isFailed = true;
+              }
+            }
+          }
+          numValidCqEvents++;
+        }
+      };  
+      cqf.addCqListener(cqlist);
+      CqAttributes cqa = cqf.create();
+      CqQuery cq = cache.getQueryService().newCq("CQ_Delta", CQ, cqa);
+      cq.execute();
+    }
+  }
+
+  public static void createClientCache(Integer port1, Integer port2) throws Exception {
+    PRDeltaPropagationDUnitTest test = new PRDeltaPropagationDUnitTest("temp");
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "");
+    test.createCache(props);
+
+    lastKeyReceived = false;
+    
+    PoolImpl p = (PoolImpl)PoolManager.createFactory().addServer("localhost",
+        port1).addServer("localhost", port2).setSubscriptionEnabled(true)
+        .setSubscriptionRedundancy(1).setThreadLocalConnections(true)
+        .setMinConnections(6).setReadTimeout(20000).setPingInterval(10000)
+        .setRetryAttempts(5).create("PRDeltaPropagationDUnitTestPool");
+
+    AttributesFactory factory = new AttributesFactory();
+    factory.setScope(Scope.LOCAL);
+    factory.setPoolName(p.getName());
+    factory.setCloningEnabled(false);
+    factory.setConcurrencyChecksEnabled(true);
+    factory.addCacheListener(new CacheListenerAdapter(){
+    public void afterCreate(EntryEvent event) {
+        if (LAST_KEY.equals(event.getKey())) {
+        lastKeyReceived = true;
+      }}});
+
+    RegionAttributes attrs = factory.create();
+    deltaPR = cache.createRegion(REGION_NAME, attrs);
+    //deltaPR.create(DELTA_KEY, new PRDeltaTestImpl());
+    deltaPR.registerInterest("ALL_KEYS");
+    pool = p;
+
+  }
+
+  public static void createCacheInAllPRVms() {
+    createCacheInVm();
+    dataStore1.invoke(PRDeltaPropagationDUnitTest.class, "createCacheInVm");
+    dataStore2.invoke(PRDeltaPropagationDUnitTest.class, "createCacheInVm");
+  }
+
+  public static void put() throws Exception {
+    DeltaTestImpl test = new DeltaTestImpl();
+    deltaPR.put(DELTA_KEY, test);
+
+    test.setIntVar(10);
+    deltaPR.put(DELTA_KEY, test);
+
+    test = new DeltaTestImpl();
+    test.setStr("DELTA");
+    deltaPR.put(DELTA_KEY, test);
+
+  }
+
+  public static void put(PRDeltaTestImpl val) throws Exception {
+    deltaPR.put(DELTA_KEY, val);
+  }
+
+  public static void checkVal(PRDeltaTestImpl val) throws Exception {
+    PRDeltaTestImpl localVal = (PRDeltaTestImpl)deltaPR.get(DELTA_KEY);
+    assertEquals(val, localVal);
+  }
+
+  public static void putWithExpiry() throws Exception {
+    DeltaTestImpl test = new DeltaTestImpl();
+    deltaPR.put(DELTA_KEY, test);
+
+    test.setIntVar(10);
+    deltaPR.put(DELTA_KEY, test);
+
+    Thread.sleep(2000);
+
+    test = new DeltaTestImpl();
+    test.setStr("DELTA");
+    deltaPR.put(DELTA_KEY, test);
+    
+  }
+
+  public static int putsWhichReturnsDeltaSent() throws Exception {
+    prDelta = new PRDeltaTestImpl();
+    for (int i = 0; i < NO_PUTS; i++) {
+      prDelta.setIntVar(i);
+      deltaPR.put(DELTA_KEY, prDelta);
+    }
+    deltaPR.put(LAST_KEY, "");
+    
+    return prDelta.deltaSent;
+  }
+
+  public static Boolean checkForDelta() {
+    if (DeltaTestImpl.fromDeltaFeatureUsed()) {
+      assertTrue(((DeltaTestImpl)deltaPR.getEntry("DELTA_KEY").getValue())
+          .getIntVar() == 10);
+      assertTrue(((DeltaTestImpl)deltaPR.getEntry("DELTA_KEY").getValue())
+          .getStr().equals("DELTA"));
+      return Boolean.TRUE;
+    }
+    else {
+      return Boolean.FALSE;
+    }
+  }
+
+  public static void checkForFullObject() {
+    assertFalse(((DeltaTestImpl)deltaPR.getEntry("DELTA_KEY").getValue())
+        .getIntVar() == 10);
+    assertTrue(((DeltaTestImpl)deltaPR.getEntry("DELTA_KEY").getValue())
+        .getStr().equals("DELTA"));
+  }
+  
+  public static void checkDeltaInvoked(Integer deltaSent) {
+    assertTrue("Delta applied :"
+        + ((PRDeltaTestImpl)deltaPR.get("DELTA_KEY")).getDeltaApplied()
+        + "\n Delta sent :" + deltaSent, ((PRDeltaTestImpl)deltaPR
+        .get("DELTA_KEY")).getDeltaApplied() == deltaSent);
+  }
+  
+  public static void waitForLastKey() {
+    WaitCriterion wc = new WaitCriterion() {
+      public boolean done() {
+        return PRDeltaPropagationDUnitTest.isLastKeyReceived();
+      }
+      public String description() {
+        return "Last key NOT received.";
+      }
+    };
+    DistributedTestCase.waitForCriterion(wc, 10*1000, 100, true);
+  }
+
+  public static Boolean verifyQueryUpdateExecuted() {
+    return PRDeltaPropagationDUnitTest.queryUpdateExecuted;
+  }
+  public static Boolean verifyQueryDestroyExecuted() {
+    return PRDeltaPropagationDUnitTest.queryDestroyExecuted;
+  }
+  public static Boolean checkVMRecievesDeltaObjectThrCQListner() {
+    return PRDeltaPropagationDUnitTest.notADeltaInstanceObj;
+  }
+  public static boolean isLastKeyReceived() {
+    return lastKeyReceived;
+  }
+  public static void verifyDeltaSent(Integer deltas) {
+    CacheClientNotifier ccn = ((CacheServerImpl)cache
+        .getCacheServers().toArray()[0]).getAcceptor()
+        .getCacheClientNotifier();
+
+    int numOfDeltasSent = ((CacheClientProxy)ccn.getClientProxies().toArray()[0])
+        .getStatistics().getDeltaMessagesSent();
+    assertTrue("Expected " + deltas + " deltas to be sent but "
+        + numOfDeltasSent + " were sent.", numOfDeltasSent == deltas);
+  }
+  
+  public static void resetAll() {
+    DeltaTestImpl.resetDeltaInvokationCounters();
+    ConflationDUnitTest.unsetIsSlowStart();
+  }
+
+  public void tearDown2() throws Exception {
+    super.tearDown2();    
+    closeCache();
+    client1.invoke(PRDeltaPropagationDUnitTest.class, "closeCache");
+    dataStore1.invoke(PRDeltaPropagationDUnitTest.class, "closeCache");
+    dataStore2.invoke(PRDeltaPropagationDUnitTest.class, "closeCache");
+    dataStore3.invoke(PRDeltaPropagationDUnitTest.class, "closeCache");
+    
+  }
+
+  public static void closeCache() {
+    if (cache != null && !cache.isClosed()) {
+      cache.close();
+      cache.getDistributedSystem().disconnect();
+      DeltaTestImpl.resetDeltaInvokationCounters();
+      isFailed = false;
+    }
+    isBadToDelta = false;
+    isBadFromDelta = false;
+  }
+
+  public static void setBadToDelta(Boolean bool) {
+    isBadToDelta = bool;
+  }
+
+  public static void setBadFromDelta(Boolean bool) {
+    isBadToDelta = bool;
+  }
+
+  static class PRDeltaTestImpl extends DeltaTestImpl {
+    int deltaSent = 0;
+    int deltaApplied = 0;
+
+    public PRDeltaTestImpl() {
+
+    }
+
+    public void toDelta(DataOutput out) throws IOException {
+      super.toDelta(out);
+      if (isBadToDelta) {
+        throw new RuntimeException("This is bad toDelta()");
+      }
+      deltaSent++;
+    }
+
+    public void fromDelta(DataInput in) throws IOException {
+      super.fromDelta(in);
+      if (isBadFromDelta) {
+        throw new RuntimeException("This is bad fromDelta()");
+      }
+      deltaApplied++;      
+    }
+
+    public int getDeltaSent() {
+      return deltaSent;
+    }
+
+    public int getDeltaApplied() {
+      return deltaApplied;
+    }
+
+    public String toString() {
+      return "PRDeltaTestImpl[deltaApplied=" + deltaApplied + "]"
+          + super.toString();
+    }
+  }
+
+  public static void setForOldNewCQVarification(Boolean forOldNewCQVarification) {
+    PRDeltaPropagationDUnitTest.forOldNewCQVarification = forOldNewCQVarification
+        .booleanValue();
+  }
+}



[23/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/cache/CacheXml70GatewayDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/cache/CacheXml70GatewayDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/cache/CacheXml70GatewayDUnitTest.java
new file mode 100644
index 0000000..1a0007c
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/cache/CacheXml70GatewayDUnitTest.java
@@ -0,0 +1,227 @@
+package com.gemstone.gemfire.cache;
+
+import java.io.IOException;
+import java.util.Properties;
+import java.util.Set;
+
+import com.gemstone.gemfire.cache.asyncqueue.AsyncEventListener;
+import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueue;
+import com.gemstone.gemfire.cache.asyncqueue.AsyncEventQueueFactory;
+import com.gemstone.gemfire.cache.wan.GatewayEventFilter;
+import com.gemstone.gemfire.cache.wan.GatewayQueueEvent;
+import com.gemstone.gemfire.cache.wan.GatewayReceiver;
+import com.gemstone.gemfire.cache.wan.GatewayReceiverFactory;
+import com.gemstone.gemfire.cache.wan.GatewaySender;
+import com.gemstone.gemfire.cache.wan.GatewaySenderFactory;
+import com.gemstone.gemfire.cache.wan.GatewayTransportFilter;
+import com.gemstone.gemfire.cache30.CacheXml70DUnitTest;
+import com.gemstone.gemfire.cache30.CacheXmlTestCase;
+import com.gemstone.gemfire.cache30.MyGatewayEventFilter1;
+import com.gemstone.gemfire.cache30.MyGatewayTransportFilter1;
+import com.gemstone.gemfire.cache30.MyGatewayTransportFilter2;
+import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation;
+import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml;
+import com.gemstone.gemfire.internal.cache.xmlcache.ParallelGatewaySenderCreation;
+import com.gemstone.gemfire.internal.cache.xmlcache.RegionAttributesCreation;
+import com.gemstone.gemfire.internal.cache.xmlcache.SerialGatewaySenderCreation;
+
+public class CacheXml70GatewayDUnitTest extends CacheXmlTestCase {
+
+  public CacheXml70GatewayDUnitTest(String name) {
+    super(name);
+  }
+
+  protected String getGemFireVersion() {
+    return CacheXml.VERSION_7_0;
+  }
+  
+  /**
+   * Added to test the scenario of defect #50600.
+   */
+  public void testAsyncEventQueueWithGatewayEventFilter() {
+    getSystem();
+    CacheCreation cache = new CacheCreation();
+            
+    String id = "WBCLChannel";
+    AsyncEventQueueFactory factory = cache.createAsyncEventQueueFactory();
+    factory.setBatchSize(100);
+    factory.setBatchTimeInterval(500);
+    factory.setBatchConflationEnabled(true);
+    factory.setMaximumQueueMemory(200);
+    factory.setDiskSynchronous(true);
+    factory.setParallel(false);
+    factory.setDispatcherThreads(33);
+    factory.addGatewayEventFilter(new MyGatewayEventFilter());
+            
+    AsyncEventListener eventListener = new CacheXml70DUnitTest.MyAsyncEventListener();
+    AsyncEventQueue asyncEventQueue = factory.create(id, eventListener);
+            
+    RegionAttributesCreation attrs = new RegionAttributesCreation();
+    attrs.addAsyncEventQueueId(asyncEventQueue.getId());
+    cache.createRegion("UserRegion", attrs);
+            
+    testXml(cache);
+    Cache c = getCache();
+    assertNotNull(c);
+    
+    Set<AsyncEventQueue> asyncEventQueuesOnCache = c.getAsyncEventQueues();
+    assertTrue("Size of asyncEventQueues should be greater than 0", asyncEventQueuesOnCache.size() > 0);
+            
+    for (AsyncEventQueue asyncEventQueueOnCache : asyncEventQueuesOnCache) {
+      CacheXml70DUnitTest.validateAsyncEventQueue(asyncEventQueue, asyncEventQueueOnCache);
+    }
+  }
+  
+  public void testGatewayReceiver() throws CacheException{
+    getSystem();
+    CacheCreation cache = new CacheCreation();
+    
+    GatewayReceiverFactory gatewayReceiverFactory = cache.createGatewayReceiverFactory();
+    gatewayReceiverFactory.setBindAddress("");
+    gatewayReceiverFactory.setStartPort(54321);
+    gatewayReceiverFactory.setEndPort(54331);
+    gatewayReceiverFactory.setMaximumTimeBetweenPings(2000);
+    gatewayReceiverFactory.setSocketBufferSize(1500);
+    GatewayTransportFilter myStreamfilter1 = new MyGatewayTransportFilter1();
+    gatewayReceiverFactory.addGatewayTransportFilter(myStreamfilter1);
+    GatewayTransportFilter myStreamfilter2 = new MyGatewayTransportFilter2();
+    gatewayReceiverFactory.addGatewayTransportFilter(myStreamfilter2);
+    GatewayReceiver receiver1 = gatewayReceiverFactory.create();
+    try {
+      receiver1.start();
+    }
+    catch (IOException e) {
+      fail("Could not start GatewayReceiver");
+    }
+    testXml(cache);
+    Cache c = getCache();
+    assertNotNull(c);
+    Set<GatewayReceiver> receivers = c.getGatewayReceivers();
+    for(GatewayReceiver receiver : receivers){
+      validateGatewayReceiver(receiver1, receiver);
+    }
+  }
+  
+  public void testParallelGatewaySender() throws CacheException{
+    getSystem();
+    CacheCreation cache = new CacheCreation();
+    
+    GatewaySenderFactory gatewaySenderFactory = cache.createGatewaySenderFactory();
+    gatewaySenderFactory.setParallel(true);
+    gatewaySenderFactory.setDispatcherThreads(13);
+    gatewaySenderFactory.setManualStart(true);
+    gatewaySenderFactory.setSocketBufferSize(1234);
+    gatewaySenderFactory.setSocketReadTimeout(1050);          
+    gatewaySenderFactory.setBatchConflationEnabled(false);
+    gatewaySenderFactory.setBatchSize(88);
+    gatewaySenderFactory.setBatchTimeInterval(9);           
+    gatewaySenderFactory.setPersistenceEnabled(true);          
+    gatewaySenderFactory.setDiskStoreName("LNSender");  
+    gatewaySenderFactory.setDiskSynchronous(true);
+    gatewaySenderFactory.setMaximumQueueMemory(211);           
+    gatewaySenderFactory.setAlertThreshold(35);
+    
+    GatewayEventFilter myeventfilter1 = new MyGatewayEventFilter1();
+    gatewaySenderFactory.addGatewayEventFilter(myeventfilter1);
+    GatewayTransportFilter myStreamfilter1 = new MyGatewayTransportFilter1();
+    gatewaySenderFactory.addGatewayTransportFilter(myStreamfilter1);
+    GatewayTransportFilter myStreamfilter2 = new MyGatewayTransportFilter2();
+    gatewaySenderFactory.addGatewayTransportFilter(myStreamfilter2);
+    GatewaySender parallelGatewaySender = gatewaySenderFactory.create("LN", 2);
+    
+    testXml(cache);
+    Cache c = getCache();
+    assertNotNull(c);
+    Set<GatewaySender> sendersOnCache = c.getGatewaySenders();
+    for(GatewaySender sender : sendersOnCache){
+      assertEquals(true, sender.isParallel());
+      validateGatewaySender(parallelGatewaySender, sender);
+    }
+  }
+  
+  public void testSerialGatewaySender() throws CacheException{
+    getSystem();
+    CacheCreation cache = new CacheCreation();
+    GatewaySenderFactory gatewaySenderFactory = cache.createGatewaySenderFactory();
+    gatewaySenderFactory.setParallel(false);
+    gatewaySenderFactory.setManualStart(true);
+    gatewaySenderFactory.setSocketBufferSize(124);
+    gatewaySenderFactory.setSocketReadTimeout(1000);          
+    gatewaySenderFactory.setBatchConflationEnabled(false);
+    gatewaySenderFactory.setBatchSize(100);
+    gatewaySenderFactory.setBatchTimeInterval(10);           
+    gatewaySenderFactory.setPersistenceEnabled(true);          
+    gatewaySenderFactory.setDiskStoreName("LNSender"); 
+    gatewaySenderFactory.setDiskSynchronous(true);
+    gatewaySenderFactory.setMaximumQueueMemory(200);           
+    gatewaySenderFactory.setAlertThreshold(30);
+    
+    GatewayEventFilter myeventfilter1 = new MyGatewayEventFilter1();
+    gatewaySenderFactory.addGatewayEventFilter(myeventfilter1);
+    GatewayTransportFilter myStreamfilter1 = new MyGatewayTransportFilter1();
+    gatewaySenderFactory.addGatewayTransportFilter(myStreamfilter1);
+    GatewayTransportFilter myStreamfilter2 = new MyGatewayTransportFilter2();
+    gatewaySenderFactory.addGatewayTransportFilter(myStreamfilter2);
+    GatewaySender serialGatewaySender = gatewaySenderFactory.create("LN", 2);
+    
+    RegionAttributesCreation attrs = new RegionAttributesCreation();
+    attrs.addGatewaySenderId(serialGatewaySender.getId());
+    cache.createRegion("UserRegion", attrs);
+    
+    testXml(cache);
+    Cache c = getCache();
+    assertNotNull(c);
+    Set<GatewaySender> sendersOnCache = c.getGatewaySenders();
+    for(GatewaySender sender : sendersOnCache){
+      assertEquals(false, sender.isParallel());
+      validateGatewaySender(serialGatewaySender, sender);
+    }
+  }
+  
+  public static class MyGatewayEventFilter implements GatewayEventFilter, Declarable {
+    public void afterAcknowledgement(GatewayQueueEvent event) {
+    }
+    public boolean beforeEnqueue(GatewayQueueEvent event) {
+      return true;
+    }
+    public boolean beforeTransmit(GatewayQueueEvent event) {
+      return true;
+    }
+    public void close() {
+    }
+    public void init(Properties properties) {
+    }
+  }
+
+  static void validateGatewayReceiver(GatewayReceiver receiver1, GatewayReceiver gatewayReceiver) {
+    assertEquals(receiver1.getHost(), gatewayReceiver.getHost());
+    assertEquals(receiver1.getStartPort(), gatewayReceiver.getStartPort());
+    assertEquals(receiver1.getEndPort(), gatewayReceiver.getEndPort());
+    assertEquals(receiver1.getMaximumTimeBetweenPings(), gatewayReceiver.getMaximumTimeBetweenPings());
+    assertEquals(receiver1.getSocketBufferSize(), gatewayReceiver.getSocketBufferSize());
+    assertEquals(receiver1.getGatewayTransportFilters().size(), gatewayReceiver.getGatewayTransportFilters().size());
+  } 
+
+  static void validateGatewaySender(GatewaySender sender1, GatewaySender gatewaySender) {
+    assertEquals(sender1.getId(), gatewaySender.getId());
+    assertEquals(sender1.getRemoteDSId(), gatewaySender.getRemoteDSId());
+    assertEquals(sender1.isParallel(), gatewaySender.isParallel());
+    assertEquals(sender1.isBatchConflationEnabled(), gatewaySender.isBatchConflationEnabled());
+    assertEquals(sender1.getBatchSize(), gatewaySender.getBatchSize());
+    assertEquals(sender1.getBatchTimeInterval(), gatewaySender.getBatchTimeInterval());
+    assertEquals(sender1.isPersistenceEnabled(), gatewaySender.isPersistenceEnabled());
+    assertEquals(sender1.getDiskStoreName(),gatewaySender.getDiskStoreName());
+    assertEquals(sender1.isDiskSynchronous(),gatewaySender.isDiskSynchronous());
+    assertEquals(sender1.getMaximumQueueMemory(), gatewaySender.getMaximumQueueMemory());
+    assertEquals(sender1.getAlertThreshold(), gatewaySender.getAlertThreshold());
+    assertEquals(sender1.getGatewayEventFilters().size(), gatewaySender.getGatewayEventFilters().size());
+    assertEquals(sender1.getGatewayTransportFilters().size(), gatewaySender.getGatewayTransportFilters().size());
+    
+    boolean isParallel = sender1.isParallel();
+    if (isParallel) {
+      assertTrue("sender should be instanceof Creation", sender1 instanceof ParallelGatewaySenderCreation);
+    } else {
+      assertTrue("sender should be instanceof Creation", sender1 instanceof SerialGatewaySenderCreation);
+    }
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/cache/CacheXml80GatewayDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/cache/CacheXml80GatewayDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/cache/CacheXml80GatewayDUnitTest.java
new file mode 100644
index 0000000..54a84d6
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/cache/CacheXml80GatewayDUnitTest.java
@@ -0,0 +1,61 @@
+package com.gemstone.gemfire.cache;
+
+import java.io.IOException;
+import java.util.Set;
+
+import com.gemstone.gemfire.cache.wan.GatewayReceiver;
+import com.gemstone.gemfire.cache.wan.GatewayReceiverFactory;
+import com.gemstone.gemfire.cache.wan.GatewayTransportFilter;
+import com.gemstone.gemfire.cache30.CacheXmlTestCase;
+import com.gemstone.gemfire.cache30.MyGatewayTransportFilter1;
+import com.gemstone.gemfire.cache30.MyGatewayTransportFilter2;
+import com.gemstone.gemfire.internal.cache.xmlcache.CacheCreation;
+import com.gemstone.gemfire.internal.cache.xmlcache.CacheXml;
+
+public class CacheXml80GatewayDUnitTest extends CacheXmlTestCase {
+
+  public CacheXml80GatewayDUnitTest(String name) {
+    super(name);
+  }
+
+  protected String getGemFireVersion() {
+    return CacheXml.VERSION_8_0;
+  }
+  
+  public void testGatewayReceiverWithManualStartTRUE() throws CacheException{
+    //getSystem();
+    CacheCreation cache = new CacheCreation();
+    
+    GatewayReceiverFactory gatewayReceiverFactory = cache.createGatewayReceiverFactory();
+    gatewayReceiverFactory.setBindAddress("");
+    gatewayReceiverFactory.setStartPort(54321);
+    gatewayReceiverFactory.setEndPort(54331);
+    gatewayReceiverFactory.setMaximumTimeBetweenPings(2000);
+    gatewayReceiverFactory.setSocketBufferSize(1500);
+    gatewayReceiverFactory.setManualStart(true);
+    GatewayTransportFilter myStreamfilter1 = new MyGatewayTransportFilter1();
+    gatewayReceiverFactory.addGatewayTransportFilter(myStreamfilter1);
+    GatewayTransportFilter myStreamfilter2 = new MyGatewayTransportFilter2();
+    gatewayReceiverFactory.addGatewayTransportFilter(myStreamfilter2);
+    GatewayReceiver receiver1 = gatewayReceiverFactory.create();
+    try {
+      receiver1.start();
+    }
+    catch (IOException e) {
+      fail("Could not start GatewayReceiver");
+    }
+    testXml(cache);
+    Cache c = getCache();
+    assertNotNull(c);
+    Set<GatewayReceiver> receivers = c.getGatewayReceivers();
+    for(GatewayReceiver receiver : receivers){
+      validateGatewayReceiver(receiver1, receiver);
+    }
+  }
+
+  protected void validateGatewayReceiver(GatewayReceiver receiver1,
+      GatewayReceiver gatewayReceiver){
+    CacheXml70GatewayDUnitTest.validateGatewayReceiver(receiver1, gatewayReceiver);
+    assertEquals(receiver1.isManualStart(), gatewayReceiver.isManualStart());
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java
new file mode 100755
index 0000000..4ee46d1
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java
@@ -0,0 +1,82 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.codeAnalysis;
+
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.AfterClass;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.experimental.categories.Category;
+
+import com.gemstone.gemfire.codeAnalysis.decode.CompiledClass;
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+import com.gemstone.gemfire.util.test.TestUtil;
+
+/**
+ * @author bruces
+ * 
+ */
+@Category(IntegrationTest.class)
+public class AnalyzeWANSerializablesJUnitTest extends AnalyzeSerializablesJUnitTest {
+  
+  @Before
+  public void loadClasses() throws Exception {
+    if (classes.size() > 0) {
+      return;
+    }
+    System.out.println("loadClasses starting");
+    List<String> excludedClasses = loadExcludedClasses(new File(TestUtil.getResourcePath(AnalyzeWANSerializablesJUnitTest.class, "excludedClasses.txt")));
+    List<String> openBugs = loadOpenBugs(new File(TestUtil.getResourcePath(AnalyzeWANSerializablesJUnitTest.class, "openBugs.txt")));
+    excludedClasses.addAll(openBugs);
+    
+    String cp = System.getProperty("java.class.path");
+    System.out.println("java classpath is " + cp);
+    System.out.flush();
+    String[] entries = cp.split(File.pathSeparator);
+    String buildDirName =
+         "gemfire-wan"+File.separatorChar
+        +"build"+File.separatorChar
+        +"classes"+File.separatorChar
+        +"main";
+    String buildDir = null;
+    
+    for (int i=0; i<entries.length  &&  buildDir==null; i++) {
+      System.out.println("examining '" + entries[i] + "'");
+      System.out.flush();
+      if (entries[i].endsWith(buildDirName)) {
+        buildDir = entries[i];
+      }
+    }
+    if (buildDir != null) {
+      System.out.println("loading class files from " + buildDir);
+      System.out.flush();
+      long start = System.currentTimeMillis();
+      loadClassesFromBuild(new File(buildDir), excludedClasses);
+      long finish = System.currentTimeMillis();
+      System.out.println("done loading " + classes.size() + " classes.  elapsed time = "
+          + (finish-start)/1000 + " seconds");
+    }
+    else {
+      fail("unable to find WAN classes");
+    }
+  }
+  
+  @AfterClass
+  public static void cleanup() {
+    if (classes != null) {
+      classes.clear();
+    }
+  }
+  
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
new file mode 100644
index 0000000..cb34278
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
@@ -0,0 +1,955 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.gopivotal.com/patents.
+ *=========================================================================
+ */
+/**
+ * 
+ */
+package com.gemstone.gemfire.internal.cache;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+import java.util.StringTokenizer;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.DiskStore;
+import com.gemstone.gemfire.cache.DiskStoreFactory;
+import com.gemstone.gemfire.cache.EntryNotFoundException;
+import com.gemstone.gemfire.cache.Operation;
+import com.gemstone.gemfire.cache.PartitionAttributesFactory;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.Region.Entry;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.client.internal.LocatorDiscoveryCallbackAdapter;
+import com.gemstone.gemfire.cache.wan.GatewayEventFilter;
+import com.gemstone.gemfire.cache.wan.GatewayReceiver;
+import com.gemstone.gemfire.cache.wan.GatewayReceiverFactory;
+import com.gemstone.gemfire.cache.wan.GatewaySender;
+import com.gemstone.gemfire.cache.wan.GatewaySenderFactory;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.internal.AvailablePortHelper;
+import com.gemstone.gemfire.internal.cache.LocalRegion.NonTXEntry;
+import com.gemstone.gemfire.internal.cache.partitioned.PRLocallyDestroyedException;
+import com.gemstone.gemfire.internal.cache.versions.VersionSource;
+import com.gemstone.gemfire.internal.cache.versions.VersionStamp;
+import com.gemstone.gemfire.internal.cache.versions.VersionTag;
+import com.gemstone.gemfire.internal.cache.wan.InternalGatewaySenderFactory;
+
+import dunit.DistributedTestCase;
+import dunit.Host;
+import dunit.SerializableCallable;
+import dunit.SerializableRunnable;
+import dunit.VM;
+
+/**
+ * @author Shobhit Agarwal
+ * @since 7.0.1
+ */
+public class UpdateVersionDUnitTest extends DistributedTestCase {
+
+  protected static final String regionName = "testRegion";
+  protected static Cache cache;
+  private static Set<ExpectedException>expectedExceptions = new HashSet<ExpectedException>();
+
+  
+  
+  public UpdateVersionDUnitTest(String name) {
+    super(name);
+  }
+  
+  public void tearDown2() throws Exception {
+    super.tearDown2();
+    closeCache();
+    invokeInEveryVM(new SerializableRunnable() { public void run() {
+      closeCache();
+     } });
+  }
+  
+  public void testUpdateVersionAfterCreateWithSerialSender() {
+
+    Host host = Host.getHost(0);
+    VM vm0 = host.getVM(0); // server1 site1
+    VM vm1 = host.getVM(1); // server2 site1
+
+    VM vm2 = host.getVM(2); // server1 site2
+    VM vm3 = host.getVM(3); // server2 site2
+
+    final String key = "key-1";
+
+    // Site 1
+    Integer lnPort = (Integer)vm0.invoke(UpdateVersionDUnitTest.class, "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    vm0.invoke(UpdateVersionDUnitTest.class, "createCache", new Object[] { lnPort});
+    vm0.invoke(UpdateVersionDUnitTest.class, "createSender", new Object[] { "ln1", 2, false, 10, 1, false, false, null, true });
+    
+    vm0.invoke(UpdateVersionDUnitTest.class, "createPartitionedRegion", new Object[] {regionName, "ln1", 1, 1});
+    vm0.invoke(UpdateVersionDUnitTest.class, "startSender", new Object[] { "ln1" });
+    vm0.invoke(UpdateVersionDUnitTest.class, "waitForSenderRunningState", new Object[] { "ln1" });
+
+    //Site 2
+    Integer nyPort = (Integer)vm2.invoke(UpdateVersionDUnitTest.class, "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer nyRecPort = (Integer) vm2.invoke(UpdateVersionDUnitTest.class, "createReceiver", new Object[] { nyPort });
+
+    vm2.invoke(UpdateVersionDUnitTest.class, "createPartitionedRegion", new Object[] {regionName, "", 1, 1});
+    vm3.invoke(UpdateVersionDUnitTest.class, "createCache", new Object[] { nyPort});
+    vm3.invoke(UpdateVersionDUnitTest.class, "createPartitionedRegion", new Object[] {regionName, "", 1, 1});    
+    
+    final VersionTag tag = (VersionTag) vm0.invoke(new SerializableCallable("Update a single entry and get its version") {
+      
+      @Override
+      public Object call() throws CacheException {
+        Cache cache = CacheFactory.getAnyInstance();
+        Region region = cache.getRegion(regionName);
+        assertTrue(region instanceof PartitionedRegion);
+
+        region.put(key, "value-1");
+        Entry entry = region.getEntry(key);
+        assertTrue(entry instanceof EntrySnapshot);
+        RegionEntry regionEntry = ((EntrySnapshot) entry).getRegionEntry();
+
+        VersionStamp stamp = regionEntry.getVersionStamp();
+
+        // Create a duplicate entry version tag from stamp with newer
+        // time-stamp.
+        VersionSource memberId = (VersionSource) cache.getDistributedSystem().getDistributedMember();
+        VersionTag tag = VersionTag.create(memberId);
+
+        int entryVersion = stamp.getEntryVersion()-1;
+        int dsid = stamp.getDistributedSystemId();
+        long time = System.currentTimeMillis();
+
+        tag.setEntryVersion(entryVersion);
+        tag.setDistributedSystemId(dsid);
+        tag.setVersionTimeStamp(time);
+        tag.setIsRemoteForTesting();
+
+        EntryEventImpl event = createNewEvent((PartitionedRegion) region, tag,
+            entry.getKey(), "value-2");
+
+        ((LocalRegion) region).basicUpdate(event, false, true, 0L, false);
+
+        // Verify the new stamp
+        entry = region.getEntry(key);
+        assertTrue(entry instanceof EntrySnapshot);
+        regionEntry = ((EntrySnapshot) entry).getRegionEntry();
+
+        stamp = regionEntry.getVersionStamp();
+        assertEquals(
+            "Time stamp did NOT get updated by UPDATE_VERSION operation on LocalRegion",
+            time, stamp.getVersionTimeStamp());
+        assertEquals(++entryVersion, stamp.getEntryVersion());
+        assertEquals(dsid, stamp.getDistributedSystemId());
+
+        return stamp.asVersionTag();
+      }
+    });
+
+    VersionTag remoteTag = (VersionTag) vm3.invoke(new SerializableCallable("Get timestamp from remote site") {
+      
+      @Override
+      public Object call() throws Exception {
+        
+        Cache cache = CacheFactory.getAnyInstance();
+        final PartitionedRegion region = (PartitionedRegion)cache.getRegion(regionName);
+
+        // wait for entry to be received
+        WaitCriterion wc = new WaitCriterion() {
+          public boolean done() {
+            Entry<?,?> entry = null;
+            try {
+              entry = region.getDataStore().getEntryLocally(0, key, false, false, false);
+            } catch (EntryNotFoundException e) {
+              // expected
+            } catch (ForceReattemptException e) {
+              // expected
+            } catch (PRLocallyDestroyedException e) {
+              throw new RuntimeException("unexpected exception", e);
+            }
+            if (entry != null) {
+              getLogWriter().info("found entry " + entry);
+            }
+            return (entry != null);
+          }
+
+          public String description() {
+            return "Expected "+key+" to be received on remote WAN site";
+          }
+        };
+        DistributedTestCase.waitForCriterion(wc, 30000, 500, true);
+
+        wc = new WaitCriterion() {
+          public boolean done() {
+            Entry entry = region.getEntry(key);
+            assertTrue(entry instanceof EntrySnapshot);
+            RegionEntry regionEntry = ((EntrySnapshot) entry).getRegionEntry();
+            return regionEntry.getVersionStamp().getVersionTimeStamp() == tag.getVersionTimeStamp();
+          }
+          public String description() {
+            return "waiting for timestamp to be updated";
+          }
+        };
+        DistributedTestCase.waitForCriterion(wc, 30000, 500, true);
+
+        Entry entry = region.getEntry(key);
+        assertTrue("entry class is wrong: " + entry, entry instanceof EntrySnapshot);
+        RegionEntry regionEntry = ((EntrySnapshot) entry).getRegionEntry();
+
+        VersionStamp stamp = regionEntry.getVersionStamp();
+
+        return stamp.asVersionTag();
+      }
+    });
+
+    assertEquals("Local and remote site have different timestamps", tag.getVersionTimeStamp(), remoteTag.getVersionTimeStamp());
+  }
+
+  public void testUpdateVersionAfterCreateWithSerialSenderOnDR() {
+
+    Host host = Host.getHost(0);
+    VM vm0 = host.getVM(0); // server1 site1
+    VM vm1 = host.getVM(1); // server2 site1
+
+    VM vm2 = host.getVM(2); // server1 site2
+    VM vm3 = host.getVM(3); // server2 site2
+
+    final String key = "key-1";
+
+    // Site 1
+    Integer lnPort = (Integer)vm0.invoke(UpdateVersionDUnitTest.class, "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    vm0.invoke(UpdateVersionDUnitTest.class, "createCache", new Object[] { lnPort});
+    vm0.invoke(UpdateVersionDUnitTest.class, "createSender", new Object[] { "ln1", 2, false, 10, 1, false, false, null, true });
+    
+    vm0.invoke(UpdateVersionDUnitTest.class, "createReplicatedRegion", new Object[] {regionName, "ln1"});
+    vm0.invoke(UpdateVersionDUnitTest.class, "startSender", new Object[] { "ln1" });
+    vm0.invoke(UpdateVersionDUnitTest.class, "waitForSenderRunningState", new Object[] { "ln1" });
+
+    //Site 2
+    Integer nyPort = (Integer)vm2.invoke(UpdateVersionDUnitTest.class, "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer nyRecPort = (Integer) vm2.invoke(UpdateVersionDUnitTest.class, "createReceiver", new Object[] { nyPort });
+
+    vm2.invoke(UpdateVersionDUnitTest.class, "createReplicatedRegion", new Object[] {regionName, ""});
+    vm3.invoke(UpdateVersionDUnitTest.class, "createCache", new Object[] { nyPort });
+    vm3.invoke(UpdateVersionDUnitTest.class, "createReplicatedRegion", new Object[] {regionName, ""});    
+    
+    final VersionTag tag = (VersionTag) vm0.invoke(new SerializableCallable("Update a single entry and get its version") {
+      
+      @Override
+      public Object call() throws CacheException {
+        Cache cache = CacheFactory.getAnyInstance();
+        Region region = cache.getRegion(regionName);
+        assertTrue(region instanceof DistributedRegion);
+
+        region.put(key, "value-1");
+        Entry entry = region.getEntry(key);
+        assertTrue(entry instanceof NonTXEntry);
+        RegionEntry regionEntry = ((NonTXEntry) entry).getRegionEntry();
+
+        VersionStamp stamp = regionEntry.getVersionStamp();
+
+        // Create a duplicate entry version tag from stamp with newer
+        // time-stamp.
+        VersionSource memberId = (VersionSource) cache.getDistributedSystem().getDistributedMember();
+        VersionTag tag = VersionTag.create(memberId);
+
+        int entryVersion = stamp.getEntryVersion()-1;
+        int dsid = stamp.getDistributedSystemId();
+        long time = System.currentTimeMillis();
+
+        tag.setEntryVersion(entryVersion);
+        tag.setDistributedSystemId(dsid);
+        tag.setVersionTimeStamp(time);
+        tag.setIsRemoteForTesting();
+
+        EntryEventImpl event = createNewEvent((DistributedRegion) region, tag,
+            entry.getKey(), "value-2");
+
+        ((LocalRegion) region).basicUpdate(event, false, true, 0L, false);
+
+        // Verify the new stamp
+        entry = region.getEntry(key);
+        assertTrue(entry instanceof NonTXEntry);
+        regionEntry = ((NonTXEntry) entry).getRegionEntry();
+
+        stamp = regionEntry.getVersionStamp();
+        assertEquals(
+            "Time stamp did NOT get updated by UPDATE_VERSION operation on LocalRegion",
+            time, stamp.getVersionTimeStamp());
+        assertEquals(entryVersion+1, stamp.getEntryVersion());
+        assertEquals(dsid, stamp.getDistributedSystemId());
+
+        return stamp.asVersionTag();
+      }
+    });
+
+    VersionTag remoteTag = (VersionTag) vm3.invoke(new SerializableCallable("Get timestamp from remote site") {
+      
+      @Override
+      public Object call() throws Exception {
+        
+        Cache cache = CacheFactory.getAnyInstance();
+        final Region region = cache.getRegion(regionName);
+
+        // wait for entry to be received
+        WaitCriterion wc = new WaitCriterion() {
+          public boolean done() {
+            return (region.getEntry(key) != null);
+          }
+
+          public String description() {
+            return "Expected key-1 to be received on remote WAN site";
+          }
+        };
+        DistributedTestCase.waitForCriterion(wc, 30000, 500, true);
+
+        wc = new WaitCriterion() {
+          public boolean done() {
+            Entry entry = region.getEntry(key);
+            assertTrue(entry instanceof NonTXEntry);
+            RegionEntry regionEntry = ((NonTXEntry) entry).getRegionEntry();
+            return regionEntry.getVersionStamp().getVersionTimeStamp() == tag.getVersionTimeStamp();
+          }
+          public String description() {
+            return "waiting for timestamp to be updated";
+          }
+        };
+        DistributedTestCase.waitForCriterion(wc, 30000, 500, true);
+
+        Entry entry = region.getEntry(key);
+        assertTrue(entry instanceof NonTXEntry);
+        RegionEntry regionEntry = ((NonTXEntry) entry).getRegionEntry();
+
+        VersionStamp stamp = regionEntry.getVersionStamp();
+
+        return stamp.asVersionTag();
+      }
+    });
+
+    assertEquals("Local and remote site have different timestamps", tag.getVersionTimeStamp(), remoteTag.getVersionTimeStamp());
+  }
+
+  public void testUpdateVersionAfterCreateWithParallelSender() {
+
+    Host host = Host.getHost(0);
+    VM vm0 = host.getVM(0); // server1 site1
+    VM vm1 = host.getVM(1); // server2 site1
+
+    VM vm2 = host.getVM(2); // server1 site2
+    VM vm3 = host.getVM(3); // server2 site2
+
+    // Site 1
+    Integer lnPort = (Integer)vm0.invoke(UpdateVersionDUnitTest.class, "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    final String key = "key-1";
+
+    vm0.invoke(UpdateVersionDUnitTest.class, "createCache", new Object[] { lnPort});
+    vm0.invoke(UpdateVersionDUnitTest.class, "createSender", new Object[] { "ln1", 2, true, 10, 1, false, false, null, true });
+    
+    vm0.invoke(UpdateVersionDUnitTest.class, "createPartitionedRegion", new Object[] {regionName, "ln1", 1, 1});
+    vm0.invoke(UpdateVersionDUnitTest.class, "startSender", new Object[] { "ln1" });
+    vm0.invoke(UpdateVersionDUnitTest.class, "waitForSenderRunningState", new Object[] { "ln1" });
+    
+    //Site 2
+    Integer nyPort = (Integer)vm2.invoke(UpdateVersionDUnitTest.class, "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer nyRecPort = (Integer) vm2.invoke(UpdateVersionDUnitTest.class, "createReceiver", new Object[] { nyPort });
+
+    vm2.invoke(UpdateVersionDUnitTest.class, "createPartitionedRegion", new Object[] {regionName, "", 1, 1});
+
+    vm3.invoke(UpdateVersionDUnitTest.class, "createCache", new Object[] { nyPort});
+    vm3.invoke(UpdateVersionDUnitTest.class, "createPartitionedRegion", new Object[] {regionName, "", 1, 1});
+    
+    final VersionTag tag = (VersionTag) vm0.invoke(new SerializableCallable("Put a single entry and get its version") {
+      
+      @Override
+      public Object call() throws CacheException {
+        Cache cache = CacheFactory.getAnyInstance();
+        Region region = cache.getRegion(regionName);
+        assertTrue(region instanceof PartitionedRegion);
+
+        region.put(key, "value-1");
+        Entry entry = region.getEntry(key);
+        assertTrue(entry instanceof EntrySnapshot);
+        RegionEntry regionEntry = ((EntrySnapshot) entry).getRegionEntry();
+
+        VersionStamp stamp = regionEntry.getVersionStamp();
+
+        // Create a duplicate entry version tag from stamp with newer
+        // time-stamp.
+        VersionSource memberId = (VersionSource) cache.getDistributedSystem().getDistributedMember();
+        VersionTag tag = VersionTag.create(memberId);
+
+        int entryVersion = stamp.getEntryVersion()-1;
+        int dsid = stamp.getDistributedSystemId();
+        long time = System.currentTimeMillis();
+
+        tag.setEntryVersion(entryVersion);
+        tag.setDistributedSystemId(dsid);
+        tag.setVersionTimeStamp(time);
+        tag.setIsRemoteForTesting();
+
+        EntryEventImpl event = createNewEvent((PartitionedRegion) region, tag,
+            entry.getKey(), "value-2");
+
+        ((LocalRegion) region).basicUpdate(event, false, true, 0L, false);
+
+        // Verify the new stamp
+        entry = region.getEntry(key);
+        assertTrue(entry instanceof EntrySnapshot);
+        regionEntry = ((EntrySnapshot) entry).getRegionEntry();
+
+        stamp = regionEntry.getVersionStamp();
+        assertEquals(
+            "Time stamp did NOT get updated by UPDATE_VERSION operation on LocalRegion",
+            time, stamp.getVersionTimeStamp());
+        assertEquals(++entryVersion, stamp.getEntryVersion());
+        assertEquals(dsid, stamp.getDistributedSystemId());
+
+        return stamp.asVersionTag();
+      }
+    });
+
+    VersionTag remoteTag = (VersionTag) vm3.invoke(new SerializableCallable("Get timestamp from remote site") {
+      
+      @Override
+      public Object call() throws Exception {
+        
+        Cache cache = CacheFactory.getAnyInstance();
+        final PartitionedRegion region = (PartitionedRegion)cache.getRegion(regionName);
+
+        // wait for entry to be received
+        WaitCriterion wc = new WaitCriterion() {
+          public boolean done() {
+            Entry<?,?> entry = null;
+            try {
+              entry = region.getDataStore().getEntryLocally(0, key, false, false, false);
+            } catch (EntryNotFoundException e) {
+              // expected
+            } catch (ForceReattemptException e) {
+              // expected
+            } catch (PRLocallyDestroyedException e) {
+              throw new RuntimeException("unexpected exception", e);
+            }
+            if (entry != null) {
+              getLogWriter().info("found entry " + entry);
+            }
+            return (entry != null);
+          }
+
+          public String description() {
+            return "Expected key-1 to be received on remote WAN site";
+          }
+        };
+        DistributedTestCase.waitForCriterion(wc, 30000, 500, true);
+
+        wc = new WaitCriterion() {
+          public boolean done() {
+            Entry entry = region.getEntry(key);
+            assertTrue(entry instanceof EntrySnapshot);
+            RegionEntry regionEntry = ((EntrySnapshot) entry).getRegionEntry();
+            return regionEntry.getVersionStamp().getVersionTimeStamp() == tag.getVersionTimeStamp();
+          }
+          public String description() {
+            return "waiting for timestamp to be updated";
+          }
+        };
+        DistributedTestCase.waitForCriterion(wc, 30000, 500, true);
+
+        Entry entry = region.getEntry(key);
+        assertTrue(entry instanceof EntrySnapshot);
+        RegionEntry regionEntry = ((EntrySnapshot) entry).getRegionEntry();
+
+        VersionStamp stamp = regionEntry.getVersionStamp();
+
+        return stamp.asVersionTag();
+      }
+    });
+
+    assertEquals("Local and remote site have different timestamps", tag.getVersionTimeStamp(), remoteTag.getVersionTimeStamp());
+  }
+
+  public void testUpdateVersionAfterCreateWithConcurrentSerialSender() {
+
+    Host host = Host.getHost(0);
+    VM vm0 = host.getVM(0); // server1 site1
+    VM vm1 = host.getVM(1); // server2 site1
+
+    VM vm2 = host.getVM(2); // server1 site2
+    VM vm3 = host.getVM(3); // server2 site2
+
+    // Site 1
+    Integer lnPort = (Integer)vm0.invoke(UpdateVersionDUnitTest.class, "createFirstLocatorWithDSId", new Object[] { 1 });
+
+    final String key = "key-1";
+
+    vm0.invoke(UpdateVersionDUnitTest.class, "createCache", new Object[] { lnPort });
+    vm0.invoke(UpdateVersionDUnitTest.class, "createConcurrentSender", new Object[] { "ln1", 2, false, 10, 2, false, false, null, true, 2 });
+    
+    vm0.invoke(UpdateVersionDUnitTest.class, "createPartitionedRegion", new Object[] {regionName, "ln1", 1, 1});
+    vm0.invoke(UpdateVersionDUnitTest.class, "startSender", new Object[] { "ln1" });
+    vm0.invoke(UpdateVersionDUnitTest.class, "waitForSenderRunningState", new Object[] { "ln1" });
+    
+    //Site 2
+    Integer nyPort = (Integer)vm2.invoke(UpdateVersionDUnitTest.class, "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer nyRecPort = (Integer) vm2.invoke(UpdateVersionDUnitTest.class, "createReceiver", new Object[] { nyPort });
+
+    vm2.invoke(UpdateVersionDUnitTest.class, "createPartitionedRegion", new Object[] {regionName, "", 1, 1});
+
+    vm3.invoke(UpdateVersionDUnitTest.class, "createCache", new Object[] { nyPort });
+    vm3.invoke(UpdateVersionDUnitTest.class, "createPartitionedRegion", new Object[] {regionName, "", 1, 1});    
+    
+    final VersionTag tag = (VersionTag) vm0.invoke(new SerializableCallable("Put a single entry and get its version") {
+      
+      @Override
+      public Object call() throws CacheException {
+        Cache cache = CacheFactory.getAnyInstance();
+        Region region = cache.getRegion(regionName);
+        assertTrue(region instanceof PartitionedRegion);
+
+        region.put(key, "value-1");
+        Entry entry = region.getEntry(key);
+        assertTrue(entry instanceof EntrySnapshot);
+        RegionEntry regionEntry = ((EntrySnapshot) entry).getRegionEntry();
+
+        VersionStamp stamp = regionEntry.getVersionStamp();
+
+        // Create a duplicate entry version tag from stamp with newer
+        // time-stamp.
+        VersionSource memberId = (VersionSource) cache.getDistributedSystem().getDistributedMember();
+        VersionTag tag = VersionTag.create(memberId);
+
+        int entryVersion = stamp.getEntryVersion()-1;
+        int dsid = stamp.getDistributedSystemId();
+        long time = System.currentTimeMillis();
+
+        tag.setEntryVersion(entryVersion);
+        tag.setDistributedSystemId(dsid);
+        tag.setVersionTimeStamp(time);
+        tag.setIsRemoteForTesting();
+
+        EntryEventImpl event = createNewEvent((PartitionedRegion) region, tag,
+            entry.getKey(), "value-2");
+
+        ((LocalRegion) region).basicUpdate(event, false, true, 0L, false);
+
+        // Verify the new stamp
+        entry = region.getEntry(key);
+        assertTrue(entry instanceof EntrySnapshot);
+        regionEntry = ((EntrySnapshot) entry).getRegionEntry();
+
+        stamp = regionEntry.getVersionStamp();
+        assertEquals(
+            "Time stamp did NOT get updated by UPDATE_VERSION operation on LocalRegion",
+            time, stamp.getVersionTimeStamp());
+        assertEquals(++entryVersion, stamp.getEntryVersion());
+        assertEquals(dsid, stamp.getDistributedSystemId());
+
+        return stamp.asVersionTag();
+      }
+    });
+
+    VersionTag remoteTag = (VersionTag) vm3.invoke(new SerializableCallable("Get timestamp from remote site") {
+      
+      @Override
+      public Object call() throws Exception {
+        
+        Cache cache = CacheFactory.getAnyInstance();
+        final PartitionedRegion region = (PartitionedRegion)cache.getRegion(regionName);
+
+        // wait for entry to be received
+        WaitCriterion wc = new WaitCriterion() {
+          public boolean done() {
+            Entry<?,?> entry = null;
+            try {
+              entry = region.getDataStore().getEntryLocally(0, key, false, false, false);
+            } catch (EntryNotFoundException e) {
+              // expected
+            } catch (ForceReattemptException e) {
+              // expected
+            } catch (PRLocallyDestroyedException e) {
+              throw new RuntimeException("unexpected exception", e);
+            }
+            if (entry != null) {
+              getLogWriter().info("found entry " + entry);
+            }
+            return (entry != null);
+          }
+
+          public String description() {
+            return "Expected key-1 to be received on remote WAN site";
+          }
+        };
+        DistributedTestCase.waitForCriterion(wc, 30000, 500, true);
+
+        wc = new WaitCriterion() {
+          public boolean done() {
+            Entry entry = region.getEntry(key);
+            assertTrue(entry instanceof EntrySnapshot);
+            RegionEntry regionEntry = ((EntrySnapshot) entry).getRegionEntry();
+            return regionEntry.getVersionStamp().getVersionTimeStamp() == tag.getVersionTimeStamp();
+          }
+          public String description() {
+            return "waiting for timestamp to be updated";
+          }
+        };
+        DistributedTestCase.waitForCriterion(wc, 30000, 500, true);
+
+        Entry entry = region.getEntry(key);
+        assertTrue(entry instanceof EntrySnapshot);
+        RegionEntry regionEntry = ((EntrySnapshot) entry).getRegionEntry();
+
+        VersionStamp stamp = regionEntry.getVersionStamp();
+
+        return stamp.asVersionTag();
+      }
+    });
+
+    assertEquals("Local and remote site have different timestamps", tag.getVersionTimeStamp(), remoteTag.getVersionTimeStamp());
+  }
+  
+  
+  private EntryEventImpl createNewEvent(LocalRegion region, VersionTag tag, Object key, Object value) {
+    EntryEventImpl updateEvent = EntryEventImpl.createVersionTagHolder(tag);
+    updateEvent.setOperation(Operation.UPDATE);
+    updateEvent.setRegion(region);
+    if (region instanceof PartitionedRegion) {
+      updateEvent.setKeyInfo(((PartitionedRegion)region).getKeyInfo(key));
+    } else {
+      updateEvent.setKeyInfo(new KeyInfo(key, value, null));
+    }
+    updateEvent.setNewValue(value);
+    updateEvent.setGenerateCallbacks(true);
+    updateEvent.distributedMember = region.getSystem().getDistributedMember();
+    updateEvent.setNewEventId(region.getSystem());
+    return updateEvent;
+  }
+
+  /*
+   * Helper Methods
+   */
+
+  private static void createCache(Integer locPort) {
+    UpdateVersionDUnitTest test = new UpdateVersionDUnitTest(testName);
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]");
+    props.setProperty(DistributionConfig.LOG_LEVEL_NAME, getDUnitLogLevel());
+    props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+    props.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "false");
+    InternalDistributedSystem ds = test.getSystem(props);
+    cache = CacheFactory.create(ds); 
+    ExpectedException ex = new ExpectedException("could not get remote locator information for remote site");
+    cache.getLogger().info(ex.getAddString());
+    expectedExceptions.add(ex);
+    ex = new ExpectedException("Pool ln1 is not available");
+    cache.getLogger().info(ex.getAddString());
+    expectedExceptions.add(ex);
+  }
+  
+  private static void closeCache() {
+    if (cache != null && !cache.isClosed()) {
+      for (ExpectedException expectedException: expectedExceptions) {
+        cache.getLogger().info(expectedException.getRemoveString());
+      }
+      expectedExceptions.clear();
+      cache.getDistributedSystem().disconnect();
+      cache.close();
+    }
+    cache = null;
+  }
+
+  public static void createSender(String dsName, int remoteDsId,
+      boolean isParallel, Integer maxMemory, Integer batchSize,
+      boolean isConflation, boolean isPersistent, GatewayEventFilter filter,
+      boolean isManualStart) {
+    File persistentDirectory = new File(dsName + "_disk_"
+        + System.currentTimeMillis() + "_" + VM.getCurrentVMNum());
+    persistentDirectory.mkdir();
+    DiskStoreFactory dsf = cache.createDiskStoreFactory();
+    File[] dirs1 = new File[] { persistentDirectory };
+    if (isParallel) {
+      GatewaySenderFactory gateway = cache.createGatewaySenderFactory();
+      gateway.setParallel(true);
+      gateway.setMaximumQueueMemory(maxMemory);
+      gateway.setBatchSize(batchSize);
+      gateway.setManualStart(isManualStart);
+      ((InternalGatewaySenderFactory) gateway)
+          .setLocatorDiscoveryCallback(new MyLocatorCallback());
+      if (filter != null) {
+        gateway.addGatewayEventFilter(filter);
+      }
+      if (isPersistent) {
+        gateway.setPersistenceEnabled(true);
+        gateway.setDiskStoreName(dsf.setDiskDirs(dirs1).create(dsName)
+            .getName());
+      } else {
+        DiskStore store = dsf.setDiskDirs(dirs1).create(dsName);
+        gateway.setDiskStoreName(store.getName());
+      }
+      gateway.setBatchConflationEnabled(isConflation);
+      gateway.create(dsName, remoteDsId);
+
+    } else {
+      GatewaySenderFactory gateway = cache.createGatewaySenderFactory();
+      gateway.setMaximumQueueMemory(maxMemory);
+      gateway.setBatchSize(batchSize);
+      gateway.setManualStart(isManualStart);
+      ((InternalGatewaySenderFactory) gateway)
+          .setLocatorDiscoveryCallback(new MyLocatorCallback());
+      if (filter != null) {
+        gateway.addGatewayEventFilter(filter);
+      }
+      gateway.setBatchConflationEnabled(isConflation);
+      if (isPersistent) {
+        gateway.setPersistenceEnabled(true);
+        gateway.setDiskStoreName(dsf.setDiskDirs(dirs1).create(dsName)
+            .getName());
+      } else {
+        DiskStore store = dsf.setDiskDirs(dirs1).create(dsName);
+        gateway.setDiskStoreName(store.getName());
+      }
+      gateway.create(dsName, remoteDsId);
+    }
+  }
+
+  
+  public static void createPartitionedRegion(String regionName, String senderIds, Integer redundantCopies, Integer totalNumBuckets){
+    AttributesFactory fact = new AttributesFactory();
+    if(senderIds!= null){
+      StringTokenizer tokenizer = new StringTokenizer(senderIds, ",");
+      while (tokenizer.hasMoreTokens()){
+        String senderId = tokenizer.nextToken();
+        fact.addGatewaySenderId(senderId);
+      }
+    }
+    PartitionAttributesFactory pfact = new PartitionAttributesFactory();
+    pfact.setTotalNumBuckets(totalNumBuckets);
+    pfact.setRedundantCopies(redundantCopies);
+    pfact.setRecoveryDelay(0);
+    fact.setPartitionAttributes(pfact.create());
+    Region r = cache.createRegionFactory(fact.create()).create(regionName);
+    assertNotNull(r);
+  }
+
+  public static void createReplicatedRegion(String regionName, String senderIds){
+    AttributesFactory fact = new AttributesFactory();
+    if(senderIds!= null){
+      StringTokenizer tokenizer = new StringTokenizer(senderIds, ",");
+      while (tokenizer.hasMoreTokens()){
+        String senderId = tokenizer.nextToken();
+//        GatewaySender sender = cache.getGatewaySender(senderId);
+//        assertNotNull(sender);
+        fact.addGatewaySenderId(senderId);
+      }
+    }
+    fact.setDataPolicy(DataPolicy.REPLICATE);
+    fact.setScope(Scope.DISTRIBUTED_ACK);
+    Region r = cache.createRegionFactory(fact.create()).create(regionName);
+    assertNotNull(r);
+  }
+
+  public static void waitForSenderRunningState(String senderId){
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    final GatewaySender sender = getGatewaySenderById(senders, senderId);
+    
+    WaitCriterion wc = new WaitCriterion() {
+      public boolean done() {
+        if (sender != null && sender.isRunning()) {
+          return true;
+        }
+        return false;
+      }
+
+      public String description() {
+        return "Expected sender isRunning state to be true but is false";
+      }
+    };
+    DistributedTestCase.waitForCriterion(wc, 300000, 500, true);
+  }
+
+  public static Integer createFirstRemoteLocator(int dsId, int remoteLocPort) {
+    UpdateVersionDUnitTest test = new UpdateVersionDUnitTest(testName);
+    int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
+    props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port + "]");
+    props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost");
+    props.setProperty(DistributionConfig.REMOTE_LOCATORS_NAME, "localhost[" + remoteLocPort + "]");
+    props.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "false");
+    props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+    test.getSystem(props);
+    return port;
+  }
+
+  public static void createConcurrentSender(String dsName, int remoteDsId,
+      boolean isParallel, Integer maxMemory,
+      Integer batchSize, boolean isConflation, boolean isPersistent,
+      GatewayEventFilter filter, boolean isManulaStart, int concurrencyLevel) {
+    File persistentDirectory = new File(dsName +"_disk_"+System.currentTimeMillis()+"_" + VM.getCurrentVMNum());
+    persistentDirectory.mkdir();
+    DiskStoreFactory dsf = cache.createDiskStoreFactory();
+    File [] dirs1 = new File[] {persistentDirectory};
+    
+    if(isParallel) {
+      GatewaySenderFactory gateway = cache.createGatewaySenderFactory();
+      gateway.setParallel(true);
+      gateway.setMaximumQueueMemory(maxMemory);
+      gateway.setBatchSize(batchSize);
+      gateway.setManualStart(isManulaStart);
+      ((InternalGatewaySenderFactory)gateway).setLocatorDiscoveryCallback(new MyLocatorCallback());
+      if (filter != null) {
+        gateway.addGatewayEventFilter(filter);
+      }
+      if(isPersistent) {
+        gateway.setPersistenceEnabled(true);
+        gateway.setDiskStoreName(dsf.setDiskDirs(dirs1).create(dsName).getName());
+      }
+      else {
+        DiskStore store = dsf.setDiskDirs(dirs1).create(dsName);
+        gateway.setDiskStoreName(store.getName());
+      }
+      gateway.setBatchConflationEnabled(isConflation);
+      gateway.create(dsName, remoteDsId);
+      
+    }else {
+      GatewaySenderFactory gateway = cache.createGatewaySenderFactory();
+      gateway.setMaximumQueueMemory(maxMemory);
+      gateway.setBatchSize(batchSize);
+      gateway.setManualStart(isManulaStart);
+      ((InternalGatewaySenderFactory)gateway).setLocatorDiscoveryCallback(new MyLocatorCallback());
+      if (filter != null) {
+        gateway.addGatewayEventFilter(filter);
+      }
+      gateway.setBatchConflationEnabled(isConflation);
+      if(isPersistent) {
+        gateway.setPersistenceEnabled(true);
+        gateway.setDiskStoreName(dsf.setDiskDirs(dirs1).create(dsName).getName());
+      }
+      else {
+        DiskStore store = dsf.setDiskDirs(dirs1).create(dsName);
+        gateway.setDiskStoreName(store.getName());
+      }
+      gateway.setDispatcherThreads(concurrencyLevel);
+      gateway.create(dsName, remoteDsId);
+    }
+  }
+
+  public static int createReceiver(int locPort) {
+    UpdateVersionDUnitTest test = new UpdateVersionDUnitTest(testName);
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0");
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort
+        + "]");
+
+    InternalDistributedSystem ds = test.getSystem(props);
+    cache = CacheFactory.create(ds);    
+    GatewayReceiverFactory fact = cache.createGatewayReceiverFactory();
+    int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    fact.setStartPort(port);
+    fact.setEndPort(port);
+    GatewayReceiver receiver = fact.create();
+    try {
+      receiver.start();
+    } catch (IOException e) {
+      e.printStackTrace();
+      fail("Test " + test.getName() + " failed to start GatewayRecevier on port " + port);
+    }
+    return port;
+  }
+
+  public static void startSender(String senderId){
+    Set<GatewaySender> senders = cache.getGatewaySenders();
+    GatewaySender sender = null;
+    for(GatewaySender s : senders){
+      if(s.getId().equals(senderId)){
+        sender = s;
+        break;
+      }
+    }
+    sender.start();
+  }
+
+  protected static class MyLocatorCallback extends
+      LocatorDiscoveryCallbackAdapter {
+
+    private final Set discoveredLocators = new HashSet();
+
+    private final Set removedLocators = new HashSet();
+
+    public synchronized void locatorsDiscovered(List locators) {
+      discoveredLocators.addAll(locators);
+      notifyAll();
+    }
+
+    public synchronized void locatorsRemoved(List locators) {
+      removedLocators.addAll(locators);
+      notifyAll();
+    }
+
+    public boolean waitForDiscovery(InetSocketAddress locator, long time)
+        throws InterruptedException {
+      return waitFor(discoveredLocators, locator, time);
+    }
+
+    public boolean waitForRemove(InetSocketAddress locator, long time)
+        throws InterruptedException {
+      return waitFor(removedLocators, locator, time);
+    }
+
+    private synchronized boolean waitFor(Set set, InetSocketAddress locator,
+        long time) throws InterruptedException {
+      long remaining = time;
+      long endTime = System.currentTimeMillis() + time;
+      while (!set.contains(locator) && remaining >= 0) {
+        wait(remaining);
+        remaining = endTime - System.currentTimeMillis();
+      }
+      return set.contains(locator);
+    }
+
+    public synchronized Set getDiscovered() {
+      return new HashSet(discoveredLocators);
+    }
+
+    public synchronized Set getRemoved() {
+      return new HashSet(removedLocators);
+    }
+  }
+
+  private static GatewaySender getGatewaySenderById(Set<GatewaySender> senders, String senderId) {
+    for(GatewaySender s : senders){
+      if(s.getId().equals(senderId)){
+        return s;
+      }
+    }
+    //if none of the senders matches with the supplied senderid, return null
+    return null;
+  }
+
+  public static Integer createFirstLocatorWithDSId(int dsId) {
+    UpdateVersionDUnitTest test = new UpdateVersionDUnitTest(testName);
+    int port = AvailablePortHelper.getRandomAvailablePortForDUnitSite();
+    Properties props = new Properties();
+    props.setProperty(DistributionConfig.MCAST_PORT_NAME,"0");
+    props.setProperty(DistributionConfig.DISTRIBUTED_SYSTEM_ID_NAME, ""+dsId);
+    props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + port + "]");
+    props.setProperty(DistributionConfig.ENABLE_CLUSTER_CONFIGURATION_NAME, "false");
+    props.setProperty(DistributionConfig.USE_CLUSTER_CONFIGURATION_NAME, "false");
+    props.setProperty(DistributionConfig.START_LOCATOR_NAME, "localhost[" + port + "],server=true,peer=true,hostname-for-clients=localhost");
+    test.getSystem(props);
+    return port;
+  }
+}
\ No newline at end of file


[61/70] incubator-geode git commit: Merge remote-tracking branch 'origin/develop' into wan_cq_donation

Posted by up...@apache.org.
Merge remote-tracking branch 'origin/develop' into wan_cq_donation


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/8d8b5736
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/8d8b5736
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/8d8b5736

Branch: refs/heads/develop
Commit: 8d8b5736d5c0d0307142cc86de7ecbfde095770d
Parents: 0979936 45d5eda
Author: Dan Smith <up...@apache.org>
Authored: Tue Jan 26 11:02:12 2016 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Tue Jan 26 11:02:12 2016 -0800

----------------------------------------------------------------------
 LICENSE                                         |   80 +-
 NOTICE                                          |    2 +-
 README.md                                       |    7 +-
 build.gradle                                    |   22 +-
 gemfire-assembly/src/main/dist/LICENSE          |   81 +-
 gemfire-assembly/src/main/dist/NOTICE           |    2 +-
 .../SharedConfigurationEndToEndDUnitTest.java   |    9 +-
 gemfire-core/build.gradle                       |    4 +-
 .../cache/client/ClientCacheFactory.java        |    2 +-
 .../cache/client/internal/ConnectionImpl.java   |    5 +-
 .../query/internal/index/MemoryIndexStore.java  |   67 +-
 .../internal/membership/NetView.java            |   10 +
 .../gms/messenger/JGroupsMessenger.java         |   38 +-
 .../membership/gms/messenger/Transport.java     |   34 +-
 .../gemfire/internal/cache/AbstractRegion.java  |    5 +-
 .../internal/cache/GemFireCacheImpl.java        |  103 +-
 .../gemfire/internal/cache/LocalRegion.java     |    3 +-
 .../gemfire/internal/cache/PoolManagerImpl.java |    4 +-
 .../internal/i18n/ParentLocalizedStrings.java   |    9 +-
 .../com/gemstone/gemfire/TXExpiryJUnitTest.java |    5 +-
 .../cache/CacheRegionClearStatsDUnitTest.java   |    7 +-
 .../cache/ClientServerTimeSyncDUnitTest.java    |    7 +-
 .../cache/ConnectionPoolAndLoaderDUnitTest.java |    9 +-
 .../ClientServerRegisterInterestsDUnitTest.java |   13 +-
 .../internal/AutoConnectionSourceDUnitTest.java |   11 +-
 .../CacheServerSSLConnectionDUnitTest.java      |    7 +-
 .../internal/LocatorLoadBalancingDUnitTest.java |   16 +-
 .../cache/client/internal/LocatorTestBase.java  |   11 +-
 .../internal/SSLNoClientAuthDUnitTest.java      |    7 +-
 .../pooling/ConnectionManagerJUnitTest.java     |    5 +-
 .../management/MemoryThresholdsDUnitTest.java   |   13 +-
 .../MemoryThresholdsOffHeapDUnitTest.java       |   13 +-
 .../management/ResourceManagerDUnitTest.java    |    9 +-
 .../mapInterface/PutAllGlobalLockJUnitTest.java |    3 +-
 .../PartitionRegionHelperDUnitTest.java         |   11 +-
 .../gemfire/cache/query/QueryTestUtils.java     |    5 +-
 .../query/cq/dunit/CqQueryTestListener.java     |    5 +-
 .../query/dunit/CompactRangeIndexDUnitTest.java |   11 +-
 .../cache/query/dunit/CqTimeTestListener.java   |    5 +-
 .../cache/query/dunit/GroupByDUnitImpl.java     |    7 +-
 .../dunit/GroupByPartitionedQueryDUnitTest.java |    7 +-
 .../query/dunit/GroupByQueryDUnitTest.java      |    7 +-
 .../cache/query/dunit/HashIndexDUnitTest.java   |    9 +-
 .../cache/query/dunit/HelperTestCase.java       |    9 +-
 .../dunit/NonDistinctOrderByDUnitImpl.java      |    7 +-
 .../NonDistinctOrderByPartitionedDUnitTest.java |    7 +-
 .../query/dunit/PdxStringQueryDUnitTest.java    |   13 +-
 .../dunit/QueryDataInconsistencyDUnitTest.java  |   11 +-
 .../dunit/QueryIndexUsingXMLDUnitTest.java      |   13 +-
 .../QueryParamsAuthorizationDUnitTest.java      |    7 +-
 .../QueryUsingFunctionContextDUnitTest.java     |    7 +-
 .../query/dunit/QueryUsingPoolDUnitTest.java    |    7 +-
 .../cache/query/dunit/RemoteQueryDUnitTest.java |   34 +-
 ...esourceManagerWithQueryMonitorDUnitTest.java |   11 +-
 .../query/dunit/SelectStarQueryDUnitTest.java   |    7 +-
 .../IndexCreationDeadLockJUnitTest.java         |    3 +-
 .../IndexMaintenanceAsynchJUnitTest.java        |    5 +-
 .../functional/LikePredicateJUnitTest.java      |    3 +-
 .../internal/ExecutionContextJUnitTest.java     |    3 +-
 .../index/AsynchIndexMaintenanceJUnitTest.java  |    5 +-
 ...rrentIndexInitOnOverflowRegionDUnitTest.java |    9 +-
 ...ndexOperationsOnOverflowRegionDUnitTest.java |    9 +-
 ...pdateWithInplaceObjectModFalseDUnitTest.java |   12 +-
 ...ConcurrentIndexUpdateWithoutWLDUnitTest.java |   12 +-
 .../index/CopyOnReadIndexDUnitTest.java         |   11 +-
 .../index/IndexCreationInternalsJUnitTest.java  |    3 +-
 .../index/IndexMaintainceJUnitTest.java         |    3 +-
 .../IndexTrackingQueryObserverDUnitTest.java    |    9 +-
 ...itializeIndexEntryDestroyQueryDUnitTest.java |    9 +-
 .../index/MemoryIndexStoreJUnitTest.java        |  396 +++++
 ...exStoreWithInplaceModificationJUnitTest.java |   54 +
 .../index/MultiIndexCreationDUnitTest.java      |   11 +-
 .../index/PutAllWithIndexPerfDUnitTest.java     |    5 +-
 .../PRBasicIndexCreationDUnitTest.java          |   11 +-
 .../PRBasicIndexCreationDeadlockDUnitTest.java  |   11 +-
 .../PRBasicMultiIndexCreationDUnitTest.java     |    9 +-
 .../partitioned/PRBasicQueryDUnitTest.java      |    5 +-
 .../PRBasicRemoveIndexDUnitTest.java            |    5 +-
 .../PRColocatedEquiJoinDUnitTest.java           |    5 +-
 .../partitioned/PRInvalidQueryDUnitTest.java    |    5 +-
 .../partitioned/PRQueryCacheCloseDUnitTest.java |    9 +-
 .../PRQueryCacheClosedJUnitTest.java            |    3 +-
 .../query/partitioned/PRQueryDUnitHelper.java   |   16 +-
 .../query/partitioned/PRQueryDUnitTest.java     |    7 +-
 .../query/partitioned/PRQueryPerfDUnitTest.java |    5 +-
 .../PRQueryRegionCloseDUnitTest.java            |    9 +-
 .../PRQueryRegionDestroyedDUnitTest.java        |    9 +-
 .../PRQueryRegionDestroyedJUnitTest.java        |    3 +-
 .../PRQueryRemoteNodeExceptionDUnitTest.java    |   11 +-
 .../snapshot/ParallelSnapshotDUnitTest.java     |    7 +-
 .../snapshot/SnapshotByteArrayDUnitTest.java    |    5 +-
 .../cache/snapshot/SnapshotDUnitTest.java       |    5 +-
 .../snapshot/SnapshotPerformanceDUnitTest.java  |    5 +-
 .../gemfire/cache30/Bug34387DUnitTest.java      |   19 +-
 .../gemfire/cache30/Bug34948DUnitTest.java      |   26 +-
 .../gemfire/cache30/Bug35214DUnitTest.java      |   19 +-
 .../gemfire/cache30/Bug38013DUnitTest.java      |   25 +-
 .../gemfire/cache30/Bug38741DUnitTest.java      |    7 +-
 .../gemfire/cache30/CacheCloseDUnitTest.java    |   16 +-
 .../gemfire/cache30/CacheLoaderTestCase.java    |   14 +-
 .../gemfire/cache30/CacheMapTxnDUnitTest.java   |   26 +-
 ...cheRegionsReliablityStatsCheckDUnitTest.java |    7 +-
 .../cache30/CacheSerializableRunnable.java      |   10 +-
 .../cache30/CacheStatisticsDUnitTest.java       |   13 +-
 .../gemstone/gemfire/cache30/CacheTestCase.java |    7 +-
 .../gemfire/cache30/CacheXml30DUnitTest.java    |   12 +-
 .../gemfire/cache30/CacheXml41DUnitTest.java    |   34 +-
 .../gemfire/cache30/CacheXml45DUnitTest.java    |    7 +-
 .../gemfire/cache30/CacheXml51DUnitTest.java    |    5 +-
 .../gemfire/cache30/CacheXml57DUnitTest.java    |   18 +-
 .../gemfire/cache30/CacheXml60DUnitTest.java    |   16 +-
 .../gemfire/cache30/CacheXml61DUnitTest.java    |    5 +-
 .../gemfire/cache30/CacheXml66DUnitTest.java    |    5 +-
 .../gemfire/cache30/CacheXml81DUnitTest.java    |    2 +-
 .../gemfire/cache30/CacheXml90DUnitTest.java    |   17 +-
 .../cache30/CachedAllEventsDUnitTest.java       |   16 +-
 .../gemfire/cache30/CallbackArgDUnitTest.java   |   29 +-
 .../cache30/CertifiableTestCacheListener.java   |    5 +-
 .../cache30/ClearMultiVmCallBkDUnitTest.java    |   27 +-
 .../gemfire/cache30/ClearMultiVmDUnitTest.java  |   33 +-
 .../cache30/ClientMembershipDUnitTest.java      |   11 +-
 .../ClientRegisterInterestDUnitTest.java        |    7 +-
 .../cache30/ClientServerCCEDUnitTest.java       |    9 +-
 .../gemfire/cache30/ClientServerTestCase.java   |    3 +-
 .../ConcurrentLeaveDuringGIIDUnitTest.java      |   11 +-
 .../gemfire/cache30/DiskRegionDUnitTest.java    |   45 +-
 .../gemfire/cache30/DiskRegionTestImpl.java     |   19 +-
 .../cache30/DistAckMapMethodsDUnitTest.java     |   37 +-
 ...tedAckOverflowRegionCCEOffHeapDUnitTest.java |    3 +-
 ...tributedAckPersistentRegionCCEDUnitTest.java |   15 +-
 ...dAckPersistentRegionCCEOffHeapDUnitTest.java |    3 +-
 .../DistributedAckRegionCCEDUnitTest.java       |   15 +-
 ...DistributedAckRegionCCEOffHeapDUnitTest.java |    3 +-
 ...istributedAckRegionCompressionDUnitTest.java |    3 +-
 .../cache30/DistributedAckRegionDUnitTest.java  |   34 +-
 .../DistributedAckRegionOffHeapDUnitTest.java   |    3 +-
 .../DistributedMulticastRegionDUnitTest.java    |   11 +-
 .../DistributedNoAckRegionCCEDUnitTest.java     |   11 +-
 ...stributedNoAckRegionCCEOffHeapDUnitTest.java |    3 +-
 .../DistributedNoAckRegionDUnitTest.java        |   17 +-
 .../DistributedNoAckRegionOffHeapDUnitTest.java |    3 +-
 .../gemfire/cache30/DynamicRegionDUnitTest.java |   21 +-
 .../gemfire/cache30/GlobalLockingDUnitTest.java |   15 +-
 .../cache30/GlobalRegionCCEDUnitTest.java       |    7 +-
 .../GlobalRegionCCEOffHeapDUnitTest.java        |    3 +-
 .../gemfire/cache30/GlobalRegionDUnitTest.java  |   25 +-
 .../cache30/GlobalRegionOffHeapDUnitTest.java   |    3 +-
 .../cache30/LRUEvictionControllerDUnitTest.java |    5 +-
 .../gemfire/cache30/LocalRegionDUnitTest.java   |   17 +-
 .../gemfire/cache30/MultiVMRegionTestCase.java  |   17 +-
 .../OffHeapLRUEvictionControllerDUnitTest.java  |    3 +-
 .../PRBucketSynchronizationDUnitTest.java       |    7 +-
 .../cache30/PartitionedRegionDUnitTest.java     |   22 +-
 ...tionedRegionMembershipListenerDUnitTest.java |    3 +-
 .../PartitionedRegionOffHeapDUnitTest.java      |    3 +-
 .../cache30/PreloadedRegionTestCase.java        |   14 +-
 .../gemfire/cache30/ProxyDUnitTest.java         |   34 +-
 .../cache30/PutAllCallBkRemoteVMDUnitTest.java  |   23 +-
 .../cache30/PutAllCallBkSingleVMDUnitTest.java  |   28 +-
 .../gemfire/cache30/PutAllMultiVmDUnitTest.java |   25 +-
 .../gemfire/cache30/QueueMsgDUnitTest.java      |   28 +-
 .../cache30/RRSynchronizationDUnitTest.java     |    7 +-
 .../gemfire/cache30/ReconnectDUnitTest.java     |   13 +-
 .../cache30/RegionExpirationDUnitTest.java      |   14 +-
 .../RegionMembershipListenerDUnitTest.java      |   28 +-
 .../RegionReliabilityListenerDUnitTest.java     |   26 +-
 .../cache30/RegionReliabilityTestCase.java      |   64 +-
 .../gemfire/cache30/RegionTestCase.java         |    9 +-
 .../cache30/RemoveAllMultiVmDUnitTest.java      |   22 +-
 .../gemfire/cache30/RequiredRolesDUnitTest.java |   28 +-
 .../cache30/RolePerformanceDUnitTest.java       |   15 +-
 .../gemfire/cache30/SearchAndLoadDUnitTest.java |   22 +-
 .../gemfire/cache30/SlowRecDUnitTest.java       |   35 +-
 .../gemfire/cache30/TXDistributedDUnitTest.java |   11 +-
 .../gemfire/cache30/TXOrderDUnitTest.java       |   41 +-
 .../cache30/TXRestrictionsDUnitTest.java        |   14 +-
 .../gemfire/cache30/TestCacheCallback.java      |    5 +-
 .../distributed/DistributedMemberDUnitTest.java |   26 +-
 .../distributed/DistributedSystemDUnitTest.java |    7 +-
 .../distributed/HostedLocatorsDUnitTest.java    |    9 +-
 .../gemfire/distributed/LocatorDUnitTest.java   |   13 +-
 .../gemfire/distributed/LocatorJUnitTest.java   |    5 +-
 .../gemfire/distributed/RoleDUnitTest.java      |   16 +-
 .../distributed/SystemAdminDUnitTest.java       |    5 +-
 .../distributed/internal/Bug40751DUnitTest.java |    9 +-
 .../ConsoleDistributionManagerDUnitTest.java    |    9 +-
 .../internal/DistributionAdvisorDUnitTest.java  |   13 +-
 .../internal/DistributionManagerDUnitTest.java  |    9 +-
 .../internal/ProductUseLogDUnitTest.java        |   11 +-
 .../GemFireDeadlockDetectorDUnitTest.java       |   11 +-
 .../internal/locks/CollaborationJUnitTest.java  |    5 +-
 .../internal/membership/NetViewJUnitTest.java   |   19 +-
 .../membership/gms/MembershipManagerHelper.java |    5 +-
 .../gms/fd/GMSHealthMonitorJUnitTest.java       |   26 +-
 .../gms/membership/GMSJoinLeaveJUnitTest.java   |   36 +-
 .../messenger/GMSQuorumCheckerJUnitTest.java    |    4 +-
 .../messenger/JGroupsMessengerJUnitTest.java    |   61 +-
 .../gms/mgr/GMSMembershipManagerJUnitTest.java  |   21 +-
 .../StreamingOperationManyDUnitTest.java        |   20 +-
 .../StreamingOperationOneDUnitTest.java         |   23 +-
 .../TcpServerBackwardCompatDUnitTest.java       |    7 +-
 .../gemfire/disttx/CacheMapDistTXDUnitTest.java |    5 +-
 .../gemfire/disttx/DistTXDebugDUnitTest.java    |    9 +-
 .../disttx/DistTXPersistentDebugDUnitTest.java  |    2 +-
 .../disttx/DistributedTransactionDUnitTest.java |    7 +-
 .../ClassNotFoundExceptionDUnitTest.java        |    9 +-
 .../gemfire/internal/JSSESocketJUnitTest.java   |    3 +-
 .../gemfire/internal/JarDeployerDUnitTest.java  |    7 +-
 .../internal/PdxDeleteFieldDUnitTest.java       |    7 +-
 .../gemfire/internal/PdxRenameDUnitTest.java    |    7 +-
 .../gemfire/internal/SocketCloserJUnitTest.java |    5 +-
 .../gemfire/internal/cache/BackupDUnitTest.java |   13 +-
 .../internal/cache/Bug33359DUnitTest.java       |    8 +-
 .../internal/cache/Bug33726DUnitTest.java       |    8 +-
 .../internal/cache/Bug37241DUnitTest.java       |    8 +-
 .../internal/cache/Bug37377DUnitTest.java       |   11 +-
 .../internal/cache/Bug39079DUnitTest.java       |    7 +-
 .../internal/cache/Bug40299DUnitTest.java       |   11 +-
 .../internal/cache/Bug40632DUnitTest.java       |    9 +-
 .../internal/cache/Bug41091DUnitTest.java       |    7 +-
 .../internal/cache/Bug41733DUnitTest.java       |   15 +-
 .../internal/cache/Bug41957DUnitTest.java       |   29 +-
 .../internal/cache/Bug42055DUnitTest.java       |    9 +-
 .../internal/cache/Bug45164DUnitTest.java       |    7 +-
 .../internal/cache/Bug45934DUnitTest.java       |    7 +-
 .../internal/cache/Bug47667DUnitTest.java       |    7 +-
 .../internal/cache/CacheAdvisorDUnitTest.java   |   30 +-
 .../internal/cache/ClearDAckDUnitTest.java      |   11 +-
 .../internal/cache/ClearGlobalDUnitTest.java    |    6 +-
 .../cache/ClientServerGetAllDUnitTest.java      |   33 +-
 ...ServerInvalidAndDestroyedEntryDUnitTest.java |  995 ++++++------
 .../ClientServerTransactionCCEDUnitTest.java    |    5 +-
 .../cache/ClientServerTransactionDUnitTest.java |   11 +-
 .../ConcurrentDestroySubRegionDUnitTest.java    |    9 +-
 .../cache/ConcurrentMapOpsDUnitTest.java        |   11 +-
 .../ConcurrentRegionOperationsJUnitTest.java    |    3 +-
 ...rentRollingAndRegionOperationsJUnitTest.java |    3 +-
 .../cache/ConnectDisconnectDUnitTest.java       |   13 +-
 .../internal/cache/DeltaFaultInDUnitTest.java   |    9 +-
 .../cache/DeltaPropagationDUnitTest.java        |    9 +-
 .../cache/DeltaPropagationStatsDUnitTest.java   |    7 +-
 .../internal/cache/DeltaSizingDUnitTest.java    |    9 +-
 .../cache/DiskRegByteArrayDUnitTest.java        |   15 +-
 .../cache/DiskRegionClearJUnitTest.java         |    3 +-
 .../internal/cache/DiskRegionJUnitTest.java     |    5 +-
 ...DistrbutedRegionProfileOffHeapDUnitTest.java |    5 +-
 .../cache/DistributedCacheTestCase.java         |   23 +-
 .../internal/cache/EventTrackerDUnitTest.java   |    7 +-
 .../internal/cache/EvictionStatsDUnitTest.java  |    7 +-
 .../internal/cache/EvictionTestBase.java        |   11 +-
 .../cache/FixedPRSinglehopDUnitTest.java        |    9 +-
 .../internal/cache/GIIDeltaDUnitTest.java       |   13 +-
 .../internal/cache/GIIFlowControlDUnitTest.java |    9 +-
 .../internal/cache/GridAdvisorDUnitTest.java    |   25 +-
 .../internal/cache/HABug36773DUnitTest.java     |    7 +-
 .../HAOverflowMemObjectSizerDUnitTest.java      |    7 +-
 .../cache/IncrementalBackupDUnitTest.java       |   11 +-
 .../cache/InterruptClientServerDUnitTest.java   |    9 +-
 .../internal/cache/InterruptsDUnitTest.java     |    9 +-
 .../internal/cache/IteratorDUnitTest.java       |    7 +-
 .../internal/cache/MapClearGIIDUnitTest.java    |   14 +-
 .../internal/cache/MapInterface2JUnitTest.java  |    3 +-
 .../cache/NetSearchMessagingDUnitTest.java      |   11 +-
 .../cache/OffHeapEvictionDUnitTest.java         |    7 +-
 .../cache/OffHeapEvictionStatsDUnitTest.java    |    3 +-
 .../gemfire/internal/cache/OplogJUnitTest.java  |    5 +-
 .../cache/P2PDeltaPropagationDUnitTest.java     |    7 +-
 .../internal/cache/PRBadToDataDUnitTest.java    |    9 +-
 .../cache/PartitionListenerDUnitTest.java       |    9 +-
 .../cache/PartitionedRegionAPIDUnitTest.java    |    7 +-
 .../PartitionedRegionAsSubRegionDUnitTest.java  |    5 +-
 ...gionBucketCreationDistributionDUnitTest.java |   22 +-
 .../PartitionedRegionCacheCloseDUnitTest.java   |    9 +-
 ...rtitionedRegionCacheXMLExampleDUnitTest.java |    5 +-
 .../PartitionedRegionCreationDUnitTest.java     |   11 +-
 .../cache/PartitionedRegionDUnitTestCase.java   |    5 +-
 ...rtitionedRegionDelayedRecoveryDUnitTest.java |    9 +-
 .../PartitionedRegionDestroyDUnitTest.java      |   11 +-
 .../PartitionedRegionEntryCountDUnitTest.java   |    9 +-
 .../PartitionedRegionEvictionDUnitTest.java     |   11 +-
 .../cache/PartitionedRegionHADUnitTest.java     |   13 +-
 ...onedRegionHAFailureAndRecoveryDUnitTest.java |   22 +-
 .../PartitionedRegionInvalidateDUnitTest.java   |    7 +-
 ...artitionedRegionLocalMaxMemoryDUnitTest.java |    7 +-
 ...nedRegionLocalMaxMemoryOffHeapDUnitTest.java |    3 +-
 .../PartitionedRegionMultipleDUnitTest.java     |    8 +-
 ...rtitionedRegionOffHeapEvictionDUnitTest.java |    3 +-
 .../cache/PartitionedRegionPRIDDUnitTest.java   |    9 +-
 .../cache/PartitionedRegionQueryDUnitTest.java  |    9 +-
 ...artitionedRegionRedundancyZoneDUnitTest.java |    9 +-
 ...tionedRegionSerializableObjectJUnitTest.java |    2 +-
 .../PartitionedRegionSingleHopDUnitTest.java    |    9 +-
 ...RegionSingleHopWithServerGroupDUnitTest.java |    9 +-
 .../cache/PartitionedRegionSizeDUnitTest.java   |   13 +-
 .../cache/PartitionedRegionStatsDUnitTest.java  |    7 +-
 .../PartitionedRegionTestUtilsDUnitTest.java    |    5 +-
 .../PartitionedRegionWithSameNameDUnitTest.java |   14 +-
 .../internal/cache/PutAllDAckDUnitTest.java     |   16 +-
 .../internal/cache/PutAllGlobalDUnitTest.java   |   25 +-
 .../cache/RemoteTransactionDUnitTest.java       |   13 +-
 .../internal/cache/RemoveAllDAckDUnitTest.java  |   12 +-
 .../internal/cache/RemoveDAckDUnitTest.java     |   10 +-
 .../internal/cache/RemoveGlobalDUnitTest.java   |   23 +-
 .../cache/SimpleDiskRegionJUnitTest.java        |    3 +-
 .../internal/cache/SingleHopStatsDUnitTest.java |    7 +-
 .../internal/cache/SizingFlagDUnitTest.java     |    9 +-
 .../internal/cache/SystemFailureDUnitTest.java  |    7 +-
 .../cache/TXReservationMgrJUnitTest.java        |    3 +-
 .../cache/TransactionsWithDeltaDUnitTest.java   |    7 +-
 .../control/RebalanceOperationDUnitTest.java    |   11 +-
 ...egionOverflowAsyncRollingOpLogJUnitTest.java |    5 +-
 ...RegionOverflowSyncRollingOpLogJUnitTest.java |    5 +-
 ...ltiThreadedOplogPerJUnitPerformanceTest.java |    3 +-
 .../cache/execute/Bug51193DUnitTest.java        |    7 +-
 .../ClientServerFunctionExecutionDUnitTest.java |    5 +-
 .../execute/ColocationFailoverDUnitTest.java    |    9 +-
 ...ributedRegionFunctionExecutionDUnitTest.java |    9 +-
 .../FunctionExecution_ExceptionDUnitTest.java   |    9 +-
 .../execute/FunctionServiceStatsDUnitTest.java  |   11 +-
 .../cache/execute/LocalDataSetDUnitTest.java    |   11 +-
 .../execute/LocalDataSetIndexingDUnitTest.java  |    5 +-
 .../LocalFunctionExecutionDUnitTest.java        |    9 +-
 .../MemberFunctionExecutionDUnitTest.java       |    9 +-
 .../MultiRegionFunctionExecutionDUnitTest.java  |    7 +-
 .../OnGroupsFunctionExecutionDUnitTest.java     |    9 +-
 ...tServerRegionFunctionExecutionDUnitTest.java |    7 +-
 ...egionFunctionExecutionFailoverDUnitTest.java |   11 +-
 ...onFunctionExecutionNoSingleHopDUnitTest.java |    5 +-
 ...onExecutionSelectorNoSingleHopDUnitTest.java |    5 +-
 ...gionFunctionExecutionSingleHopDUnitTest.java |    5 +-
 .../cache/execute/PRClientServerTestBase.java   |   11 +-
 .../cache/execute/PRColocationDUnitTest.java    |   12 +-
 .../execute/PRCustomPartitioningDUnitTest.java  |    7 +-
 .../execute/PRFunctionExecutionDUnitTest.java   |   13 +-
 .../PRFunctionExecutionTimeOutDUnitTest.java    |    7 +-
 ...ctionExecutionWithResultSenderDUnitTest.java |    7 +-
 .../execute/PRPerformanceTestDUnitTest.java     |    7 +-
 .../cache/execute/PRTransactionDUnitTest.java   |    3 +-
 .../execute/SingleHopGetAllPutAllDUnitTest.java |    3 +-
 .../functions/DistributedRegionFunction.java    |    5 +-
 .../internal/cache/functions/TestFunction.java  |    5 +-
 .../ha/BlockingHARQAddOperationJUnitTest.java   |    3 +-
 .../cache/ha/BlockingHARegionJUnitTest.java     |    5 +-
 .../cache/ha/Bug36853EventsExpiryDUnitTest.java |    5 +-
 .../internal/cache/ha/Bug48571DUnitTest.java    |    7 +-
 .../internal/cache/ha/Bug48879DUnitTest.java    |    7 +-
 .../cache/ha/EventIdOptimizationDUnitTest.java  |    7 +-
 .../internal/cache/ha/FailoverDUnitTest.java    |    7 +-
 .../internal/cache/ha/HABugInPutDUnitTest.java  |    7 +-
 .../internal/cache/ha/HAClearDUnitTest.java     |    7 +-
 .../cache/ha/HAConflationDUnitTest.java         |    7 +-
 .../internal/cache/ha/HADuplicateDUnitTest.java |    7 +-
 .../cache/ha/HAEventIdPropagationDUnitTest.java |    7 +-
 .../internal/cache/ha/HAExpiryDUnitTest.java    |    9 +-
 .../internal/cache/ha/HAGIIBugDUnitTest.java    |   11 +-
 .../internal/cache/ha/HAGIIDUnitTest.java       |    9 +-
 .../cache/ha/HARQAddOperationJUnitTest.java     |    3 +-
 .../cache/ha/HARQueueNewImplDUnitTest.java      |    7 +-
 .../internal/cache/ha/HARegionDUnitTest.java    |    7 +-
 .../cache/ha/HARegionQueueDUnitTest.java        |    7 +-
 .../cache/ha/HARegionQueueJUnitTest.java        |    3 +-
 .../cache/ha/HASlowReceiverDUnitTest.java       |    6 +-
 .../ha/OperationsPropagationDUnitTest.java      |    7 +-
 .../internal/cache/ha/PutAllDUnitTest.java      |    7 +-
 .../internal/cache/ha/StatsBugDUnitTest.java    |    7 +-
 .../cache/locks/TXLockServiceDUnitTest.java     |   29 +-
 .../cache/partitioned/Bug39356DUnitTest.java    |    9 +-
 .../cache/partitioned/Bug43684DUnitTest.java    |    7 +-
 .../cache/partitioned/Bug47388DUnitTest.java    |    7 +-
 .../cache/partitioned/Bug51400DUnitTest.java    |    9 +-
 .../partitioned/ElidedPutAllDUnitTest.java      |    7 +-
 .../partitioned/PartitionResolverDUnitTest.java |    7 +-
 .../PartitionedRegionLoaderWriterDUnitTest.java |    4 +-
 ...rtitionedRegionMetaDataCleanupDUnitTest.java |    9 +-
 .../partitioned/PersistPRKRFDUnitTest.java      |    9 +-
 ...tentColocatedPartitionedRegionDUnitTest.java |   11 +-
 .../PersistentPartitionedRegionDUnitTest.java   |   15 +-
 .../PersistentPartitionedRegionTestBase.java    |    9 +-
 ...rtitionedRegionWithTransactionDUnitTest.java |    9 +-
 .../cache/partitioned/ShutdownAllDUnitTest.java |   15 +-
 ...treamingPartitionOperationManyDUnitTest.java |   29 +-
 ...StreamingPartitionOperationOneDUnitTest.java |   34 +-
 .../fixed/FixedPartitioningDUnitTest.java       |    7 +-
 .../fixed/FixedPartitioningTestBase.java        |    9 +-
 ...ngWithColocationAndPersistenceDUnitTest.java |    5 +-
 .../PersistentRVVRecoveryDUnitTest.java         |   11 +-
 .../PersistentRecoveryOrderDUnitTest.java       |   11 +-
 ...rsistentRecoveryOrderOldConfigDUnitTest.java |    7 +-
 .../PersistentReplicatedTestBase.java           |    7 +-
 .../internal/cache/tier/Bug40396DUnitTest.java  |    9 +-
 ...mpatibilityHigherVersionClientDUnitTest.java |    7 +-
 .../cache/tier/sockets/Bug36269DUnitTest.java   |    7 +-
 .../cache/tier/sockets/Bug36457DUnitTest.java   |    7 +-
 .../cache/tier/sockets/Bug36805DUnitTest.java   |    7 +-
 .../cache/tier/sockets/Bug36829DUnitTest.java   |    7 +-
 .../cache/tier/sockets/Bug36995DUnitTest.java   |    7 +-
 .../cache/tier/sockets/Bug37210DUnitTest.java   |    7 +-
 .../cache/tier/sockets/Bug37805DUnitTest.java   |    7 +-
 .../CacheServerMaxConnectionsJUnitTest.java     |    5 +-
 .../cache/tier/sockets/CacheServerTestUtil.java |    3 +-
 .../CacheServerTransactionsDUnitTest.java       |    7 +-
 .../tier/sockets/ClearPropagationDUnitTest.java |    7 +-
 .../tier/sockets/ClientConflationDUnitTest.java |    7 +-
 .../sockets/ClientHealthMonitorJUnitTest.java   |    5 +-
 .../sockets/ClientInterestNotifyDUnitTest.java  |    7 +-
 .../tier/sockets/ClientServerMiscDUnitTest.java |   11 +-
 .../cache/tier/sockets/ConflationDUnitTest.java |    7 +-
 .../tier/sockets/ConnectionProxyJUnitTest.java  |    5 +-
 .../DataSerializerPropogationDUnitTest.java     |    7 +-
 .../DestroyEntryPropagationDUnitTest.java       |    7 +-
 .../sockets/DurableClientBug39997DUnitTest.java |    7 +-
 .../DurableClientQueueSizeDUnitTest.java        |    7 +-
 .../DurableClientReconnectAutoDUnitTest.java    |    5 +-
 .../DurableClientReconnectDUnitTest.java        |    7 +-
 .../sockets/DurableClientStatsDUnitTest.java    |    7 +-
 .../sockets/DurableRegistrationDUnitTest.java   |    7 +-
 .../sockets/DurableResponseMatrixDUnitTest.java |    7 +-
 .../sockets/EventIDVerificationDUnitTest.java   |    7 +-
 .../EventIDVerificationInP2PDUnitTest.java      |    7 +-
 .../ForceInvalidateEvictionDUnitTest.java       |    7 +-
 ...ForceInvalidateOffHeapEvictionDUnitTest.java |    3 +-
 .../cache/tier/sockets/HABug36738DUnitTest.java |    7 +-
 .../tier/sockets/HAInterestPart1DUnitTest.java  |    2 +-
 .../tier/sockets/HAInterestPart2DUnitTest.java  |    5 +-
 .../cache/tier/sockets/HAInterestTestCase.java  |    7 +-
 .../sockets/HAStartupAndFailoverDUnitTest.java  |    7 +-
 .../InstantiatorPropagationDUnitTest.java       |    7 +-
 .../tier/sockets/InterestListDUnitTest.java     |    9 +-
 .../sockets/InterestListEndpointDUnitTest.java  |    9 +-
 .../sockets/InterestListFailoverDUnitTest.java  |    7 +-
 .../sockets/InterestListRecoveryDUnitTest.java  |    6 +-
 .../sockets/InterestRegrListenerDUnitTest.java  |    7 +-
 .../sockets/InterestResultPolicyDUnitTest.java  |    7 +-
 .../sockets/NewRegionAttributesDUnitTest.java   |    7 +-
 .../sockets/RedundancyLevelPart1DUnitTest.java  |    4 +-
 .../sockets/RedundancyLevelPart2DUnitTest.java  |    4 +-
 .../sockets/RedundancyLevelPart3DUnitTest.java  |    5 +-
 .../tier/sockets/RedundancyLevelTestBase.java   |    7 +-
 .../tier/sockets/RegionCloseDUnitTest.java      |    7 +-
 ...erInterestBeforeRegionCreationDUnitTest.java |    7 +-
 .../sockets/RegisterInterestKeysDUnitTest.java  |    7 +-
 .../sockets/ReliableMessagingDUnitTest.java     |    7 +-
 .../sockets/UnregisterInterestDUnitTest.java    |    7 +-
 .../sockets/UpdatePropagationDUnitTest.java     |    7 +-
 .../VerifyEventIDGenerationInP2PDUnitTest.java  |    7 +-
 ...UpdatesFromNonInterestEndPointDUnitTest.java |    7 +-
 .../versions/RegionVersionVectorJUnitTest.java  |    3 +-
 .../cache/wan/AsyncEventQueueTestBase.java      |    7 +-
 .../AsyncEventQueueStatsDUnitTest.java          |    3 +-
 .../ConcurrentAsyncEventQueueDUnitTest.java     |    3 +-
 .../CompressionCacheConfigDUnitTest.java        |    7 +-
 .../CompressionCacheListenerDUnitTest.java      |    9 +-
 ...ompressionCacheListenerOffHeapDUnitTest.java |    3 +-
 .../CompressionRegionConfigDUnitTest.java       |   11 +-
 .../CompressionRegionFactoryDUnitTest.java      |    9 +-
 .../CompressionRegionOperationsDUnitTest.java   |    9 +-
 ...ressionRegionOperationsOffHeapDUnitTest.java |    3 +-
 .../compression/CompressionStatsDUnitTest.java  |    9 +-
 .../internal/jta/dunit/CommitThread.java        |   28 +-
 .../internal/jta/dunit/ExceptionsDUnitTest.java |   42 +-
 .../jta/dunit/IdleTimeOutDUnitTest.java         |   44 +-
 .../jta/dunit/LoginTimeOutDUnitTest.java        |   11 +-
 .../jta/dunit/MaxPoolSizeDUnitTest.java         |   43 +-
 .../internal/jta/dunit/RollbackThread.java      |   28 +-
 .../jta/dunit/TransactionTimeOutDUnitTest.java  |   26 +-
 .../dunit/TxnManagerMultiThreadDUnitTest.java   |   51 +-
 .../internal/jta/dunit/TxnTimeOutDUnitTest.java |   31 +-
 .../DistributedSystemLogFileJUnitTest.java      |    5 +-
 .../logging/LocatorLogFileJUnitTest.java        |    5 +-
 .../logging/MergeLogFilesJUnitTest.java         |    3 +-
 .../internal/offheap/OffHeapRegionBase.java     |    5 +-
 .../offheap/OutOfOffHeapMemoryDUnitTest.java    |    5 +-
 .../process/LocalProcessLauncherDUnitTest.java  |    7 +-
 .../statistics/StatisticsDUnitTest.java         |    9 +-
 .../statistics/ValueMonitorJUnitTest.java       |    4 +-
 .../management/CacheManagementDUnitTest.java    |    8 +-
 .../management/ClientHealthStatsDUnitTest.java  |   13 +-
 .../management/CompositeTypeTestDUnitTest.java  |    5 +-
 .../management/DLockManagementDUnitTest.java    |    5 +-
 .../management/DiskManagementDUnitTest.java     |    9 +-
 .../management/DistributedSystemDUnitTest.java  |    9 +-
 .../management/LocatorManagementDUnitTest.java  |    7 +-
 .../gemstone/gemfire/management/MBeanUtil.java  |    5 +-
 .../gemfire/management/ManagementTestBase.java  |   13 +-
 .../MemberMBeanAttributesDUnitTest.java         |    5 +-
 .../management/OffHeapManagementDUnitTest.java  |    9 +-
 .../gemfire/management/QueryDataDUnitTest.java  |    8 +-
 .../management/RegionManagementDUnitTest.java   |    5 +-
 ...ersalMembershipListenerAdapterDUnitTest.java |    7 +-
 .../stats/DistributedSystemStatsDUnitTest.java  |    5 +-
 .../internal/cli/CliUtilDUnitTest.java          |   11 +-
 .../cli/commands/CliCommandTestBase.java        |    7 +-
 .../cli/commands/ConfigCommandsDUnitTest.java   |   11 +-
 ...eateAlterDestroyRegionCommandsDUnitTest.java |   10 +-
 .../cli/commands/DeployCommandsDUnitTest.java   |    8 +-
 .../commands/DiskStoreCommandsDUnitTest.java    |   11 +-
 .../cli/commands/FunctionCommandsDUnitTest.java |   10 +-
 .../commands/GemfireDataCommandsDUnitTest.java  |   11 +-
 ...WithCacheLoaderDuringCacheMissDUnitTest.java |   21 +-
 .../cli/commands/IndexCommandsDUnitTest.java    |   10 +-
 ...stAndDescribeDiskStoreCommandsDUnitTest.java |   15 +-
 .../ListAndDescribeRegionDUnitTest.java         |    6 +-
 .../cli/commands/ListIndexCommandDUnitTest.java |   33 +-
 .../cli/commands/MemberCommandsDUnitTest.java   |    6 +-
 .../MiscellaneousCommandsDUnitTest.java         |    9 +-
 ...laneousCommandsExportLogsPart1DUnitTest.java |    6 +-
 ...laneousCommandsExportLogsPart2DUnitTest.java |    6 +-
 ...laneousCommandsExportLogsPart3DUnitTest.java |    6 +-
 ...laneousCommandsExportLogsPart4DUnitTest.java |    6 +-
 .../cli/commands/QueueCommandsDUnitTest.java    |    8 +-
 .../SharedConfigurationCommandsDUnitTest.java   |   11 +-
 .../cli/commands/ShowDeadlockDUnitTest.java     |    8 +-
 .../cli/commands/ShowMetricsDUnitTest.java      |    8 +-
 .../cli/commands/ShowStackTraceDUnitTest.java   |    6 +-
 .../cli/commands/UserCommandsDUnitTest.java     |    5 +-
 .../SharedConfigurationDUnitTest.java           |   11 +-
 .../internal/pulse/TestClientIdsDUnitTest.java  |   13 +-
 .../internal/pulse/TestFunctionsDUnitTest.java  |    4 +-
 .../internal/pulse/TestHeapDUnitTest.java       |    3 +-
 .../pulse/TestSubscriptionsDUnitTest.java       |   10 +-
 .../ClientsWithVersioningRetryDUnitTest.java    |    9 +-
 .../pdx/DistributedSystemIdDUnitTest.java       |    9 +-
 .../pdx/JSONPdxClientServerDUnitTest.java       |    8 +-
 .../pdx/PDXAsyncEventQueueDUnitTest.java        |    7 +-
 .../gemfire/pdx/PdxClientServerDUnitTest.java   |    9 +-
 .../pdx/PdxDeserializationDUnitTest.java        |    9 +-
 .../gemfire/pdx/PdxSerializableDUnitTest.java   |    9 +-
 .../gemfire/pdx/PdxTypeExportDUnitTest.java     |    5 +-
 .../gemfire/pdx/VersionClassLoader.java         |   16 +-
 .../gemfire/redis/RedisDistDUnitTest.java       |   11 +-
 .../web/controllers/RestAPITestBase.java        |    7 +-
 .../security/ClientAuthenticationDUnitTest.java |    6 +-
 .../security/ClientAuthorizationDUnitTest.java  |    6 +-
 .../security/ClientAuthorizationTestBase.java   |    4 +-
 .../security/ClientMultiUserAuthzDUnitTest.java |    3 +-
 .../DeltaClientAuthorizationDUnitTest.java      |    3 +-
 .../DeltaClientPostAuthorizationDUnitTest.java  |    5 +-
 .../security/P2PAuthenticationDUnitTest.java    |    7 +-
 .../gemfire/security/SecurityTestUtil.java      |    3 +-
 .../gemfire/test/dunit/AsyncInvocation.java     |  215 +++
 .../gemstone/gemfire/test/dunit/DUnitEnv.java   |   79 +
 .../gemfire/test/dunit/DistributedTestCase.java | 1435 +++++++++++++++++
 .../com/gemstone/gemfire/test/dunit/Host.java   |  212 +++
 .../gemfire/test/dunit/RMIException.java        |  170 +++
 .../gemfire/test/dunit/RepeatableRunnable.java  |   29 +
 .../test/dunit/SerializableCallable.java        |   70 +
 .../test/dunit/SerializableCallableIF.java      |   24 +
 .../test/dunit/SerializableRunnable.java        |   92 ++
 .../test/dunit/SerializableRunnableIF.java      |   23 +
 .../com/gemstone/gemfire/test/dunit/VM.java     | 1345 ++++++++++++++++
 .../test/dunit/standalone/DUnitLauncher.java    |    9 +-
 .../test/dunit/standalone/RemoteDUnitVM.java    |   41 +-
 .../dunit/standalone/StandAloneDUnitEnv.java    |    3 +-
 .../test/dunit/tests/BasicDUnitTest.java        |   37 +-
 .../gemfire/test/dunit/tests/VMDUnitTest.java   |   12 +-
 .../src/test/java/dunit/AsyncInvocation.java    |  217 ---
 gemfire-core/src/test/java/dunit/DUnitEnv.java  |   80 -
 .../test/java/dunit/DistributedTestCase.java    | 1438 ------------------
 gemfire-core/src/test/java/dunit/Host.java      |  210 ---
 .../src/test/java/dunit/RMIException.java       |  170 ---
 .../src/test/java/dunit/RepeatableRunnable.java |   29 -
 .../test/java/dunit/SerializableCallable.java   |   70 -
 .../test/java/dunit/SerializableRunnable.java   |   92 --
 gemfire-core/src/test/java/dunit/VM.java        | 1347 ----------------
 .../src/test/java/hydra/MethExecutor.java       |    2 +-
 .../LuceneFunctionReadPathDUnitTest.java        |    7 +-
 gemfire-pulse/build.gradle                      |   16 +-
 .../tools/pulse/testbed/driver/PulseUITest.java |    5 -
 .../website/content/community/index.html        |   40 +-
 gradle/dependency-versions.properties           |    1 +
 gradle/rat.gradle                               |    1 -
 571 files changed, 7891 insertions(+), 6903 deletions(-)
----------------------------------------------------------------------



[44/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
new file mode 100644
index 0000000..a2670e6
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
@@ -0,0 +1,3996 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.query.cq.dunit;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.EvictionAction;
+import com.gemstone.gemfire.cache.EvictionAttributes;
+import com.gemstone.gemfire.cache.MirrorType;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionAttributes;
+import com.gemstone.gemfire.cache.RegionFactory;
+import com.gemstone.gemfire.cache.RegionShortcut;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.query.CqAttributes;
+import com.gemstone.gemfire.cache.query.CqAttributesFactory;
+import com.gemstone.gemfire.cache.query.CqAttributesMutator;
+import com.gemstone.gemfire.cache.query.CqClosedException;
+import com.gemstone.gemfire.cache.query.CqExistsException;
+import com.gemstone.gemfire.cache.query.CqListener;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.Query;
+import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.cache.query.RegionNotFoundException;
+import com.gemstone.gemfire.cache.query.SelectResults;
+import com.gemstone.gemfire.cache.query.data.Portfolio;
+import com.gemstone.gemfire.cache.query.internal.CqStateImpl;
+import com.gemstone.gemfire.cache.query.internal.DefaultQueryService;
+import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.cache30.CacheTestCase;
+import com.gemstone.gemfire.cache30.CertifiableTestCacheListener;
+import com.gemstone.gemfire.distributed.internal.DistributionConfig;
+import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
+import com.gemstone.gemfire.internal.AvailablePortHelper;
+import com.gemstone.gemfire.internal.cache.DistributedRegion;
+import com.gemstone.gemfire.internal.cache.DistributedTombstoneOperation;
+import com.gemstone.gemfire.internal.cache.EventID;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+
+import dunit.DistributedTestCase;
+import dunit.Host;
+import dunit.SerializableRunnable;
+import dunit.VM;
+
+/**
+ * This class tests the ContiunousQuery mechanism in GemFire.
+ * It does so by creating a cache server with a cache and a pre-defined region and
+ * a data loader. The client creates the same region and attaches the connection pool.
+ * 
+ *
+ * @author anil
+ */
+@SuppressWarnings("serial")
+public class CqQueryDUnitTest extends CacheTestCase {
+  
+  /** The port on which the bridge server was started in this VM */
+  private static int bridgeServerPort;
+  
+  protected static int port = 0;
+  protected static int port2 = 0;
+  
+  public static int noTest = -1;
+  
+  public final String[] regions = new String[] {
+      "regionA",
+      "regionB"
+  };
+    
+  private final static int CREATE = 0;
+  private final static int UPDATE = 1;
+  private final static int DESTROY = 2;
+  private final static int INVALIDATE = 3;
+  private final static int CLOSE = 4;
+  private final static int REGION_CLEAR = 5;
+  private final static int REGION_INVALIDATE = 6;
+
+  static public final String KEY = "key-";
+
+  static private final String WAIT_PROPERTY = "CqQueryTest.maxWaitTime";
+
+  static private final int WAIT_DEFAULT = (20 * 1000);
+  
+  public static final long MAX_TIME = Integer.getInteger(WAIT_PROPERTY, 
+      WAIT_DEFAULT).intValue();
+
+  public final String[] cqs = new String [] {
+      //0 - Test for ">" 
+      "SELECT ALL * FROM /root/" + regions[0] + " p where p.ID > 0",
+      
+      //1 -  Test for "=" and "and".
+      "SELECT ALL * FROM /root/" + regions[0] + " p where p.ID = 2 and p.status='active'",
+      
+      //2 -  Test for "<" and "and".
+      "SELECT ALL * FROM /root/" + regions[1] + " p where p.ID < 5 and p.status='active'",
+      
+      // FOLLOWING CQS ARE NOT TESTED WITH VALUES; THEY ARE USED TO TEST PARSING LOGIC WITHIN CQ.
+      //3
+      "SELECT * FROM /root/" + regions[0] + " ;",
+      //4
+      "SELECT ALL * FROM /root/" + regions[0],
+      //5
+      "import com.gemstone.gemfire.cache.\"query\".data.Portfolio; " +
+      "SELECT ALL * FROM /root/" + regions[0] +  " TYPE Portfolio",
+      //6
+      "import com.gemstone.gemfire.cache.\"query\".data.Portfolio; " +
+      "SELECT ALL * FROM /root/" + regions[0] +  " p TYPE Portfolio",
+      //7
+      "SELECT ALL * FROM /root/" + regions[1] + " p where p.ID < 5 and p.status='active';",
+      //8
+      "SELECT ALL * FROM /root/" + regions[0] + "  ;",
+      //9
+      "SELECT ALL * FROM /root/" + regions[0] +" p where p.description = NULL",
+      // 10
+      "SELECT ALL * FROM /root/" + regions[0] + " p where p.ID > 0 and p.status='active'",
+      //11 test for region 0
+      "SELECT ALL * FROM /root/" + regions[0] + " p where p.ID > 0",
+      //12 test for region 1
+      "SELECT ALL * FROM /root/" + regions[1] + " p where p.ID > 0",
+  };
+  
+  public final String[] prCqs = new String [] {
+	      //0 - Test for ">" 
+	      "SELECT ALL * FROM /" + regions[0] + " p where p.ID > 0",
+	      
+	      //1 -  Test for "=" and "and".
+	      "SELECT ALL * FROM /" + regions[0] + " p where p.ID = 2 and p.status='active'"
+  };
+  
+  private String[] invalidCQs = new String [] {
+      // Test for ">"
+      "SELECT ALL * FROM /root/invalidRegion p where p.ID > 0"
+  };
+  
+
+  private String[] shortTypeCQs = new String[] {
+  // 11 - Test for "short" number type
+  "SELECT ALL * FROM /root/" + regions[0] + " p where p.shortID IN SET(1,2,3,4,5)" };
+
+  public CqQueryDUnitTest(String name) {
+    super(name);
+  }
+  
+  public void setUp() throws Exception {
+    super.setUp();
+    
+    // avoid IllegalStateException from HandShake by connecting all vms tor
+    // system before creating connection pools
+    getSystem();
+    invokeInEveryVM(new SerializableRunnable("getSystem") {
+      public void run() {
+        getSystem();
+      }
+    });
+    
+  }
+  
+  /* Returns Cache Server Port */
+  static int getCacheServerPort() {
+    return bridgeServerPort;
+  }
+  
+  /* Create Cache Server */
+  public void createServer(VM server)
+  {
+    createServer(server, 0);
+  }
+
+  public void createServer(VM server, final int p)
+  {
+    createServer(server, p, false);
+  }
+
+  public void createServer(VM server, final int thePort, final boolean eviction) {
+    MirrorType mirrorType = MirrorType.KEYS_VALUES;
+    createServer(server, thePort, eviction, mirrorType);
+  }
+  
+  public void createServer(VM server, final int thePort, final boolean eviction, final MirrorType mirrorType)
+  {
+    SerializableRunnable createServer = new CacheSerializableRunnable(
+        "Create Cache Server") {
+      public void run2() throws CacheException
+      {
+        getLogWriter().info("### Create Cache Server. ###");
+        AttributesFactory factory = new AttributesFactory();
+        factory.setScope(Scope.DISTRIBUTED_ACK);
+        factory.setMirrorType(mirrorType);
+        
+        // setting the eviction attributes.
+        if (eviction) {
+          EvictionAttributes evictAttrs = EvictionAttributes
+            .createLRUEntryAttributes(100000, EvictionAction.OVERFLOW_TO_DISK);
+          factory.setEvictionAttributes(evictAttrs);
+        }
+
+        for (int i = 0; i < regions.length; i++) {
+          createRegion(regions[i], factory.createRegionAttributes());
+        }
+        pause(2000);
+
+        try {
+          startBridgeServer(thePort, true);
+        }
+
+        catch (Exception ex) {
+          fail("While starting CacheServer", ex);
+        }
+        pause(2000);
+        
+      }
+    };
+
+    server.invoke(createServer);
+  }
+  
+  public void createServerOnly(VM server, final int thePort)
+  {
+    SerializableRunnable createServer = new CacheSerializableRunnable(
+        "Create Cache Server") {
+      public void run2() throws CacheException
+      {
+        getLogWriter().info("### Create Cache Server. ###");
+        try {
+          startBridgeServer(thePort, true);
+        }
+
+        catch (Exception ex) {
+          fail("While starting CacheServer", ex);
+        }        
+      }
+    };
+
+    server.invoke(createServer);
+  }
+  
+  public void createPartitionRegion(final VM server, final String[] regionNames) {
+    SerializableRunnable createRegion = new CacheSerializableRunnable(
+        "Create Region") {
+
+      public void run2() throws CacheException {
+        RegionFactory rf = getCache().createRegionFactory(RegionShortcut.PARTITION);
+        for (int i = 0; i < regionNames.length; i++) {
+          rf.create(regionNames[i]);
+        }
+      }
+    };
+
+    server.invoke(createRegion);
+  }
+  
+  public void createReplicateRegionWithLocalDestroy(final VM server, final String[] regionNames) {
+    SerializableRunnable createRegion = new CacheSerializableRunnable(
+        "Create Region") {
+
+      public void run2() throws CacheException {
+        RegionFactory rf = getCache().createRegionFactory(RegionShortcut.REPLICATE).setEvictionAttributes(EvictionAttributes.createLIFOEntryAttributes(10, EvictionAction.LOCAL_DESTROY));
+        for (int i = 0; i < regionNames.length; i++) {
+          rf.create(regionNames[i]);
+        }
+      }
+    };
+
+    server.invoke(createRegion);
+  }
+  
+  
+  /* Close Cache Server */
+  public void closeServer(VM server) {
+    server.invoke(new SerializableRunnable("Close CacheServer") {
+      public void run() {
+        getLogWriter().info("### Close CacheServer. ###");
+        stopBridgeServer(getCache());
+      }
+    });
+    pause(2 * 1000);
+  }
+  
+  public void crashServer(VM server) {
+    server.invoke(new SerializableRunnable("Crash CacheServer") {
+      public void run() {
+        com.gemstone.gemfire.cache.client.internal.ConnectionImpl.setTEST_DURABLE_CLIENT_CRASH(true);
+        getLogWriter().info("### Crashing CacheServer. ###");
+        stopBridgeServer(getCache());
+      }
+    });
+    pause(2 * 1000);
+  }
+  
+  public void closeCrashServer(VM server) {
+    server.invoke(new SerializableRunnable("Close CacheServer") {
+      public void run() {
+        com.gemstone.gemfire.cache.client.internal.ConnectionImpl.setTEST_DURABLE_CLIENT_CRASH(false);
+        getLogWriter().info("### Crashing CacheServer. ###");
+        stopBridgeServer(getCache());
+      }
+    });
+    pause(2 * 1000);
+  }
+  
+  /* Create Client */
+  public void createClient(VM client, final int serverPort, final String serverHost) {
+    int[] serverPorts = new int[] {serverPort};
+    createClient(client, serverPorts, serverHost, null); 
+  }
+  
+  /* Create Client */
+  public void createClient(VM client, final int[] serverPorts, final String serverHost, final String redundancyLevel) {
+    SerializableRunnable createQService =
+      new CacheSerializableRunnable("Create Client") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Create Client. ###");
+        //Region region1 = null;
+        // Initialize CQ Service.
+        try {
+          getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+        
+        AttributesFactory regionFactory = new AttributesFactory();
+        regionFactory.setScope(Scope.LOCAL);
+        if (redundancyLevel != null){
+          ClientServerTestCase.configureConnectionPool(regionFactory, serverHost, serverPorts, true, Integer.parseInt(redundancyLevel), -1, null);
+        } else {
+          ClientServerTestCase.configureConnectionPool(regionFactory, serverHost,serverPorts, true, -1, -1, null);
+        }
+        for (int i=0; i < regions.length; i++) {        
+          createRegion(regions[i], regionFactory.createRegionAttributes());
+          getLogWriter().info("### Successfully Created Region on Client :" + regions[i]);
+          //region1.getAttributesMutator().setCacheListener(new CqListener());
+        }
+      }
+    };
+    
+    client.invoke(createQService);
+  }
+
+  /*Create Local Region*/
+  public void createLocalRegion(VM client, final int[] serverPorts, final String serverHost, final String redundancyLevel, final String[] regionNames) {
+    SerializableRunnable createQService =
+      new CacheSerializableRunnable("Create Local Region") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Create Local Region. ###");
+        AttributesFactory af = new AttributesFactory();
+        af.setScope(Scope.LOCAL);
+
+        if (redundancyLevel != null){
+          ClientServerTestCase.configureConnectionPool(af, serverHost, serverPorts, true, Integer.parseInt(redundancyLevel), -1, null);
+        } else {
+          ClientServerTestCase.configureConnectionPool(af, serverHost,serverPorts, true, -1, -1, null);
+        }
+        
+        RegionFactory rf = getCache().createRegionFactory(af.create());
+        for (int i = 0; i < regionNames.length; i++) {
+          rf.create(regionNames[i]);
+          getLogWriter().info("### Successfully Created Region on Client :" + regions[i]);
+        }
+      }
+    };
+
+    client.invoke(createQService);
+  }
+
+  public void createClientWith2Pools(VM client, final int[] serverPorts1, final int[] serverPorts2, final String serverHost, final String redundancyLevel) {
+    SerializableRunnable createQService =
+      new CacheSerializableRunnable("Create Client") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Create Client. ###");
+        //Region region1 = null;
+        // Initialize CQ Service.
+        try {
+          getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+        
+        AttributesFactory regionFactory0 = new AttributesFactory();
+        AttributesFactory regionFactory1 = new AttributesFactory();
+        regionFactory0.setScope(Scope.LOCAL);
+        regionFactory1.setScope(Scope.LOCAL);
+        if (redundancyLevel != null){
+          ClientServerTestCase.configureConnectionPoolWithName(regionFactory0, serverHost, serverPorts1, true, Integer.parseInt(redundancyLevel), -1, null, "testPoolA");
+          ClientServerTestCase.configureConnectionPoolWithName(regionFactory1, serverHost, serverPorts2, true, Integer.parseInt(redundancyLevel), -1, null, "testPoolB");
+        } else {
+          ClientServerTestCase.configureConnectionPoolWithName(regionFactory0, serverHost,serverPorts1, true, -1, -1, null, "testPoolA");
+          ClientServerTestCase.configureConnectionPoolWithName(regionFactory1, serverHost,serverPorts2, true, -1, -1, null, "testPoolB");
+        }
+        createRegion(regions[0], regionFactory0.createRegionAttributes());
+        createRegion(regions[1], regionFactory1.createRegionAttributes());
+        getLogWriter().info("### Successfully Created Region on Client :" + regions[0]);
+        getLogWriter().info("### Successfully Created Region on Client :" + regions[1]);
+        
+      }
+    };
+    
+    client.invoke(createQService);
+  }
+
+
+  /* Close Client */
+  public void closeClient(VM client) {
+    SerializableRunnable closeCQService =
+      new CacheSerializableRunnable("Close Client") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Close Client. ###");
+        try {
+          ((DefaultQueryService)getCache().getQueryService()).closeCqService();
+        } catch (Exception ex) {
+          getLogWriter().info("### Failed to get CqService during ClientClose() ###");
+        }
+        
+      }
+    };
+    
+    client.invoke(closeCQService);
+    pause(2 * 1000);
+  }
+
+  
+  /* Create/Init values */
+  public void createValues(VM vm, final String regionName, final int size) {
+    vm.invoke(new CacheSerializableRunnable("Create values") {
+      public void run2() throws CacheException {
+        Region region1 = getRootRegion().getSubregion(regionName);
+        for (int i = 1; i <= size; i++) {
+          region1.put(KEY+i, new Portfolio(i));
+        }
+        getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
+      }
+    });
+  }
+
+  /* Create/Init values */
+  public void createValuesWithTime(VM vm, final String regionName, final int size) {
+    vm.invoke(new CacheSerializableRunnable("Create values") {
+      public void run2() throws CacheException {
+        Region region1 = getRootRegion().getSubregion(regionName);
+        for (int i = 1; i <= size; i++) {
+          Portfolio portfolio = new Portfolio(i);
+          portfolio.createTime = System.currentTimeMillis();
+          region1.put(KEY+i, portfolio);
+        }
+        getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
+      }
+    });
+  }
+
+  public void createValuesWithShort(VM vm, final String regionName, final int size) {
+    vm.invoke(new CacheSerializableRunnable("Create values") {
+      public void run2() throws CacheException {
+        Region region1 = getRootRegion().getSubregion(regionName);
+        for (int i = 1; i <= size; i++) {
+          Portfolio portfolio = new Portfolio(i);
+          portfolio.shortID = new Short(""+i);
+          region1.put(KEY+i, portfolio);
+        }
+        getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
+      }
+    });
+  }
+  
+  public void createValuesAsPrimitives(VM vm, final String regionName, final int size) {
+    vm.invoke(new CacheSerializableRunnable("Create values") {
+      public void run2() throws CacheException {
+        Region region1 = getRootRegion().getSubregion(regionName);
+        for (int i = 1; i <= size; i++) {
+          switch (i % 5) {
+          case 0:
+            region1.put("key" + i, "seeded");
+            break;
+          case 1:
+            region1.put("key" + i, "seeding");
+            break;
+          case 2:
+            region1.put("key" + i, new Double(i));
+            break;
+          case 3:
+            region1.put("key" + i, i);
+            break;
+          case 4:
+            region1.put("key" + i, new Portfolio(i));
+            break;
+            default:
+              region1.put("key" + i, i);
+              break;
+              
+          }
+        }
+        getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
+      }
+    });
+  }
+  
+  public void updateValuesAsPrimitives(VM vm, final String regionName, final int size) {
+    vm.invoke(new CacheSerializableRunnable("Create values") {
+      public void run2() throws CacheException {
+        Region region1 = getRootRegion().getSubregion(regionName);
+        for (int i = 1; i <= size; i++) {
+          switch (i % 5) {
+          case 0:
+            region1.put("key" + i, "seeding");
+            break;
+          case 1:
+            region1.put("key" + i, "seeded");
+            break;
+          case 2:
+            region1.put("key" + i, i);
+            break;
+          case 3:
+            region1.put("key" + i, new Portfolio(i));
+            break;
+          case 4:
+            region1.put("key" + i, new Double(i));
+            break;
+            default:
+              region1.put("key" + i, i);
+              break;
+              
+          }
+        }
+        getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
+      }
+    });
+  }
+  
+  public void createValuesAsPortfolios(VM vm, final String regionName, final int size) {
+    vm.invoke(new CacheSerializableRunnable("Create values") {
+      public void run2() throws CacheException {
+        Region region1 = getRootRegion().getSubregion(regionName);
+        for (int i = 1; i <= size; i++) {
+          region1.put("key" + i, new Portfolio(i));
+        }
+        getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
+      }
+    });
+  }
+
+  public void createIndex(VM vm, final String indexName, final String indexedExpression, final String regionPath) {
+    vm.invoke(new CacheSerializableRunnable("Create values") {
+      public void run2() throws CacheException {
+        try {
+          QueryService qs = getCache().getQueryService();
+          qs.createIndex(indexName, indexedExpression, regionPath);
+        }
+        catch (Exception e) {
+          throw new CacheException(e){};
+        }
+      }
+    });
+  }
+
+
+  /* delete values */
+  public void deleteValues(VM vm, final String regionName, final int size) {
+    vm.invoke(new CacheSerializableRunnable("Delete values") {
+      public void run2() throws CacheException {
+        Region region1 = getRootRegion().getSubregion(regionName);
+        for (int i = 1; i <= size; i++) {
+          region1.destroy(KEY+i);
+        }
+        getLogWriter().info("### Number of Entries In Region after Delete :" + region1.keys().size());
+      }
+      
+    });
+  }
+  
+  /**
+   * support for invalidating values.
+   */  
+  public void invalidateValues(VM vm, final String regionName, final int size) {
+    vm.invoke(new CacheSerializableRunnable("Create values") {
+      public void run2() throws CacheException {
+        Region region1 = getRootRegion().getSubregion(regionName);
+        for (int i = 1; i <= size; i++) {
+          region1.invalidate(KEY+i);
+        }
+        getLogWriter().info("### Number of Entries In Region after Delete :" + region1.keys().size());
+      }
+      
+    });
+  }
+  
+  /* Register CQs */
+  public void createCQ(VM vm, final String cqName, final String queryStr) {
+    createCQ(vm, cqName, queryStr, false);
+  }
+  
+  public void createCQ(VM vm, final String cqName, final String queryStr, final boolean isBridgeMemberTest) {
+    vm.invoke(new CacheSerializableRunnable("Create CQ :" + cqName) {
+      public void run2() throws CacheException {
+        //pause(60 * 1000);
+        //getLogWriter().info("### DEBUG CREATE CQ START ####");
+        //pause(20 * 1000);
+        
+        getLogWriter().info("### Create CQ. ###" + cqName);
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+        // Create CQ Attributes.
+        CqAttributesFactory cqf = new CqAttributesFactory();
+        CqListener[] cqListeners = {new CqQueryTestListener(getLogWriter())};
+//        ((CqQueryTestListener)cqListeners[0]).cqName = cqName;
+//        if (isBridgeMemberTest) {
+//          testListenerForBridgeMembershipTest = (CqQueryTestListener)cqListeners[0];
+//        }
+        
+        cqf.initCqListeners(cqListeners);
+        CqAttributes cqa = cqf.create();
+        
+        // Create CQ.
+        try {
+          CqQuery cq1 = cqService.newCq(cqName, queryStr, cqa);
+          assertTrue("newCq() state mismatch", cq1.getState().isStopped());
+        } catch (Exception ex){
+          AssertionError err = new AssertionError("Failed to create CQ " + cqName + " . ");
+          err.initCause(ex);
+          getLogWriter().info("CqService is :" + cqService, err);
+          throw err;
+        }
+      }
+    });   
+  }
+  
+  /* Register CQs  with no name, execute, and close*/
+  public void createAndExecCQNoName(VM vm,  final String queryStr) {
+    vm.invoke(new CacheSerializableRunnable("Create CQ with no name:" ) {
+      public void run2() throws CacheException {
+        //pause(60 * 1000);
+        getLogWriter().info("### DEBUG CREATE CQ START ####");
+        //pause(20 * 1000);
+        
+        getLogWriter().info("### Create CQ with no name. ###");
+        // Get CQ Service.
+        QueryService cqService = null;
+        CqQuery cq1 = null;
+        String cqName = null;
+        try {
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+        
+        SelectResults cqResults = null;
+        for (int i = 0; i < 20; ++i) {
+          // Create CQ Attributes.
+          CqAttributesFactory cqf = new CqAttributesFactory();
+          CqListener[] cqListeners = {new CqQueryTestListener(getLogWriter())};
+          
+          cqf.initCqListeners(cqListeners);
+          CqAttributes cqa = cqf.create();
+          
+          // Create CQ with no name and execute with initial results.
+          try {
+            cq1 = cqService.newCq(queryStr, cqa);
+            ((CqQueryTestListener)cqListeners[0]).cqName = cq1.getName();
+          } catch (Exception ex){
+            getLogWriter().info("CQService is :" + cqService);
+            ex.printStackTrace();
+            fail("Failed to create CQ with no name" +  " . " + ex.getMessage());
+          }
+          
+          if (cq1 == null) {
+            getLogWriter().info("Failed to get CqQuery object for CQ with no name.");
+          }
+          else {
+            cqName = cq1.getName();
+            getLogWriter().info("Created CQ with no name, generated CQ name: " + cqName + " CQ state:" + cq1.getState());
+            assertTrue("Create CQ with no name illegal state", cq1.getState().isStopped());
+          }
+          if ( i%2 == 0) {
+            try {
+              cqResults = cq1.executeWithInitialResults();
+            } catch (Exception ex){
+              getLogWriter().info("CqService is :" + cqService);
+              ex.printStackTrace();
+              fail("Failed to execute CQ with initial results, cq name: " + cqName + " . " + ex.getMessage());
+            }
+            getLogWriter().info("initial result size = " + cqResults.size());
+            getLogWriter().info("CQ state after execute with initial results = " + cq1.getState());
+            assertTrue("executeWithInitialResults() state mismatch", cq1.getState().isRunning());
+          }
+          else {
+            try {
+              cq1.execute();
+            } catch (Exception ex){
+              getLogWriter().info("CQService is :" + cqService);
+              ex.printStackTrace();
+              fail("Failed to execute CQ " + cqName + " . " + ex.getMessage());
+            }
+            getLogWriter().info("CQ state after execute = " + cq1.getState());
+            assertTrue("execute() state mismatch", cq1.getState().isRunning());
+          }
+          
+          //Close the CQ
+          try {
+            cq1.close();
+          } catch (Exception ex){
+            getLogWriter().info("CqService is :" + cqService, ex);
+            fail("Failed to close CQ " + cqName + " . " + ex.getMessage());
+          }
+          assertTrue("closeCq() state mismatch", cq1.getState().isClosed());
+        }
+      }
+    });   
+  }
+  
+  public void executeCQ(VM vm, final String cqName, final boolean initialResults,
+      String expectedErr) {
+    executeCQ(vm, cqName, initialResults, noTest, expectedErr);
+  }    
+  
+  /**
+   * Execute/register CQ as running.
+   * @param initialResults true if initialResults are requested
+   * @param expectedResultsSize if >= 0, validate results against this size
+   * @param expectedErr if not null, an error we expect
+   */    
+  private void executeCQ(VM vm, final String cqName,
+      final boolean initialResults,
+      final int expectedResultsSize,
+      final String expectedErr) {
+    vm.invoke(new CacheSerializableRunnable("Execute CQ :" + cqName) {
+
+      private void work() throws CacheException {
+      //pause(60 * 1000);
+      getLogWriter().info("### DEBUG EXECUTE CQ START ####");
+      //pause(20 * 1000);
+      
+      // Get CQ Service.
+      QueryService cqService = null;
+      CqQuery cq1 = null;
+//    try {
+      cqService = getCache().getQueryService();
+//    } catch (Exception cqe) {
+//    getLogWriter().error(cqe);
+//    AssertionError err = new AssertionError("Failed to get QueryService" + cqName);
+//    err.initCause(ex);
+//    throw err;
+//    fail("Failed to getCQService.");
+//    }
+      
+      // Get CqQuery object.
+      try {
+        cq1 = cqService.getCq(cqName);
+        if (cq1 == null) {
+          getLogWriter().info("Failed to get CqQuery object for CQ name: " + cqName);
+          fail("Failed to get CQ " + cqName);
+        }
+        else {
+          getLogWriter().info("Obtained CQ, CQ name: " + cq1.getName());
+          assertTrue("newCq() state mismatch", cq1.getState().isStopped());
+        }
+      } catch (Exception ex){
+        getLogWriter().info("CqService is :" + cqService);
+        getLogWriter().error(ex);
+        AssertionError err = new AssertionError("Failed to execute  CQ " + cqName);
+        err.initCause(ex);
+        throw err;
+      }
+      
+      if (initialResults) {
+        SelectResults cqResults = null;
+        
+        try {
+          cqResults = cq1.executeWithInitialResults();
+        } catch (Exception ex){
+          getLogWriter().info("CqService is :" + cqService);
+          ex.printStackTrace();
+          AssertionError err = new AssertionError("Failed to execute  CQ " + cqName);
+          err.initCause(ex);
+          throw err;
+        }
+        getLogWriter().info("initial result size = " + cqResults.size());
+        assertTrue("executeWithInitialResults() state mismatch", cq1.getState().isRunning());
+        if (expectedResultsSize >= 0) {
+          assertEquals("unexpected results size", expectedResultsSize, cqResults.size());
+        }
+      } 
+      else {
+        try {
+          cq1.execute();
+        } catch (Exception ex){
+          AssertionError err = new AssertionError("Failed to execute  CQ " + cqName);
+          err.initCause(ex);
+          if (expectedErr == null) {
+            getLogWriter().info("CqService is :" + cqService, err);
+          }
+          throw err;
+        }
+        assertTrue("execute() state mismatch", cq1.getState().isRunning());
+      }
+    }
+      
+      public void run2() throws CacheException {
+        if (expectedErr != null) {
+          getCache().getLogger().info("<ExpectedException action=add>"
+                + expectedErr + "</ExpectedException>");
+        }
+        try {
+          work();
+        } 
+        finally {
+          if (expectedErr != null) {
+            getCache().getLogger().info("<ExpectedException action=remove>"
+              + expectedErr + "</ExpectedException>");
+          }
+        }
+      }
+      });   
+  }
+  
+  /* Stop/pause CQ */
+  public void stopCQ(VM vm, final String cqName) throws Exception {
+    vm.invoke(new CacheSerializableRunnable("Stop CQ :" + cqName) {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Stop CQ. ###" + cqName);
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+        
+        // Stop CQ.
+        CqQuery cq1 = null;
+        try {
+          cq1 = cqService.getCq(cqName);
+          cq1.stop();
+        } catch (Exception ex){
+          ex.printStackTrace();
+          fail("Failed to stop CQ " + cqName + " . " + ex.getMessage());
+        }
+        assertTrue("Stop CQ state mismatch", cq1.getState().isStopped());
+      }
+    });
+  }
+  
+  // Stop and execute CQ repeatedly
+  /* Stop/pause CQ */
+  private void stopExecCQ(VM vm, final String cqName, final int count) throws Exception {
+    vm.invoke(new CacheSerializableRunnable("Stop CQ :" + cqName) {
+      public void run2() throws CacheException {
+        CqQuery cq1 = null;
+        getLogWriter().info("### Stop and Exec CQ. ###" + cqName);
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCqService.");
+        }
+        
+        // Get CQ.
+        try {
+          cq1 = cqService.getCq(cqName);
+        } catch (Exception ex){
+          ex.printStackTrace();
+          fail("Failed to get CQ " + cqName + " . " + ex.getMessage());
+        }
+        
+        for (int i = 0; i < count; ++i) {
+          // Stop CQ.
+          try {
+            cq1.stop();
+          } catch (Exception ex){
+            ex.printStackTrace();
+            fail("Count = " + i + "Failed to stop CQ " + cqName + " . " + ex.getMessage());
+          }
+          assertTrue("Stop CQ state mismatch, count = " + i, cq1.getState().isStopped());
+          getLogWriter().info("After stop in Stop and Execute loop, ran successfully, loop count: " + i);
+          getLogWriter().info("CQ state: " + cq1.getState());
+          
+          // Re-execute CQ
+          try {
+            cq1.execute();
+          } catch (Exception ex){
+            ex.printStackTrace();
+            fail("Count = " + i + "Failed to execute CQ " + cqName + " . " + ex.getMessage());
+          }
+          assertTrue("Execute CQ state mismatch, count = " + i, cq1.getState().isRunning());
+          getLogWriter().info("After execute in Stop and Execute loop, ran successfully, loop count: " + i);
+          getLogWriter().info("CQ state: " + cq1.getState());
+        }
+      }
+    });
+  }
+  
+  
+  /* UnRegister CQs */
+  public void closeCQ(VM vm, final String cqName) throws Exception {
+    vm.invoke(new CacheSerializableRunnable("Close CQ :" + cqName) {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Close CQ. ###" + cqName);
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCqService.");
+        }
+        
+        // Close CQ.
+        CqQuery cq1 = null;
+        try {
+          cq1 = cqService.getCq(cqName);
+          cq1.close();
+        } catch (Exception ex){
+          ex.printStackTrace();
+          fail("Failed to close CQ " + cqName + " . " + ex.getMessage());
+        }
+        assertTrue("Close CQ state mismatch", cq1.getState().isClosed());
+      }
+    });
+  }
+  
+  /* Register CQs */
+  private void registerInterestListCQ(VM vm, final String regionName, final int keySize) {
+    vm.invoke(new CacheSerializableRunnable("Register InterestList and CQ") {
+      public void run2() throws CacheException {
+        
+        // Get CQ Service.
+        Region region = null;
+        try {
+          region = getRootRegion().getSubregion(regionName);
+          region.getAttributesMutator().setCacheListener(new CertifiableTestCacheListener(getLogWriter()));
+        } catch (Exception cqe) {
+          AssertionError err = new AssertionError("Failed to get Region.");
+          err.initCause(cqe);
+          throw err;
+
+        }
+        
+        try {
+          List list = new ArrayList();
+          for (int i = 1; i <= keySize; i++) {
+            list.add(KEY+i);
+          }
+          region.registerInterest(list);
+        } catch (Exception ex) {
+          AssertionError err = new AssertionError("Failed to Register InterestList");
+          err.initCause(ex);
+          throw err;
+        }
+      }
+    });   
+  }
+  
+  //helps test case where executeIR is called multiple times as well as after close
+  public void executeAndCloseAndExecuteIRMultipleTimes(VM vm, final String cqName, final String queryStr) {
+    vm.invoke(new CacheSerializableRunnable("Create CQ :" + cqName) {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Create CQ. ###" + cqName);
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+        // Create CQ Attributes.
+        CqAttributesFactory cqf = new CqAttributesFactory();
+        CqListener[] cqListeners = {new CqQueryTestListener(getLogWriter())};
+        
+        cqf.initCqListeners(cqListeners);
+        CqAttributes cqa = cqf.create();
+        
+        CqQuery cq1;
+        // Create CQ.
+        try {
+          cq1 = cqService.newCq(cqName, queryStr, cqa);
+          assertTrue("newCq() state mismatch", cq1.getState().isStopped());
+        } catch (Exception ex){
+          AssertionError err = new AssertionError("Failed to create CQ " + cqName + " . ");
+          err.initCause(ex);
+          getLogWriter().info("CqService is :" + cqService, err);
+          throw err;
+        }
+        
+        try {
+          cq1.executeWithInitialResults();
+          try{
+            cq1.executeWithInitialResults();
+          }
+          catch (IllegalStateException e){
+            //expected
+          }
+          cq1.close();
+          
+         try {
+           cq1.executeWithInitialResults();
+         }
+         catch (CqClosedException e) {
+           //expected
+           return;
+         }
+         fail("should have received cqClosedException");
+        }
+        catch (Exception e) {
+          fail("exception not expected here " + e);
+        }
+      }
+    });   
+  }
+    
+  
+  
+  /* Validate CQ Count */
+  public void validateCQCount(VM vm, final int cqCnt) throws Exception {
+    vm.invoke(new CacheSerializableRunnable("validate cq count") {
+      public void run2() throws CacheException {
+        // Get CQ Service.
+        
+        QueryService cqService = null;
+        try {
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+        
+        int numCqs = 0;
+        try {
+          numCqs = cqService.getCqs().length;
+        } catch (Exception ex) {
+          fail ("Failed to get the CQ Count.");
+        }
+        assertEquals("Number of cqs mismatch.", cqCnt, numCqs);
+      }
+    });
+  }
+  
+  
+  /** 
+   * Throws AssertionError if the CQ can be found or if any other
+   * error occurs
+   */
+  private void failIfCQExists(VM vm, final String cqName) {
+    vm.invoke(new CacheSerializableRunnable("Fail if CQ exists") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Fail if CQ Exists. ### " + cqName);
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {          
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+        
+        CqQuery cQuery = cqService.getCq(cqName);
+        if (cQuery != null) {
+          fail("Unexpectedly found CqQuery for CQ : " + cqName);
+        }
+      }
+    });
+  }
+  
+  private void validateCQError(VM vm, final String cqName,
+      final int numError) {
+    vm.invoke(new CacheSerializableRunnable("Validate CQs") {
+      public void run2() throws CacheException {
+        
+        getLogWriter().info("### Validating CQ. ### " + cqName);
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {          
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+        
+        CqQuery cQuery = cqService.getCq(cqName);
+        if (cQuery == null) {
+          fail("Failed to get CqQuery for CQ : " + cqName);
+        }
+        
+        CqAttributes cqAttr = cQuery.getCqAttributes();
+        CqListener cqListener = cqAttr.getCqListener();
+        CqQueryTestListener listener = (CqQueryTestListener) cqListener;
+        listener.printInfo(false);
+        
+        // Check for totalEvents count.
+        if (numError != noTest) {
+          // Result size validation.
+          listener.printInfo(true);
+          assertEquals("Total Event Count mismatch", numError, listener.getErrorEventCount());
+        }
+      }
+    });
+  }
+  
+  public void validateCQ(VM vm, final String cqName,
+      final int resultSize,
+      final int creates,
+      final int updates,
+      final int deletes) {
+    validateCQ(vm, cqName, resultSize, creates, updates, deletes,
+        noTest, noTest, noTest, noTest);
+  }
+  
+  public void validateCQ(VM vm, final String cqName,
+      final int resultSize,
+      final int creates,
+      final int updates,
+      final int deletes,
+      final int queryInserts,
+      final int queryUpdates,
+      final int queryDeletes,
+      final int totalEvents) {
+    vm.invoke(new CacheSerializableRunnable("Validate CQs") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Validating CQ. ### " + cqName);
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {          
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+        
+        CqQuery cQuery = cqService.getCq(cqName);
+        if (cQuery == null) {
+          fail("Failed to get CqQuery for CQ : " + cqName);
+        }
+        
+        CqAttributes cqAttr = cQuery.getCqAttributes();
+        CqListener cqListeners[] = cqAttr.getCqListeners();
+        CqQueryTestListener listener = (CqQueryTestListener) cqListeners[0];
+        listener.printInfo(false);
+        
+        // Check for totalEvents count.
+        if (totalEvents != noTest) {
+          // Result size validation.
+          listener.printInfo(true);
+          assertEquals("Total Event Count mismatch", totalEvents, listener.getTotalEventCount());
+        }
+        
+        if (resultSize != noTest) {
+          //SelectResults results = cQuery.getCqResults();
+          //getLogWriter().info("### CQ Result Size is :" + results.size());
+          // Result size validation.
+          // Since ResultSet is not maintained for this release.
+          // Instead of resultSize its been validated with total number of events.
+          fail("test for event counts instead of results size");
+//        assertEquals("Result Size mismatch", resultSize, listener.getTotalEventCount());
+        }
+        
+        // Check for create count.
+        if (creates != noTest) {
+          // Result size validation.
+          listener.printInfo(true);
+          assertEquals("Create Event mismatch", creates, listener.getCreateEventCount());
+        }
+        
+        // Check for update count.
+        if (updates != noTest) {
+          // Result size validation.
+          listener.printInfo(true);
+          assertEquals("Update Event mismatch", updates, listener.getUpdateEventCount());
+        }
+        
+        // Check for delete count.
+        if (deletes != noTest) {
+          // Result size validation.
+          listener.printInfo(true);
+          assertEquals("Delete Event mismatch", deletes, listener.getDeleteEventCount());
+        }
+        
+        // Check for queryInsert count.
+        if (queryInserts != noTest) {
+          // Result size validation.
+          listener.printInfo(true);
+          assertEquals("Query Insert Event mismatch", queryInserts, listener.getQueryInsertEventCount());
+        }
+        
+        // Check for queryUpdate count.
+        if (queryUpdates != noTest) {
+          // Result size validation.
+          listener.printInfo(true);
+          assertEquals("Query Update Event mismatch", queryUpdates, listener.getQueryUpdateEventCount());
+        }
+        
+        // Check for queryDelete count.
+        if (queryDeletes != noTest) {
+          // Result size validation.
+          listener.printInfo(true);
+          assertEquals("Query Delete Event mismatch", queryDeletes, listener.getQueryDeleteEventCount());
+        }        
+      }
+    });
+  }
+  
+  public void waitForCreated(VM vm, final String cqName, final String key){
+    waitForEvent(vm, 0, cqName, key);
+  }
+  
+  public void waitForUpdated(VM vm, final String cqName, final String key){
+    waitForEvent(vm, 1, cqName, key);
+  }
+  
+  public void waitForDestroyed(VM vm, final String cqName, final String key){
+    waitForEvent(vm, 2, cqName, key);
+  }
+  
+  public void waitForInvalidated(VM vm, final String cqName, final String key){
+    waitForEvent(vm, 3, cqName, key);
+  }
+  
+  public void waitForClose(VM vm, final String cqName){
+    waitForEvent(vm, 4, cqName, null);
+  }
+  
+  public void waitForRegionClear(VM vm, final String cqName){
+    waitForEvent(vm, 5, cqName, null);
+  }
+
+  public void waitForRegionInvalidate(VM vm, final String cqName){
+    waitForEvent(vm, 6, cqName, null);
+  }
+
+  private void waitForError(VM vm, final String cqName, final String errorMessage) {
+    vm.invoke(new CacheSerializableRunnable("validate cq count") {
+      public void run2() throws CacheException {
+        QueryService cqService = null;
+        try {
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+        
+        CqQuery cQuery = cqService.getCq(cqName);
+        if (cQuery == null) {
+          fail("Failed to get CqQuery for CQ : " + cqName);
+        }
+        
+        CqAttributes cqAttr = cQuery.getCqAttributes();
+        CqListener[] cqListener = cqAttr.getCqListeners();
+        CqQueryTestListener listener = (CqQueryTestListener) cqListener[0];
+        listener.waitForError(errorMessage);
+      }
+    });
+  }
+  
+  protected void waitForCqsDisconnected(VM vm, final String cqName, final int count) {
+    vm.invoke(new CacheSerializableRunnable("validate cq disconnected count") {
+      public void run2() throws CacheException {
+        QueryService cqService = null;
+        try {
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+        
+        CqQuery cQuery = cqService.getCq(cqName);
+        if (cQuery == null) {
+          fail("Failed to get CqQuery for CQ : " + cqName);
+        }
+        
+        CqAttributes cqAttr = cQuery.getCqAttributes();
+        CqListener[] cqListener = cqAttr.getCqListeners();
+        CqQueryTestListener listener = (CqQueryTestListener) cqListener[0];
+        listener.waitForCqsDisconnectedEvents(count);
+      }
+    });
+  }
+  
+  protected void waitForCqsConnected(VM vm, final String cqName, final int count) {
+    vm.invoke(new CacheSerializableRunnable("validate cq connected count") {
+      public void run2() throws CacheException {
+        QueryService cqService = null;
+        try {
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+        
+        CqQuery cQuery = cqService.getCq(cqName);
+        if (cQuery == null) {
+          fail("Failed to get CqQuery for CQ : " + cqName);
+        }
+        
+        CqAttributes cqAttr = cQuery.getCqAttributes();
+        CqListener[] cqListener = cqAttr.getCqListeners();
+        CqQueryTestListener listener = (CqQueryTestListener) cqListener[0];
+        listener.waitForCqsConnectedEvents(count);
+      }
+    });
+  }
+  
+  private void waitForEvent(VM vm, final int event, final String cqName, final String key) {
+    vm.invoke(new CacheSerializableRunnable("validate cq count") {
+      public void run2() throws CacheException {
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+        
+        CqQuery cQuery = cqService.getCq(cqName);
+        if (cQuery == null) {
+          fail("Failed to get CqQuery for CQ : " + cqName);
+        }
+        
+        CqAttributes cqAttr = cQuery.getCqAttributes();
+        CqListener[] cqListener = cqAttr.getCqListeners();
+        CqQueryTestListener listener = (CqQueryTestListener) cqListener[0];
+        
+        switch (event) {
+          case CREATE :
+            listener.waitForCreated(key);
+            break;
+            
+          case UPDATE :
+            listener.waitForUpdated(key);
+            break;
+            
+          case DESTROY :
+            listener.waitForDestroyed(key);
+            break;            
+            
+          case INVALIDATE :
+            listener.waitForInvalidated(key);
+            break;            
+            
+          case CLOSE :
+            listener.waitForClose();
+            break;            
+
+          case REGION_CLEAR :
+            listener.waitForRegionClear();
+            break;            
+
+          case REGION_INVALIDATE :
+            listener.waitForRegionInvalidate();
+            break;            
+
+        }
+      }
+    });
+  }
+  
+  /**
+   * Waits till the CQ state is same as the expected.
+   * Waits for max time, if the CQ state is not same as expected 
+   * throws exception.
+   */
+  public void waitForCqState(VM vm, final String cqName, final int state) {
+    vm.invoke(new CacheSerializableRunnable("Wait For cq State") {
+      public void run2() throws CacheException {
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+
+        CqQuery cQuery = cqService.getCq(cqName);
+        if (cQuery == null) {
+          fail("Failed to get CqQuery for CQ : " + cqName);
+        }
+
+        // Get CQ State.
+        final CqStateImpl cqState = (CqStateImpl)cQuery.getState();
+        // Wait max time, till the CQ state is as expected.
+        WaitCriterion ev = new WaitCriterion() {
+          public boolean done() {
+            return cqState.getState() == state;
+          }
+          public String description() {
+            return "cqState never became " + state;
+          }
+        };
+        DistributedTestCase.waitForCriterion(ev, MAX_TIME, 200, true);
+      }
+    });
+  }
+
+  public void clearCQListenerEvents(VM vm, final String cqName) {
+    vm.invoke(new CacheSerializableRunnable("validate cq count") {
+      public void run2() throws CacheException {
+        // Get CQ Service.
+        
+        QueryService cqService = null;
+        try {
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+        
+        CqQuery cQuery = cqService.getCq(cqName);
+        if (cQuery == null) {
+          fail("Failed to get CqQuery for CQ : " + cqName);
+        }
+        
+        CqAttributes cqAttr = cQuery.getCqAttributes();
+        CqListener cqListener = cqAttr.getCqListener();
+        CqQueryTestListener listener = (CqQueryTestListener) cqListener;
+        listener.getEventHistory();        
+      }
+    });
+  }
+  
+  private void validateQuery(VM vm, final String query, final int resultSize) {
+    vm.invoke(new CacheSerializableRunnable("Validate Query") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Validating Query. ###");
+        QueryService qs = getCache().getQueryService();
+        
+        Query q = qs.newQuery(query);
+        try {
+          Object r = q.execute();
+          if(r instanceof Collection){
+            int rSize = ((Collection)r).size();
+            getLogWriter().info("### Result Size is :" + rSize);
+            assertEquals(rSize, rSize);
+          }
+        }
+        catch (Exception e) {
+          fail("Failed to execute the query " + e.getMessage());
+        }
+      }
+    });
+  }
+  
+  private Properties getConnectionProps(String[] hosts, int[] ports, Properties newProps) {
+    
+    Properties props = new Properties();
+    String endPoints = "";
+    String host = hosts[0];
+    for (int i=0; i < ports.length; i++){
+      if (hosts.length > 1)
+      {
+        host = hosts[i];
+      }
+      endPoints = endPoints + "server" + i + "=" + host + ":" + ports[i];
+      if (ports.length > (i+1))
+      {
+        endPoints = endPoints + ",";
+      }
+    }
+    
+    props.setProperty("endpoints", endPoints);
+    props.setProperty("retryAttempts", "1");
+    //props.setProperty("establishCallbackConnection", "true");
+    //props.setProperty("LBPolicy", "Sticky");
+    //props.setProperty("readTimeout", "120000");
+    
+    // Add other property elements.
+    if (newProps != null) {
+      Enumeration e = newProps.keys();
+      while(e.hasMoreElements()) {
+        String key = (String)e.nextElement();
+        props.setProperty(key, newProps.getProperty(key));
+      }
+    }
+    return props;
+  }
+  
+  
+  // Exercise CQ attributes mutator functions
+  private void mutateCQAttributes(VM vm, final String cqName, final int mutator_function) throws Exception {
+    vm.invoke(new CacheSerializableRunnable("Stop CQ :" + cqName) {
+      public void run2() throws CacheException {
+        CqQuery cq1 = null;
+        getLogWriter().info("### CQ attributes mutator for ###" + cqName);
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+        
+        // Get CQ.
+        try {
+          cq1 = cqService.getCq(cqName);
+        } catch (Exception ex){
+          ex.printStackTrace();
+          fail("Failed to get CQ " + cqName + " . " + ex.getMessage());
+        }
+        CqAttributesMutator cqAttrMutator = cq1.getCqAttributesMutator();
+        CqAttributes cqAttr = cq1.getCqAttributes();
+        CqListener cqListeners[];
+        switch (mutator_function) {
+          case CREATE:
+            // Reinitialize with 2 CQ Listeners
+            CqListener cqListenersArray[] = {new CqQueryTestListener(getCache().getLogger()), 
+              new CqQueryTestListener(getCache().getLogger())};
+            cqAttrMutator.initCqListeners(cqListenersArray);
+            cqListeners = cqAttr.getCqListeners();
+            assertEquals("CqListener count mismatch", cqListeners.length, 2);
+            break;
+            
+          case UPDATE:
+            // Add 2 new CQ Listeners
+            CqListener newListener1 = new CqQueryTestListener(getCache().getLogger());
+            CqListener newListener2 = new CqQueryTestListener(getCache().getLogger());
+            cqAttrMutator.addCqListener(newListener1);
+            cqAttrMutator.addCqListener(newListener2);
+            
+            cqListeners = cqAttr.getCqListeners();
+            assertEquals("CqListener count mismatch", cqListeners.length, 3);
+            break;
+            
+          case DESTROY:
+            cqListeners = cqAttr.getCqListeners();
+            cqAttrMutator.removeCqListener(cqListeners[0]);
+            cqListeners = cqAttr.getCqListeners();
+            assertEquals("CqListener count mismatch", cqListeners.length, 2);
+            
+            // Remove a listener and validate
+            cqAttrMutator.removeCqListener(cqListeners[0]);
+            cqListeners = cqAttr.getCqListeners();
+            assertEquals("CqListener count mismatch", cqListeners.length, 1);
+            break;
+        }
+      }
+    });
+  }
+  
+  
+  private void performGC(VM server, final String regionName) {
+    SerializableRunnable task = new CacheSerializableRunnable(
+    "perform GC") {
+      public void run2() throws CacheException
+      {
+        Region subregion = getCache().getRegion("root/"+regionName);
+        DistributedTombstoneOperation gc = DistributedTombstoneOperation.gc((DistributedRegion)subregion, new EventID(getCache().getDistributedSystem()));
+        gc.distribute();
+      }
+    };
+    server.invoke(task);
+  }
+  
+  private void ensureCQExists(VM server, final String regionName, final String cqName) {
+    SerializableRunnable task = new CacheSerializableRunnable(
+    "check CQs") {
+      public void run2() throws CacheException
+      {
+        CqQuery queries[] = getCache().getQueryService().getCqs();
+        assertTrue("expected to find a CQ but found none", queries.length > 0);
+        System.out.println("found query " + queries[0]);
+        assertTrue("Couldn't find query " + cqName, queries[0].getName().startsWith(cqName));
+        assertTrue("expected the CQ to be open: " + queries[0], !queries[0].isClosed());
+      }
+    };
+    server.invoke(task);
+  }
+
+  
+  /**
+   * bug #47494 - CQs were destroyed when a server did a tombstone GC 
+   */
+  public void testCQRemainsWhenServerGCs() throws Exception {
+
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    VM server2 = host.getVM(2);
+
+    createServer(server);
+    createServer(server2);
+
+    final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+
+    // Create client.
+    createClient(client, thePort, host0);
+    try {
+      /* CQ Test with initial Values. */
+      int size = 5;
+      createValuesWithShort(server, regions[0], size);
+      pause(1*500);
+      
+      final String cqName = "testCQResultSet_0"; 
+  
+      // Create CQs.
+      createCQ(client, cqName, shortTypeCQs[0]);    
+  
+      // Check resultSet Size.
+      executeCQ(client, cqName, true, 5, null);
+      
+      // Simulate a tombstone GC on the server
+      performGC(server, regions[0]);
+      
+      // Check the CQs
+      ensureCQExists(server, regions[0], cqName);
+    } finally {
+      closeClient(client);    
+      closeServer(server);
+      closeServer(server2);
+    }
+  }
+  
+  
+  /**
+   * Test for InterestList and CQ registered from same clients.
+   * @throws Exception
+   */
+  public void testInterestListAndCQs() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    
+    /* Init Server and Client */
+    createServer(server);
+    final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    createClient(client, thePort, host0);
+    
+    
+    /* Create CQs. */
+    createCQ(client, "testInterestListAndCQs_0", cqs[0]); 
+    validateCQCount(client, 1);
+    
+    /* Init values at server. */
+    final int size = 10;
+    
+    executeCQ(client, "testInterestListAndCQs_0", false, null); 
+    registerInterestListCQ(client, regions[0], size);
+    
+    createValues(server, regions[0], size);
+    // Wait for client to Synch.
+    
+    for (int i=1; i <=10; i++){
+      waitForCreated(client, "testInterestListAndCQs_0", KEY + i);
+    }
+    
+    // validate CQs.
+    validateCQ(client, "testInterestListAndCQs_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ noTest,
+        /* deletes; */ noTest,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    
+    // Validate InterestList.
+    // CREATE
+    client.invoke(new CacheSerializableRunnable("validate updates") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regions[0]);
+        assertNotNull(region);
+        
+        Set keys = region.entrySet();
+        assertEquals("Mismatch, number of keys in local region is not equal to the interest list size", 
+            size, keys.size());
+        
+        CertifiableTestCacheListener ctl = (CertifiableTestCacheListener) region.getAttributes().getCacheListener();
+        for (int i = 1; i <= 10; i++) {
+          ctl.waitForCreated(KEY+i);
+          assertNotNull(region.getEntry(KEY+i));
+        }
+      }
+    });
+    
+    // UPDATE
+    createValues(server, regions[0], size);
+    // Wait for client to Synch.
+    for (int i=1; i <=10; i++){
+      waitForUpdated(client, "testInterestListAndCQs_0", KEY + i);
+    }
+    
+    
+    client.invoke(new CacheSerializableRunnable("validate updates") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regions[0]);
+        assertNotNull(region);
+        
+        Set keys = region.entrySet();
+        assertEquals("Mismatch, number of keys in local region is not equal to the interest list size", 
+            size, keys.size());
+        
+        CertifiableTestCacheListener ctl = (CertifiableTestCacheListener) region.getAttributes().getCacheListener();
+        for (int i = 1; i <= 10; i++) {
+          ctl.waitForUpdated(KEY+i);
+          assertNotNull(region.getEntry(KEY+i));
+        }
+      }
+    });
+    
+    // INVALIDATE
+    server.invoke(new CacheSerializableRunnable("Invalidate values") {
+      public void run2() throws CacheException {
+        Region region1 = getRootRegion().getSubregion(regions[0]);
+        for (int i = 1; i <= size; i++) {
+          region1.invalidate(KEY+i);
+        }
+      }
+    });
+    
+    
+    waitForInvalidated(client, "testInterestListAndCQs_0", KEY + 10);
+    
+    
+    client.invoke(new CacheSerializableRunnable("validate invalidates") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regions[0]);
+        assertNotNull(region);
+        
+        Set keys = region.entrySet();
+        assertEquals("Mismatch, number of keys in local region is not equal to the interest list size", 
+            size, keys.size());
+        
+        CertifiableTestCacheListener ctl = (CertifiableTestCacheListener) region.getAttributes().getCacheListener();
+        for (int i = 1; i <= 10; i++) {
+          ctl.waitForInvalidated(KEY+i);
+          assertNotNull(region.getEntry(KEY+i));
+        }
+      }
+    });
+    
+    validateCQ(client, "testInterestListAndCQs_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ noTest,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ size,
+        /* totalEvents: */ size * 3);
+    
+    // DESTROY - this should not have any effect on CQ, as the events are
+    // already destroyed from invalidate events.
+    server.invoke(new CacheSerializableRunnable("Invalidate values") {
+      public void run2() throws CacheException {
+        Region region1 = getRootRegion().getSubregion(regions[0]);
+        for (int i = 1; i <= size; i++) {
+          region1.destroy(KEY+i);
+        }
+      }
+    });
+
+    // Wait for destroyed.
+    client.invoke(new CacheSerializableRunnable("validate destroys") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regions[0]);
+        assertNotNull(region);
+                
+        CertifiableTestCacheListener ctl = (CertifiableTestCacheListener) region.getAttributes().getCacheListener();
+        for (int i = 1; i <= 10; i++) {
+          ctl.waitForDestroyed(KEY+i);
+        }
+      }
+    });
+
+    validateCQ(client, "testInterestListAndCQs_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ size,
+        /* deletes; */ noTest,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ size,
+        /* totalEvents: */ size * 3);
+
+    closeClient(client);
+    closeServer(server);
+  }
+  
+  
+  /**
+   * Test for CQ register and UnRegister.
+   * @throws Exception
+   */
+  public void testCQStopExecute() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    
+    /* Init Server and Client */
+    createServer(server);
+    final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    createClient(client, thePort, host0);
+    
+    /* Create CQs. */
+    createCQ(client, "testCQStopExecute_0", cqs[0]); 
+    validateCQCount(client, 1);
+    
+    executeCQ(client, "testCQStopExecute_0", false, null); 
+    
+    /* Init values at server. */
+    int size = 10;
+    createValues(server, regions[0], size);
+    // Wait for client to Synch.
+    
+    waitForCreated(client, "testCQStopExecute_0", KEY+size);
+    
+    
+    // Check if Client and Server in sync.
+    //validateServerClientRegionEntries(server, client, regions[0]);
+    validateQuery(server, cqs[0], 10);    
+    // validate CQs.
+    //validateCQ(client, "testCQStopExecute_0", size, noTest, noTest, noTest);
+    validateCQ(client, "testCQStopExecute_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    // Test  CQ stop
+    stopCQ(client, "testCQStopExecute_0");
+    
+    // Test  CQ re-enable
+    executeCQ(client, "testCQStopExecute_0", false, null);
+    
+    /* Init values at server. */
+    createValues(server, regions[0], 20);
+    // Wait for client to Synch.
+    waitForCreated(client, "testCQStopExecute_0", KEY+20);
+    size = 30;
+    
+    // Check if Client and Server in sync.
+    //validateServerClientRegionEntries(server, client, regions[0]);
+    validateQuery(server, cqs[0], 20);    
+    // validate CQs.
+    //validateCQ(client, "testCQStopExecute_0", size, noTest, noTest, noTest);
+    validateCQ(client, "testCQStopExecute_0",
+        /* resultSize: */ noTest,
+        /* creates: */ 20,
+        /* updates: */ 10,
+        /* deletes; */ 0,
+        /* queryInserts: */ 20,
+        /* queryUpdates: */ 10,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    
+    // Stop and execute CQ 20 times
+    stopExecCQ(client, "testCQStopExecute_0", 20);
+    
+    // Test  CQ Close
+    closeCQ(client, "testCQStopExecute_0");
+    
+    // Close.
+    closeClient(client);
+    closeServer(server);
+  }
+  
+  /**
+   * Test for CQ Attributes Mutator functions
+   * @throws Exception
+   */
+  public void testCQAttributesMutator() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    
+    /* Init Server and Client */
+    createServer(server);
+    final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    createClient(client, thePort, host0);
+    
+    /* Create CQs. */
+    String cqName = new String("testCQAttributesMutator_0");
+    createCQ(client, cqName, cqs[0]); 
+    validateCQCount(client, 1);    
+    executeCQ(client,cqName, false, null); 
+    
+    /* Init values at server. */
+    int size = 10;
+    createValues(server, regions[0], size);
+    // Wait for client to Synch.
+    waitForCreated(client, cqName, KEY + size);
+    
+    // validate CQs.
+    validateCQ(client, cqName,
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    // Add 2 new CQ Listeners
+    mutateCQAttributes(client, cqName, UPDATE);
+    
+    /* Init values at server. */
+    createValues(server, regions[0], size * 2);
+    waitForCreated(client, cqName, KEY + (size * 2));
+        
+    validateCQ(client, cqName,
+        /* resultSize: */ noTest,
+        /* creates: */ 20,
+        /* updates: */ 10,
+        /* deletes; */ 0,
+        /* queryInserts: */ 20,
+        /* queryUpdates: */ 10,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ 30);
+    
+    // Remove 2 listeners and validate
+    mutateCQAttributes(client, cqName, DESTROY);
+    
+    validateCQ(client, cqName,
+        /* resultSize: */ noTest,
+        /* creates: */ 10,
+        /* updates: */ 10,
+        /* deletes; */ 0,
+        /* queryInserts: */ 10,
+        /* queryUpdates: */ 10,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ 20);
+    
+    // Reinitialize with 2 CQ Listeners
+    mutateCQAttributes(client, cqName, CREATE);  
+    
+    /* Delete values at server. */
+    deleteValues(server, regions[0], 20);
+    // Wait for client to Synch.
+    waitForDestroyed(client, cqName, KEY + (size * 2));
+    
+    validateCQ(client, cqName,
+        /* resultSize: */ noTest,
+        /* creates: */ 0,
+        /* updates: */ 0,
+        /* deletes; */ 20,
+        /* queryInserts: */ 0,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 20,
+        /* totalEvents: */ 20);
+    
+    // Close CQ
+    closeCQ(client, cqName);
+    
+    
+    // Close.
+    closeClient(client);
+    closeServer(server);
+  }
+  
+  /**
+   * Test for CQ register and UnRegister.
+   * @throws Exception
+   */
+  public void testCQCreateClose() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    
+    /* Init Server and Client */
+    createServer(server);
+    final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    createClient(client, thePort, host0);
+    
+    /* debug */
+    //getLogWriter().info("### DEBUG STOP ####");
+    //pause(60 * 1000);
+    //getLogWriter().info("### DEBUG START ####");
+    
+    /* Create CQs. */
+    createCQ(client, "testCQCreateClose_0", cqs[0]); 
+    validateCQCount(client, 1);
+    
+    executeCQ(client, "testCQCreateClose_0", false, null); 
+    
+    /* Init values at server. */
+    int size = 10;
+    createValues(server, regions[0], size);
+    // Wait for client to Synch.
+    waitForCreated(client, "testCQCreateClose_0", KEY+size);
+    
+    // Check if Client and Server in sync.
+    //validateServerClientRegionEntries(server, client, regions[0]);
+    validateQuery(server, cqs[0], 10);    
+    // validate CQs.
+    validateCQ(client, "testCQCreateClose_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    // Test  CQ stop
+    stopCQ(client, "testCQCreateClose_0");
+    
+    // Test  CQ re-enable
+    executeCQ(client, "testCQCreateClose_0", false, null);
+    
+    // Test  CQ Close
+    closeCQ(client, "testCQCreateClose_0");
+    
+    //Create CQs with no name, execute, and close. 
+    createAndExecCQNoName(client, cqs[0]); 
+    
+    // Accessing the closed CQ.
+    failIfCQExists(client, "testCQCreateClose_0");
+    
+    // re-Create the cq which is closed.
+    createCQ(client, "testCQCreateClose_0", cqs[0]);
+    
+    /* Test CQ Count */
+    validateCQCount(client, 1);
+    
+    // Registering CQ with same name from same client.
+    try {
+      createCQ(client, "testCQCreateClose_0", cqs[0]);
+      fail("Trying to create CQ with same name. Should have thrown CQExistsException");
+    } catch (dunit.RMIException rmiExc) {
+      Throwable cause = rmiExc.getCause();
+      assertTrue("unexpected cause: " + cause.getClass().getName(), cause instanceof AssertionError);
+      Throwable causeCause = cause.getCause(); // should be a CQExistsException
+      assertTrue("Got wrong exception: " + causeCause.getClass().getName(),
+          causeCause instanceof CqExistsException);
+    }
+    
+    // Getting values from non-existent CQ.
+    failIfCQExists(client, "testCQCreateClose_NO");
+    
+    // Server Registering CQ.
+    try {
+      createCQ(server, "testCQCreateClose_1", cqs[0]);
+      fail("Trying to create CQ on Cache Server. Should have thrown Exception.");
+    } catch (dunit.RMIException rmiExc) {
+      Throwable cause = rmiExc.getCause();
+      assertTrue("unexpected cause: " + cause.getClass().getName(), 
+          cause instanceof AssertionError);
+      Throwable causeCause = cause.getCause(); // should be a IllegalStateException
+      assertTrue("Got wrong exception: " + causeCause.getClass().getName(),
+          causeCause instanceof IllegalStateException);
+    }
+    
+    // Trying to execute CQ on non-existing region.
+    createCQ(client, "testCQCreateClose_2", invalidCQs[0]);
+    try {
+      executeCQ(client, "testCQCreateClose_2", false, "RegionNotFoundException");
+      fail("Trying to create CQ on non-existing Region. Should have thrown Exception.");
+    } catch (dunit.RMIException rmiExc) {
+      Throwable cause = rmiExc.getCause();
+      if (!(cause instanceof AssertionError)) {
+        getLogWriter().severe("Expected to see an AssertionError.", cause);
+        fail("wrong error");
+      }
+      Throwable causeCause = cause.getCause(); // should be a RegionNotFoundException
+      if (!(causeCause instanceof RegionNotFoundException)) {
+        getLogWriter().severe("Expected cause to be RegionNotFoundException", cause);
+        fail("wrong cause");
+      }
+    }
+    
+    /* Test CQ Count - Above failed create should not increment the CQ cnt.*/
+    validateCQCount(client, 2);
+    
+    createCQ(client, "testCQCreateClose_3", cqs[2]);
+    
+    validateCQCount(client, 3);
+    
+    /* Test for closeAllCQs() */
+    
+    client.invoke(new CacheSerializableRunnable("CloseAll CQ :") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Close All CQ. ###");
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {          
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          getLogWriter().info("Failed to getCQService.", cqe);
+          fail("Failed to getCQService.");
+        }
+        
+        // Close CQ.
+        try {
+          cqService.closeCqs();
+        } catch (Exception ex){
+          ex.printStackTrace();
+          getLogWriter().info("Failed to close All CQ.", ex);
+          fail("Failed to close All CQ. " + ex.getMessage());
+        }
+      }
+    });
+    
+    validateCQCount(client, 0);
+    
+    // Initialize.
+    createCQ(client, "testCQCreateClose_2", cqs[1]);
+    createCQ(client, "testCQCreateClose_4", cqs[1]);
+    createCQ(client, "testCQCreateClose_5", cqs[1]);
+    
+    // Execute few of the initialized cqs
+    executeCQ(client, "testCQCreateClose_4", false, null);
+    executeCQ(client, "testCQCreateClose_5", false, null);
+    
+    // Call close all CQ.
+    client.invoke(new CacheSerializableRunnable("CloseAll CQ 2 :") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Close All CQ 2. ###");
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {          
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+        
+        // Close CQ.
+        try {
+          cqService.closeCqs();
+        } catch (Exception ex){
+          ex.printStackTrace();
+          fail("Failed to close All CQ  . " + ex.getMessage());
+        }
+      }
+    });
+    
+    // Close.
+    closeClient(client);
+    closeServer(server);
+  }
+  
+  /**
+   * This will test the events after region destory.
+   * The CQs on the destroy region needs to be closed.
+   *
+   */
+  public void testRegionDestroy() throws Exception {
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    
+    /* Init Server and Client */
+    createServer(server);
+    final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    createClient(client, thePort, host0);
+    
+    
+    /* Create CQs. */
+    createCQ(client, "testRegionDestroy_0", cqs[0]); 
+    createCQ(client, "testRegionDestroy_1", cqs[0]); 
+    createCQ(client, "testRegionDestroy_2", cqs[0]); 
+    
+    executeCQ(client, "testRegionDestroy_0", false, null);
+    executeCQ(client, "testRegionDestroy_1", false, null);
+    executeCQ(client, "testRegionDestroy_2", false, null);
+    
+    /* Init values at server. */
+    final int size = 10;
+    registerInterestListCQ(client, regions[0], size);    
+    createValues(server, regions[0], size);
+    
+    // Wait for client to Synch.
+    
+    waitForCreated(client, "testRegionDestroy_0", KEY + 10);
+    
+    
+    // validate CQs.
+    validateCQ(client, "testRegionDestroy_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ noTest,
+        /* deletes; */ noTest,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    
+    // Validate InterestList.
+    // CREATE
+    client.invoke(new CacheSerializableRunnable("validate updates") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regions[0]);
+        assertNotNull(region);
+        
+        Set keys = region.entrySet();
+        assertEquals("Mismatch, number of keys in local region is not equal to the interest list size", 
+            size, keys.size());
+        
+        CertifiableTestCacheListener ctl = (CertifiableTestCacheListener) region.getAttributes().getCacheListener();
+        for (int i = 1; i <= 10; i++) {
+          ctl.waitForCreated(KEY+i);
+          assertNotNull(region.getEntry(KEY+i));
+        }
+      }
+    });
+    
+    // Destroy Region.
+    server.invoke(new CacheSerializableRunnable("Destroy Region") {
+      public void run2() throws CacheException {
+        Region region1 = getRootRegion().getSubregion(regions[0]);
+        region1.destroyRegion();
+      }
+    });
+    
+    pause(4 * 1000);
+    validateCQCount(client, 0);
+    
+    closeClient(client);
+    closeServer(server);
+    
+  }
+  
+  /**
+   * Test for CQ with multiple clients.
+   */
+  public void testCQWithMultipleClients() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client1 = host.getVM(1);
+    VM client2 = host.getVM(2);
+    VM client3 = host.getVM(3);
+    
+    /* Create Server and Client */
+    createServer(server);
+    final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    createClient(client1, thePort, host0);
+    createClient(client2, thePort, host0);
+    
+    /* Create CQs. and initialize the region */
+    createCQ(client1, "testCQWithMultipleClients_0", cqs[0]);
+    executeCQ(client1, "testCQWithMultipleClients_0", false, null);
+    createCQ(client2, "testCQWithMultipleClients_0", cqs[0]);
+    executeCQ(client2, "testCQWithMultipleClients_0", false, null);
+    
+    int size = 10;
+    
+    // Create Values on Server.
+    createValues(server, regions[0], size);
+    
+    
+    waitForCreated(client1, "testCQWithMultipleClients_0", KEY + 10);
+    
+    
+    /* Validate the CQs */
+    validateCQ(client1, "testCQWithMultipleClients_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    
+    waitForCreated(client2, "testCQWithMultipleClients_0", KEY + 10);
+    
+    
+    validateCQ(client2, "testCQWithMultipleClients_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    
+    /* Close test */
+    closeCQ(client1, "testCQWithMultipleClients_0");
+    
+    validateCQ(client2, "testCQWithMultipleClients_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    /* Init new client and create cq */
+    createClient(client3, thePort, host0);
+    createCQ(client3, "testCQWithMultipleClients_0", cqs[0]);
+    createCQ(client3, "testCQWithMultipleClients_1", cqs[1]);
+    executeCQ(client3, "testCQWithMultipleClients_0", false, null);
+    executeCQ(client3, "testCQWithMultipleClients_1", false, null);
+    
+    // Update values on Server. This will be updated on new Client CQs.
+    createValues(server, regions[0], size);
+    
+    
+    waitForUpdated(client3, "testCQWithMultipleClients_0", KEY + 10);
+    
+    
+    validateCQ(client3, "testCQWithMultipleClients_0",
+        /* resultSize: */ noTest,
+        /* creates: */ 0,
+        /* updates: */ size,
+        /* deletes; */ 0,
+        /* queryInserts: */ 0,
+        /* queryUpdates: */ size,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    validateCQ(client3, "testCQWithMultipleClients_1",
+        /* resultSize: */ noTest,
+        /* creates: */ 0,
+        /* updates: */ 1,
+        /* deletes; */ 0,
+        /* queryInserts: */ 0,
+        /* queryUpdates: */ 1,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ 1);    
+    
+    /* Validate the CQ count */
+    validateCQCount(client1, 0);
+    validateCQCount(client2, 1);
+    validateCQCount(client3, 2);
+    
+    /* Close Client Test */
+    closeClient(client1);
+    
+    clearCQListenerEvents(client2, "testCQWithMultipleClients_0");
+    clearCQListenerEvents(client3, "testCQWithMultipleClients_1");
+    
+    // Update values on server, update again.
+    createValues(server, regions[0], size);
+    
+    
+    waitForUpdated(client2, "testCQWithMultipleClients_0", KEY + 10);
+    
+    
+    validateCQ(client2, "testCQWithMultipleClients_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ size * 2,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ size * 2,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size * 3);
+    
+    waitForUpdated(client3, "testCQWithMultipleClients_1", KEY + 2);
+    
+    validateCQ(client3, "testCQWithMultipleClients_1",
+        /* resultSize: */ noTest,
+        /* creates: */ 0,
+        /* updates: */ 2,
+        /* deletes; */ 0,
+        /* queryInserts: */ 0,
+        /* queryUpdates: */ 2,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ 2);    
+    
+    /* Close Server and Client */
+    closeClient(client2);
+    closeClient(client3);
+    closeServer(server);
+  }
+  
+  /**
+   * Test for CQ ResultSet.
+   */
+  public void testCQResultSet() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    
+    createServer(server);
+    
+    final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    
+    // Create client.
+    createClient(client, thePort, host0);
+    
+    /* CQ Test with initial Values. */
+    int size = 10;
+    createValues(server, regions[0], size);
+    pause(1*500);
+    
+    // Create CQs.
+    createCQ(client, "testCQResultSet_0", cqs[0]);    
+    
+    // Check resultSet Size.
+    executeCQ(client, "testCQResultSet_0", true, 10, null);
+    
+    /* CQ Test with no Values on Region */
+    createCQ(client, "testCQResultSet_1", cqs[2]);
+    // Check resultSet Size.
+    executeCQ(client, "testCQResultSet_1", true, 0, null);
+    stopCQ(client, "testCQResultSet_1");
+    
+    // Init values.
+    createValues(server, regions[1], 5);    
+    validateQuery(server, cqs[2], 2);
+    
+    executeCQ(client, "testCQResultSet_1", true, 2, null);
+    
+    /* compare values...
+     Disabled since we don't currently maintain results on the client
+     
+     validateCQ(client, "testCQResultSet_1", 2, noTest, noTest, noTest);
+     Portfolio[] values = new Portfolio[] {new Portfolio(2), new Portfolio(4)}; 
+     Hashtable t = new Hashtable();
+     String[] keys = new String[] {"key-2", "key-4"};
+     t.put(keys[0], values[0]);
+     t.put(keys[1], values[1]);
+     
+     compareValues(client, "testCQResultSet_1", t);
+     
+     deleteValues(server, regions[1], 3);
+     t.remove("key-4");
+     pause(2 * 1000);
+     
+     try {
+     compareValues(client, "testCQResultSet_1", t);
+     fail("Should have thrown Exception. The value should not be present in cq results region");
+     }
+     catch (Exception ex) { // @todo check for specific exception type
+     }
+     
+     */
+    
+    // Close.
+    closeClient(client);    
+    closeServer(server);
+  }
+  
+  /**
+   * Test for CQ Listener events.
+   *
+   */
+  public void testCQEvents() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    
+    createServer(server);
+    
+    final int thePort = server.invokeInt(CqQueryDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    
+    // Create client.
+    createClient(client, thePort, host0);
+    
+    // Create CQs.
+    createCQ(client, "testCQEvents_0", cqs[0]);
+    
+    executeCQ(client, "testCQEvents_0", false, null); 
+    
+    // Init values at server.
+    int size = 10;
+    createValues(server, regions[0], size);
+    
+    waitForCreated(client, "testCQEvents_0", KEY+size);
+    
+    // validate Create events.
+    validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    
+    // Update values.
+    createValues(server, regions[0], 5);
+    createValues(server, regions[0], 10);
+    
+    waitForUpdated(client, "testCQEvents_0", KEY+size);
+    
+    
+    // validate Update events.
+    validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+        /* updates: */ 15,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 15,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size + 15);
+    
+    // Validate delete events.
+    deleteValues(server, regions[0], 5);
+    waitForDestroyed(client, "testCQEvents_0", KEY+5);
+    
+    validateCQ(client, "testCQEvents_0",
+        /* resultSize: */ noTest,
+        /* creates: */ size,
+ 

<TRUNCATED>


[37/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java
new file mode 100644
index 0000000..51a60d2
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java
@@ -0,0 +1,686 @@
+package com.gemstone.gemfire.cache.query.dunit;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.client.PoolManager;
+import com.gemstone.gemfire.cache.query.CqAttributes;
+import com.gemstone.gemfire.cache.query.CqAttributesFactory;
+import com.gemstone.gemfire.cache.query.CqEvent;
+import com.gemstone.gemfire.cache.query.CqListener;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.cache.query.SelectResults;
+import com.gemstone.gemfire.cache.query.Struct;
+import com.gemstone.gemfire.cache.query.cq.dunit.CqQueryTestListener;
+import com.gemstone.gemfire.cache.query.dunit.PdxQueryCQTestBase.TestObject;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+
+import dunit.Host;
+import dunit.SerializableRunnable;
+import dunit.VM;
+import dunit.DistributedTestCase.WaitCriterion;
+
+public class PdxQueryCQDUnitTest extends PdxQueryCQTestBase {
+
+  public PdxQueryCQDUnitTest(String name) {
+    super(name);
+  }
+  
+  /**
+   * Tests client-server query on PdxInstance.
+   */
+  public void testCq() throws CacheException {
+    
+    final Host host = Host.getHost(0);
+    VM vm0 = host.getVM(0);
+    VM vm1 = host.getVM(1);
+    VM vm2 = host.getVM(2);
+    VM vm3 = host.getVM(3);
+    final int numberOfEntries = 10;
+    final int queryLimit = 6;  // where id > 5 (0-5)
+    
+    // Start server1
+    vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        configAndStartBridgeServer();
+        Region region = getRootRegion().getSubregion(regionName);
+        for (int i=0; i<numberOfEntries; i++) {
+          region.put("key-"+i, new TestObject(i, "vmware"));
+        }
+      }
+    });
+
+    // Start server2
+    vm1.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        configAndStartBridgeServer();
+        Region region = getRootRegion().getSubregion(regionName);
+      }
+    });
+
+    // Client pool.
+    final int port0 = vm0.invokeInt(PdxQueryCQTestBase.class, "getCacheServerPort");
+    final int port1 = vm1.invokeInt(PdxQueryCQTestBase.class, "getCacheServerPort");
+
+    final String host0 = getServerHostName(vm0.getHost());
+
+    // Create client pool.
+    final String poolName = "testCqPool"; 
+    createPool(vm2, poolName, new String[]{host0}, new int[]{port0}, true);
+    createPool(vm3, poolName, new String[]{host0}, new int[]{port1}, true);
+    final String cqName = "testCq";
+    
+    // Execute CQ
+    SerializableRunnable executeCq = new CacheSerializableRunnable("Execute queries") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Create CQ. ###" + cqName);
+        // Get CQ Service.
+        QueryService qService = null;
+        try {
+          qService = (PoolManager.find(poolName)).getQueryService();
+        } catch (Exception cqe) {
+          fail("Failed to getCQService.", cqe);
+        }
+        // Create CQ Attributes.
+        CqAttributesFactory cqf = new CqAttributesFactory();
+        CqListener[] cqListeners = {new CqQueryTestListener(getLogWriter())};
+        ((CqQueryTestListener)cqListeners[0]).cqName = cqName;
+
+        cqf.initCqListeners(cqListeners);
+        CqAttributes cqa = cqf.create();
+
+        // Create CQ.
+        try {
+          CqQuery cq = qService.newCq(cqName, queryString[3], cqa);
+          SelectResults sr = cq.executeWithInitialResults();
+          for (Object o: sr.asSet()) {
+            Struct s = (Struct)o;
+            Object value = s.get("value");
+            if (!(value instanceof TestObject)) {
+              fail("Expected type TestObject, not found in result set. Found type :" + o.getClass());
+            } 
+          }
+        } catch (Exception ex){
+          AssertionError err = new AssertionError("Failed to create CQ " + cqName + " . ");
+          err.initCause(ex);
+          getLogWriter().info("QueryService is :" + qService, err);
+          throw err;
+        }
+      }
+    };
+
+    vm2.invoke(executeCq);
+    vm3.invoke(executeCq);
+
+    // Check for TestObject instances on Server2.
+    // It should be 0
+    vm1.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        assertEquals(0, TestObject.numInstance);
+      }
+    });
+    
+    // update
+    vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        for (int i=0; i<numberOfEntries * 2; i++) {
+          region.put("key-"+i, new TestObject(i, "vmware"));
+        }
+        // Check for TestObject instances.        
+        assertEquals(numberOfEntries * 3, TestObject.numInstance);
+      }
+    });
+
+    // Check for TestObject instances on Server2.
+    // It should be 0
+    vm1.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        assertEquals(0, TestObject.numInstance);
+      }
+    });
+
+    SerializableRunnable validateCq = new CacheSerializableRunnable("Validate CQs") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Validating CQ. ### " + cqName);
+        // Get CQ Service.
+        QueryService cqService = null;
+        try {          
+          cqService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          fail("Failed to getCQService.", cqe);
+        }
+        
+        CqQuery cQuery = cqService.getCq(cqName);
+        if (cQuery == null) {
+          fail("Failed to get CqQuery for CQ : " + cqName);
+        }
+        
+        CqAttributes cqAttr = cQuery.getCqAttributes();
+        CqListener cqListeners[] = cqAttr.getCqListeners();
+        final CqQueryTestListener listener = (CqQueryTestListener) cqListeners[0];
+        
+        //Wait for the events to show up on the client.
+        waitForCriterion(new WaitCriterion() {
+          
+          public boolean done() {
+            return listener.getTotalEventCount() >= (numberOfEntries * 2 - queryLimit);
+          }
+          
+          public String description() {
+            return null;
+          }
+        }, 30000, 100, false);
+        
+        listener.printInfo(false);
+    
+        // Check for event type.
+        Object[] cqEvents = listener.getEvents();
+        for (Object o: cqEvents) {
+          CqEvent cqEvent = (CqEvent)o;
+          Object value = cqEvent.getNewValue();
+          if (!(value instanceof TestObject)) {
+            fail("Expected type TestObject, not found in result set. Found type :" + o.getClass());
+          } 
+        }
+        
+        // Check for totalEvents count.
+        assertEquals("Total Event Count mismatch", (numberOfEntries * 2 - queryLimit), listener.getTotalEventCount());
+                
+        // Check for create count.
+        assertEquals("Create Event mismatch", numberOfEntries, listener.getCreateEventCount());
+        
+        // Check for update count.
+        assertEquals("Update Event mismatch", numberOfEntries  - queryLimit, listener.getUpdateEventCount());      
+      }
+    };
+    
+    vm2.invoke(validateCq);
+    vm3.invoke(validateCq);
+    
+    this.closeClient(vm2);
+    this.closeClient(vm3);
+    this.closeClient(vm1);
+    this.closeClient(vm0);
+  }
+  
+  /**
+   * Tests client-server query on PdxInstance.
+   */
+  
+  public void testCqAndInterestRegistrations() throws CacheException {
+    
+    final Host host = Host.getHost(0);
+    VM vm0 = host.getVM(0);
+    VM vm1 = host.getVM(1);
+    VM vm2 = host.getVM(2);
+    VM vm3 = host.getVM(3);
+    final int numberOfEntries = 10;
+    final int queryLimit = 6;  // where id > 5 (0-5)
+    
+    final String[] queries = new String[] {
+        "SELECT * FROM " + regName + " p WHERE p.ticker = 'vmware'",
+        "SELECT * FROM " + regName + " WHERE id > 5", 
+      };
+    
+    // Start server1
+    vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        configAndStartBridgeServer(false, true);
+        Region region = getRootRegion().getSubregion(regionName);
+      }
+    });
+
+    // Start server2
+    vm1.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        configAndStartBridgeServer(false, true);
+        Region region = getRootRegion().getSubregion(regionName);
+      }
+    });
+
+    // Client pool.
+    final int port0 = vm0.invokeInt(PdxQueryCQTestBase.class, "getCacheServerPort");
+    final int port1 = vm1.invokeInt(PdxQueryCQTestBase.class, "getCacheServerPort");
+
+    final String host0 = getServerHostName(vm0.getHost());
+
+    // Create client pool.
+    final String poolName = "testCqPool"; 
+    
+    createPool(vm2, poolName, new String[]{host0, host0}, new int[]{port0, port1}, true);
+    createPool(vm3, poolName, new String[]{host0, host0}, new int[]{port1, port0}, true);
+    
+    final String cqName = "testCq";
+
+    vm3.invoke(new CacheSerializableRunnable("init region") {
+      public void run2() throws CacheException {
+        QueryService localQueryService = null;
+
+        AttributesFactory factory = new AttributesFactory();
+        factory.setScope(Scope.LOCAL);
+        ClientServerTestCase.configureConnectionPool(factory, host0, port1,-1, true, -1, -1, null);
+        Region region = createRegion(regionName, rootRegionName,  factory.create());
+
+        for (int i=0; i<numberOfEntries; i++) {
+          region.put("key-"+i, new TestObject(i, "vmware"));
+        }   
+      }
+    });
+
+    vm2.invoke(new CacheSerializableRunnable("init region") {
+      public void run2() throws CacheException {
+        QueryService localQueryService = null;
+
+        AttributesFactory factory = new AttributesFactory();
+        factory.setScope(Scope.LOCAL);
+        ClientServerTestCase.configureConnectionPool(factory, host0, port0,-1, true, -1, -1, null);
+        Region region = createRegion(regionName, rootRegionName,  factory.create());
+      }
+    });
+    
+    SerializableRunnable subscribe = new CacheSerializableRunnable("subscribe") {
+      public void run2() throws CacheException {
+        
+        // Register interest
+        Region region = getRootRegion().getSubregion(regionName);
+        List list = new ArrayList();
+        for (int i = 1; i <= numberOfEntries * 3; i++) {
+          if (i % 4 == 0) {
+            list.add("key-"+i);
+          }
+        }
+        region.registerInterest(list);
+        
+        getLogWriter().info("### Create CQ. ###" + cqName);
+        // Get CQ Service.
+        QueryService qService = null;
+        try {
+          qService = (PoolManager.find(poolName)).getQueryService();
+        } catch (Exception cqe) {
+          fail("Failed to getCQService.", cqe);
+        }
+        // Create CQ Attributes.
+        for (int i=0; i < queries.length; i++) {
+          CqAttributesFactory cqf = new CqAttributesFactory();
+          CqListener[] cqListeners = {new CqQueryTestListener(getLogWriter())};
+          ((CqQueryTestListener)cqListeners[0]).cqName = (cqName + i);
+
+          cqf.initCqListeners(cqListeners);
+          CqAttributes cqa = cqf.create();
+
+          // Create CQ.
+          try {
+            CqQuery cq = qService.newCq(cqName + i, queries[i], cqa);
+            SelectResults sr = cq.executeWithInitialResults();
+            for (Object o: sr.asSet()) {
+              Struct s = (Struct)o;
+              Object value = s.get("value");
+              if (!(value instanceof TestObject)) {
+                fail("Expected type TestObject, not found in result set. Found type :" + o.getClass());
+              } 
+            }
+          } catch (Exception ex){
+            AssertionError err = new AssertionError("Failed to create CQ " + cqName + " . ");
+            err.initCause(ex);
+            getLogWriter().info("QueryService is :" + qService, err);
+            throw err;
+          }
+        }
+      }
+    };
+
+    vm2.invoke(subscribe);
+    vm3.invoke(subscribe);
+
+    // Check for TestObject instances on Server2.
+    // It should be 0
+    vm1.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        assertEquals(0, TestObject.numInstance);
+      }
+    });
+    
+    vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        // Check for TestObject instances.        
+        assertEquals(0, TestObject.numInstance);
+      }
+    });
+
+    vm3.invoke(new CacheSerializableRunnable("Update") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        
+        for (int i=0; i<numberOfEntries * 2; i++) {
+          region.put("key-"+i, new TestObject(i, "vmware"));
+        }        
+      }
+    });
+    
+    // Validate CQs.
+    for (int i=0; i < queries.length; i++) {
+      int expectedEvent = 0;
+      int updateEvents = 0;
+
+      if (i != 0) {
+        expectedEvent = numberOfEntries * 2 - queryLimit;
+        updateEvents = numberOfEntries - queryLimit;
+      } else {
+        expectedEvent = numberOfEntries * 2;
+        updateEvents = numberOfEntries;
+      }
+
+      validateCq (vm2, cqName + i, expectedEvent, numberOfEntries, updateEvents);
+      validateCq (vm3, cqName + i, expectedEvent, numberOfEntries, updateEvents);
+    }
+    
+
+    vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        // Check for TestObject instances.        
+        assertEquals(0, TestObject.numInstance);
+      }
+    });
+    
+    // Check for TestObject instances on Server2.
+    // It should be 0
+    vm1.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        assertEquals(0, TestObject.numInstance);
+      }
+    });
+    
+    
+    this.closeClient(vm2);
+    this.closeClient(vm3);
+    this.closeClient(vm1);
+    this.closeClient(vm0);
+  }
+  
+  /**
+   * Tests client-server query on PdxInstance.
+   */
+  public void testCqAndInterestRegistrationsWithFailOver() throws CacheException {
+    
+    final Host host = Host.getHost(0);
+    VM vm0 = host.getVM(0);
+    VM vm1 = host.getVM(1);
+    VM vm2 = host.getVM(2);
+    VM vm3 = host.getVM(3);
+    final int numberOfEntries = 10;
+    final int queryLimit = 6;  // where id > 5 (0-5)
+    
+    final String[] queries = new String[] {
+        "SELECT * FROM " + regName + " p WHERE p.ticker = 'vmware'",
+        "SELECT * FROM " + regName + " WHERE id > 5", 
+      };
+    
+    // Start server1
+    vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        configAndStartBridgeServer(false, true);
+        Region region = getRootRegion().getSubregion(regionName);
+      }
+    });
+
+    // Start server2
+    vm1.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        configAndStartBridgeServer(false, true);
+        Region region = getRootRegion().getSubregion(regionName);
+      }
+    });
+
+    // Start server3
+    vm2.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        configAndStartBridgeServer(false, true);
+        Region region = getRootRegion().getSubregion(regionName);
+      }
+    });
+    
+    // Client pool.
+    final int port0 = vm0.invokeInt(PdxQueryCQTestBase.class, "getCacheServerPort");
+    final int port1 = vm1.invokeInt(PdxQueryCQTestBase.class, "getCacheServerPort");
+    final int port2 = vm2.invokeInt(PdxQueryCQTestBase.class, "getCacheServerPort");
+    
+    final String host0 = getServerHostName(vm0.getHost());
+
+    // Create client pool.
+    final String poolName = "testCqPool";     
+    createPool(vm3, poolName, new String[]{host0, host0, host0}, new int[]{port1, port0, port2}, true, 1);
+    
+    final String cqName = "testCq";
+
+    vm3.invoke(new CacheSerializableRunnable("init region") {
+      public void run2() throws CacheException {
+        QueryService localQueryService = null;
+
+        AttributesFactory factory = new AttributesFactory();
+        factory.setScope(Scope.LOCAL);
+        ClientServerTestCase.configureConnectionPool(factory, host0, port1,-1, true, -1, -1, null);
+        Region region = createRegion(regionName, rootRegionName,  factory.create());
+
+        for (int i=0; i<numberOfEntries; i++) {
+          region.put("key-"+i, new TestObject(i, "vmware"));
+        }   
+      }
+    });
+
+    SerializableRunnable subscribe = new CacheSerializableRunnable("subscribe") {
+      public void run2() throws CacheException {
+        
+        // Register interest
+        Region region = getRootRegion().getSubregion(regionName);
+        List list = new ArrayList();
+        for (int i = 1; i <= numberOfEntries * 3; i++) {
+          if (i % 4 == 0) {
+            list.add("key-"+i);
+          }
+        }
+        region.registerInterest(list);
+        
+        getLogWriter().info("### Create CQ. ###" + cqName);
+        // Get CQ Service.
+        QueryService qService = null;
+        try {
+          qService = (PoolManager.find(poolName)).getQueryService();
+        } catch (Exception cqe) {
+          fail("Failed to getCQService.", cqe);
+        }
+        // Create CQ Attributes.
+        for (int i=0; i < queries.length; i++) {
+          CqAttributesFactory cqf = new CqAttributesFactory();
+          CqListener[] cqListeners = {new CqQueryTestListener(getLogWriter())};
+          ((CqQueryTestListener)cqListeners[0]).cqName = (cqName + i);
+
+          cqf.initCqListeners(cqListeners);
+          CqAttributes cqa = cqf.create();
+
+          // Create CQ.
+          try {
+            CqQuery cq = qService.newCq(cqName + i, queries[i], cqa);
+            SelectResults sr = cq.executeWithInitialResults();
+            for (Object o: sr.asSet()) {
+              Struct s = (Struct)o;
+              Object value = s.get("value");
+              if (!(value instanceof TestObject)) {
+                fail("Expected type TestObject, not found in result set. Found type :" + o.getClass());
+              } 
+            }
+          } catch (Exception ex){
+            AssertionError err = new AssertionError("Failed to create CQ " + cqName + " . ");
+            err.initCause(ex);
+            getLogWriter().info("QueryService is :" + qService, err);
+            throw err;
+          }
+        }
+      }
+    };
+
+    vm3.invoke(subscribe);
+
+    // Check for TestObject instances on Server2.
+    // It should be 0
+    vm1.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        assertEquals(0, TestObject.numInstance);
+      }
+    });
+    
+    vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        // Check for TestObject instances.        
+        assertEquals(0, TestObject.numInstance);
+      }
+    });
+
+    // update
+    vm3.invoke(new CacheSerializableRunnable("Update") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        
+        for (int i=0; i<numberOfEntries * 2; i++) {
+          region.put("key-"+i, new TestObject(i, "vmware"));
+        }        
+      }
+    });
+    
+    // Validate CQs.
+    for (int i=0; i < queries.length; i++) {
+      int expectedEvent = 0;
+      int updateEvents = 0;
+
+      if (i != 0) {
+        expectedEvent = (numberOfEntries * 2) - queryLimit;
+        updateEvents = numberOfEntries - queryLimit;
+      } else {
+        expectedEvent = numberOfEntries * 2;
+        updateEvents = numberOfEntries;
+      }
+
+      validateCq (vm3, cqName + i, expectedEvent, numberOfEntries, updateEvents);
+    }
+    
+
+    vm0.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        // Check for TestObject instances.        
+        assertEquals(0, TestObject.numInstance);
+      }
+    });
+
+    vm1.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        assertEquals(0, TestObject.numInstance);
+      }
+    });
+    
+
+    // Update
+    vm3.invokeAsync(new CacheSerializableRunnable("Update") {
+      public void run2() throws CacheException {
+        Region region = getRootRegion().getSubregion(regionName);
+        
+        for (int i=0; i<numberOfEntries * 2; i++) {
+          region.put("key-"+i, new TestObject(i, "vmware"));
+        }        
+      }
+    });
+    
+    // Kill server
+    this.closeClient(vm0);
+    
+    // validate cq
+    for (int i=0; i < queries.length; i++) {
+      int expectedEvent = 0;
+      int updateEvents = 0;
+
+      if (i != 0) {
+        expectedEvent = (numberOfEntries * 4) - (queryLimit * 2); // Double the previous time
+        updateEvents = (numberOfEntries * 3) - (queryLimit * 2); 
+      } else {
+        expectedEvent = numberOfEntries * 4;
+        updateEvents = numberOfEntries * 3;
+      }
+
+      validateCq (vm3, cqName + i, expectedEvent, numberOfEntries, updateEvents);
+    }
+    
+    this.closeClient(vm1);
+    
+    // Check for TestObject instances on Server3.
+    // It should be 0
+    vm2.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+      public void run2() throws CacheException {
+        assertEquals(0, TestObject.numInstance);
+      }
+    });
+    
+    
+    this.closeClient(vm2);
+    this.closeClient(vm3);
+    
+  }
+  
+  public void validateCq(VM vm, final String cqName, final int expectedEvents, final int createEvents,
+      final int updateEvents) {
+        vm.invoke(new CacheSerializableRunnable("Validate CQs") {
+          public void run2() throws CacheException {
+            getLogWriter().info("### Validating CQ. ### " + cqName);
+            // Get CQ Service.
+            QueryService cqService = null;
+              try {          
+                cqService = getCache().getQueryService();
+              } catch (Exception cqe) {
+                fail("Failed to getCQService.", cqe);
+              }
+      
+              CqQuery cQuery = cqService.getCq(cqName);
+              if (cQuery == null) {
+                fail("Failed to get CqQuery for CQ : " + cqName);
+              }
+      
+              CqAttributes cqAttr = cQuery.getCqAttributes();
+              CqListener cqListeners[] = cqAttr.getCqListeners();
+              CqQueryTestListener listener = (CqQueryTestListener) cqListeners[0];
+              listener.printInfo(false);
+      
+              // Check for event type.
+              Object[] cqEvents = listener.getEvents();
+              for (Object o: cqEvents) {
+                CqEvent cqEvent = (CqEvent)o;
+                Object value = cqEvent.getNewValue();
+                if (!(value instanceof TestObject)) {
+                  fail("Expected type TestObject, not found in result set. Found type :" + o.getClass());
+                } 
+              }
+      
+              // Check for totalEvents count.
+              if (listener.getTotalEventCount() != expectedEvents) {
+                listener.waitForTotalEvents(expectedEvents);
+              }
+              
+              assertEquals("Total Event Count mismatch", (expectedEvents), listener.getTotalEventCount());
+      
+              // Check for create count.
+              assertEquals("Create Event mismatch", createEvents, listener.getCreateEventCount());
+      
+              // Check for update count.
+              assertEquals("Update Event mismatch", updateEvents, listener.getUpdateEventCount());      
+            }
+        });
+      }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
new file mode 100755
index 0000000..de1ed89
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
@@ -0,0 +1,500 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.cache.query.dunit;
+
+import java.io.IOException;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Properties;
+
+import com.gemstone.gemfire.LogWriter;
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.PartitionAttributes;
+import com.gemstone.gemfire.cache.PartitionAttributesFactory;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.client.PoolFactory;
+import com.gemstone.gemfire.cache.client.PoolManager;
+import com.gemstone.gemfire.cache.query.CacheUtils;
+import com.gemstone.gemfire.cache.query.CqAttributes;
+import com.gemstone.gemfire.cache.query.CqEvent;
+import com.gemstone.gemfire.cache.query.CqListener;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.Query;
+import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.cache.query.SelectResults;
+import com.gemstone.gemfire.cache.query.Struct;
+import com.gemstone.gemfire.cache.query.cq.dunit.CqQueryTestListener;
+import com.gemstone.gemfire.cache.query.data.PortfolioPdx;
+import com.gemstone.gemfire.cache.query.data.PositionPdx;
+import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.cache30.CacheTestCase;
+import com.gemstone.gemfire.compression.Compressor;
+import com.gemstone.gemfire.compression.SnappyCompressor;
+import com.gemstone.gemfire.i18n.LogWriterI18n;
+import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
+import com.gemstone.gemfire.pdx.PdxReader;
+import com.gemstone.gemfire.pdx.PdxSerializable;
+import com.gemstone.gemfire.pdx.PdxWriter;
+
+import dunit.Host;
+import dunit.SerializableRunnable;
+import dunit.VM;
+
+public abstract class PdxQueryCQTestBase extends CacheTestCase {
+
+  /** The port on which the bridge server was started in this VM */
+  private static int bridgeServerPort;
+  protected static final Compressor compressor = SnappyCompressor.getDefaultInstance();
+  protected final String rootRegionName = "root";
+  protected final String regionName = "PdxTest";
+  protected final String regionName2 = "PdxTest2";
+  protected final String regName = "/" + rootRegionName + "/" + regionName;
+  protected final String regName2 = "/" + rootRegionName + "/" + regionName2;
+  protected final String[] queryString = new String[] {
+      "SELECT DISTINCT id FROM " + regName, // 0
+      "SELECT * FROM " + regName, // 1
+      "SELECT ticker FROM " + regName, // 2
+      "SELECT * FROM " + regName + " WHERE id > 5", // 3
+      "SELECT p FROM " + regName + " p, p.idTickers idTickers WHERE p.ticker = 'vmware'", // 4
+    };
+
+  private static int getCacheServerPort() {
+    return bridgeServerPort;
+  }
+
+  public void tearDown2() throws Exception {
+    disconnectAllFromDS(); // tests all expect to create a new ds
+    // Reset the testObject numinstance for the next test.
+    TestObject.numInstance = 0;
+    // In all VM.
+    resetTestObjectInstanceCount();    
+  }
+
+  private void resetTestObjectInstanceCount() {
+    final Host host = Host.getHost(0);
+    for (int i=0; i < 4; i++) {
+      VM vm = host.getVM(i);
+      vm.invoke(new CacheSerializableRunnable("Create Bridge Server") {
+        public void run2() throws CacheException {
+          TestObject.numInstance = 0;
+          PortfolioPdx.numInstance = 0;
+          PositionPdx.numInstance = 0;
+          PositionPdx.cnt = 0;
+          TestObject2.numInstance = 0;
+        }
+      });
+    }
+  }
+
+  public void createPool(VM vm, String poolName, String server, int port,
+      boolean subscriptionEnabled) {
+        createPool(vm, poolName, new String[]{server}, new int[]{port}, subscriptionEnabled);  
+      }
+
+  public void createPool(VM vm, String poolName, String server, int port) {
+    createPool(vm, poolName, new String[]{server}, new int[]{port}, false);  
+  }
+
+  public void createPool(VM vm, final String poolName, final String[] servers, final int[] ports,
+      final boolean subscriptionEnabled) {
+        createPool(vm, poolName, servers, ports, subscriptionEnabled, 0);    
+      }
+
+  public void createPool(VM vm, final String poolName, final String[] servers, final int[] ports,
+      final boolean subscriptionEnabled, final int redundancy) {
+        vm.invoke(new CacheSerializableRunnable("createPool :" + poolName) {
+          public void run2() throws CacheException {
+            // Create Cache.
+            Properties props = new Properties();
+            props.setProperty("mcast-port", "0");
+            props.setProperty("locators", "");
+            getSystem(props );
+            getCache();        
+            PoolFactory cpf = PoolManager.createFactory();
+            cpf.setSubscriptionEnabled(subscriptionEnabled);
+            cpf.setSubscriptionRedundancy(redundancy);
+            for (int i=0; i < servers.length; i++){
+              getLogWriter().info("### Adding to Pool. ### Server : " + servers[i] + " Port : " + ports[i]);
+              cpf.addServer(servers[i], ports[i]);
+            }
+            cpf.create(poolName);
+          }
+        });   
+      }
+
+  public void executeClientQueries(VM vm, final String poolName, final String queryStr) {
+    vm.invoke(new CacheSerializableRunnable("Execute queries") {
+      public void run2() throws CacheException {
+        SelectResults results = null;
+        Comparator comparator = null;
+        Object[] resultsArray = null;
+        QueryService remoteQueryService = null;
+        QueryService localQueryService = null;
+        SelectResults[][] rs = new SelectResults[1][2];
+        
+        try {
+          remoteQueryService = (PoolManager.find(poolName)).getQueryService();
+          localQueryService = getCache().getQueryService();
+        } catch (Exception e) {
+          fail("Failed to get QueryService.", e);
+        }          
+  
+        try {
+          getLogWriter().info("### Executing Query on server:" + queryStr);
+          Query query = remoteQueryService.newQuery(queryStr);
+          rs[0][0] = (SelectResults)query.execute();
+          //printResults (rs[0][0], " ### Remote Query Results : ####");
+          getLogWriter().info("### Executing Query locally:" + queryStr);
+          query = localQueryService.newQuery(queryStr);
+          rs[0][1] = (SelectResults)query.execute();
+          getLogWriter().info("### Remote Query rs size: " + (rs[0][0]).size() + 
+              "Local Query rs size: " + (rs[0][1]).size());
+          //printResults (rs[0][1], " ### Local Query Results : ####");
+          // Compare local and remote query results.
+          if (!CacheUtils.compareResultsOfWithAndWithoutIndex(rs))
+          {
+             fail("Local and Remote Query Results are not matching for query :" + queryStr);  
+          }
+        } catch (Exception e) {
+          fail("Failed executing " + queryStr, e);
+        }
+      }
+    });
+  }
+
+  public void printResults(SelectResults results, String message) {
+    Object r;
+    Struct s;
+    LogWriterI18n logger = GemFireCacheImpl.getInstance().getLoggerI18n();
+    logger.fine(message);
+    int row = 0;
+    for (Iterator iter = results.iterator(); iter.hasNext(); ) {
+      r = iter.next();
+      row++;
+      if (r instanceof Struct) {
+         s = (Struct)r;
+         String[] fieldNames = ((Struct)r).getStructType().getFieldNames();
+         for (int i=0; i < fieldNames.length; i++){
+            logger.fine("### Row " + row  + "\n" + "Field: " +
+                fieldNames[i] + " > " + s.get(fieldNames[i]).toString());
+         }
+      } else {
+        logger.fine("#### Row " + row + "\n" + r);
+      }
+    }
+  }
+
+  protected void configAndStartBridgeServer() {
+    configAndStartBridgeServer(false, false, false, null); 
+  }
+
+  protected void configAndStartBridgeServer(boolean isPr, boolean isAccessor) {
+    configAndStartBridgeServer(false, false, false, null); 
+  }
+
+  protected void configAndStartBridgeServer(boolean isPr, boolean isAccessor,
+      boolean asyncIndex, Compressor compressor) {
+        AttributesFactory factory = new AttributesFactory();
+        if (isPr) {
+          PartitionAttributesFactory paf = new PartitionAttributesFactory();
+          //factory.setDataPolicy(DataPolicy.PARTITION);
+          if (isAccessor){
+            paf.setLocalMaxMemory(0);
+          }
+          PartitionAttributes prAttr = paf.setTotalNumBuckets(20).setRedundantCopies(0).create();
+          factory.setPartitionAttributes(prAttr);
+        } else {
+          factory.setScope(Scope.DISTRIBUTED_ACK);
+          factory.setDataPolicy(DataPolicy.REPLICATE);      
+        }
+        if (asyncIndex) {
+          factory.setIndexMaintenanceSynchronous(!asyncIndex);
+        }
+        if (compressor != null) {
+          factory.setCompressor(compressor);
+        }
+        
+        createRegion(this.regionName, this.rootRegionName, factory.create());
+        createRegion(this.regionName2, this.rootRegionName, factory.create());
+        
+        try {
+          startBridgeServer(0, false);
+        } catch (Exception ex) {
+          fail("While starting CacheServer", ex);
+        }
+      }
+
+  protected void executeCompiledQueries(String poolName, Object[][] params) {
+    SelectResults results = null;
+    Comparator comparator = null;
+    Object[] resultsArray = null;
+    QueryService qService = null;
+  
+    try {
+      qService = (PoolManager.find(poolName)).getQueryService();
+    } catch (Exception e) {
+      fail("Failed to get QueryService.", e);
+    }          
+  
+    for (int i=0; i < queryString.length; i++){
+      try {
+        getLogWriter().info("### Executing Query :" + queryString[i]);
+        Query query = qService.newQuery(queryString[i]);
+        results = (SelectResults)query.execute(params[i]);
+      } catch (Exception e) {
+        fail("Failed executing " + queryString[i], e);
+      }
+    }        
+  }
+
+  /**
+   * Starts a bridge server on the given port, using the given
+   * deserializeValues and notifyBySubscription to serve up the
+   * given region.
+   */
+  protected void startBridgeServer(int port, boolean notifyBySubscription)
+      throws IOException {
+      
+        Cache cache = getCache();
+        CacheServer bridge = cache.addCacheServer();
+        bridge.setPort(port);
+        bridge.setNotifyBySubscription(notifyBySubscription);
+        bridge.start();
+        bridgeServerPort = bridge.getPort();
+      }
+
+  /**
+   * Stops the bridge server that serves up the given cache.
+   */
+  protected void stopBridgeServer(Cache cache) {
+    CacheServer bridge =
+      (CacheServer) cache.getCacheServers().iterator().next();
+    bridge.stop();
+    assertFalse(bridge.isRunning());
+  }
+
+  public void closeClient(VM client) {
+    SerializableRunnable closeCache =
+      new CacheSerializableRunnable("Close Client") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Close Client. ###");
+        try {
+          closeCache();
+          disconnectFromDS();
+        } catch (Exception ex) {
+          getLogWriter().info("### Failed to get close client. ###");
+        }
+      }
+    };
+    
+    client.invoke(closeCache);
+  }
+
+  public static class TestObject2 implements PdxSerializable {
+    public int _id;
+    public static int numInstance = 0;
+    
+    public TestObject2(){
+      numInstance++;
+    }
+    
+    public TestObject2(int id){
+      this._id = id;
+      numInstance++;
+    }
+    
+    public int getId() {
+      return this._id;
+    }
+    
+    public void toData(PdxWriter out) {
+      out.writeInt("id", this._id);
+    }
+    
+    public void fromData(PdxReader in) {
+      this._id = in.readInt("id");
+    }
+    
+    @Override
+    public boolean equals(Object o){
+      getLogWriter().info("In TestObject2.equals() this: " + this + " other :" + o);
+      GemFireCacheImpl.getInstance().getLoggerI18n().fine("In TestObject2.equals() this: " + this + " other :" + o);
+      TestObject2 other = (TestObject2)o;
+      if (_id == other._id) {
+        return true;
+      } else {
+        getLogWriter().info("NOT EQUALS");  
+        return false;
+      }
+    }
+    
+    @Override
+    public int hashCode(){
+      GemFireCacheImpl.getInstance().getLoggerI18n().fine("In TestObject2.hashCode() : " + this._id);
+      return this._id;
+    }
+  }
+
+  public static class TestObject implements PdxSerializable {
+      public static LogWriter log;
+      protected String _ticker;
+      protected int _price;
+      public int id;
+      public int important;
+      public int selection;
+      public int select;
+      public static int numInstance = 0;
+      public Map idTickers = new HashMap();
+      public HashMap positions = new HashMap();
+      public TestObject2 test;
+      
+      public TestObject() {
+        if (log != null) {
+          log.info("TestObject ctor stack trace", new Exception());
+        }
+        numInstance++;
+        //GemFireCacheImpl.getInstance().getLoggerI18n().fine(new Exception("DEBUG"));
+      }
+  
+      public TestObject(int id, String ticker) {
+        if (log != null) {
+          log.info("TestObject ctor stack trace", new Exception());
+        }
+        this.id = id;
+        this._ticker = ticker;
+        this._price = id;
+        this.important = id;
+        this.selection =id;
+        this.select =id;
+        //GemFireCacheImpl.getInstance().getLoggerI18n().fine(new Exception("DEBUG"));
+        numInstance++;
+        idTickers.put(id + "", ticker);
+        this.test = new TestObject2(id);
+      }
+  
+      public TestObject(int id, String ticker, int numPositions) {
+        this(id, ticker);
+        for (int i=0; i < numPositions; i++) {
+          positions.put(id + i, new PositionPdx(ticker + ":" +  id + ":" + i , (id + 100)));
+        }
+      }
+      
+      public int getIdValue() {
+        return this.id;
+      }
+  
+      public String getTicker() {
+        return this._ticker;
+      }
+  
+      public int getPriceValue() {
+        return this._price;
+      }
+  
+      public HashMap getPositions(String id) {
+        return this.positions;  
+      }
+  
+      public String getStatus(){
+        return (id % 2 == 0) ? "active" : "inactive";
+      }
+  
+      public void toData(PdxWriter out)
+      {
+        //System.out.println("Is serializing in WAN: " + GatewayEventImpl.isSerializingValue());
+        out.writeInt("id", this.id);
+        out.writeString("ticker", this._ticker);
+        out.writeInt("price", this._price);
+        out.writeObject("idTickers", this.idTickers);
+        out.writeObject("positions", this.positions);
+        out.writeObject("test", this.test);
+      }
+  
+      public void fromData(PdxReader in)
+      {
+        //System.out.println("Is deserializing in WAN: " + GatewayEventImpl.isDeserializingValue());
+        this.id = in.readInt("id");
+        this._ticker = in.readString("ticker");
+        this._price = in.readInt("price");
+        this.idTickers = (Map)in.readObject("idTickers");
+        this.positions = (HashMap)in.readObject("positions");
+        this.test = (TestObject2)in.readObject("test");
+      }
+  
+      public String toString() {
+        StringBuffer buffer = new StringBuffer();
+        buffer
+        .append("TestObject [")
+        .append("id=")
+        .append(this.id)
+        .append("; ticker=")
+        .append(this._ticker)
+        .append("; price=")
+        .append(this._price)
+        .append("]");
+        return buffer.toString();
+      }
+  
+      @Override
+      public boolean equals(Object o){
+  //      getLogWriter().info("In TestObject.equals() this: " + this + " other :" + o);
+  //      GemFireCacheImpl.getInstance().getLoggerI18n().fine("In TestObject.equals() this: " + this + " other :" + o);
+        TestObject other = (TestObject)o;
+        if ((id == other.id) && (_ticker.equals(other._ticker))) {
+          return true;
+        } else {
+  //        getLogWriter().info("NOT EQUALS");  
+          return false;
+        }
+      }
+      
+      @Override
+      public int hashCode(){
+        GemFireCacheImpl.getInstance().getLoggerI18n().fine("In TestObject.hashCode() : " + this.id);
+        return this.id;
+      }
+  
+    }
+
+  /**
+   * Starts a bridge server on the given port, using the given
+   * deserializeValues and notifyBySubscription to serve up the
+   * given region.
+   */
+  protected void startCacheServer(int port, boolean notifyBySubscription)
+      throws IOException {
+      
+        Cache cache = CacheFactory.getAnyInstance();
+        CacheServer bridge = cache.addCacheServer();
+        bridge.setPort(port);
+        bridge.setNotifyBySubscription(notifyBySubscription);
+        bridge.start();
+        bridgeServerPort = bridge.getPort();
+      }
+
+  public PdxQueryCQTestBase(String name) {
+    super(name);
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
new file mode 100644
index 0000000..fa4f610
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
@@ -0,0 +1,814 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+/**
+ * 
+ */
+package com.gemstone.gemfire.cache.query.dunit;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import com.gemstone.gemfire.cache.AttributesFactory;
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.MirrorType;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.Scope;
+import com.gemstone.gemfire.cache.client.PoolFactory;
+import com.gemstone.gemfire.cache.client.PoolManager;
+import com.gemstone.gemfire.cache.query.Index;
+import com.gemstone.gemfire.cache.query.Query;
+import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.cache.query.SelectResults;
+import com.gemstone.gemfire.cache.query.cq.dunit.CqQueryUsingPoolDUnitTest;
+import com.gemstone.gemfire.cache.query.data.Portfolio;
+import com.gemstone.gemfire.cache.query.internal.QueryObserverAdapter;
+import com.gemstone.gemfire.cache.query.internal.QueryObserverHolder;
+import com.gemstone.gemfire.cache.server.CacheServer;
+import com.gemstone.gemfire.cache30.ClientServerTestCase;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.cache30.CacheTestCase;
+import com.gemstone.gemfire.cache30.CertifiableTestCacheListener;
+
+import dunit.Host;
+import dunit.SerializableRunnable;
+import dunit.VM;
+
+/**
+ * This class tests register interest behavior on client at startup given that
+ * client has already created a Index on region on which it registers interest.
+ * Then client run a query on region in local cache (Not on server) using the
+ * Index.
+ * 
+ * @author shoagarwal
+ *
+ */
+public class QueryIndexUpdateRIDUnitTest extends CacheTestCase{
+
+  /** The port on which the bridge server was started in this VM */
+  private static int bridgeServerPort;
+  
+  private String region = "regionA";
+  private final int KEYS = 1;
+  private final int REGEX = 2;
+
+  private String rootQ = "SELECT ALL * FROM /root p where p.ID > 0";
+  private String incompleteQ = "SELECT ALL * FROM /root/"+region+" p where "; //User needs to append where cond.
+  
+  static public final String KEY = "key-";
+  static public final String REGULAR_EXPRESSION = ".*1+?.*";
+
+  private static final String ROOT = "root";
+  
+  public QueryIndexUpdateRIDUnitTest(String name) {
+    super(name);
+  }
+
+  /* Test creates 1 Client and 1 Server. Client and Server create same region in their cache.
+   * Client creates index and registers interest in region on server and runs a query.
+   * Query must fail as registerInterest does not update indexes on client.
+   */
+
+  public void testClientIndexUpdateWithRIOnKeys() throws Exception{
+    
+    CqQueryUsingPoolDUnitTest cqDUnitTest = new CqQueryUsingPoolDUnitTest("CqRegisterInterestIndexUpdateDunitTest");
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+
+    this.createServer(server, 0, false);
+
+    final int port = server.invokeInt(QueryIndexUpdateRIDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+
+    // Init values at server. 
+    final int size = 10;
+    this.createValues(server, cqDUnitTest.regions[0], size);
+
+    String poolName = "testClientIndexUpdateWithRegisterInterest";
+    cqDUnitTest.createPool(client, poolName, host0, port);
+    
+    // Create client.
+    cqDUnitTest.createClient(client, port, host0);
+    //Create Index on client
+    cqDUnitTest.createFunctionalIndex(client, "IdIndex", "p.ID", "/root/regionA p");
+
+    //Register Interest in all Keys on server 
+    this.registerInterestList(client, cqDUnitTest.regions[0], 4, KEYS);
+
+    //Wait for Index to get updated.
+    pause(5 * 1000);
+
+    //This query execution should fail as it will run on client index and index are not updated just by registerInterest.
+    //Validate query results.
+    this.validateQueryOnIndex(client, cqDUnitTest.cqs[0], 4);
+
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server);
+  }
+
+  /**
+   * Tests overlap keys between client region and server region to verify the server region values are synched
+   * with client region on register interest.
+   * @throws Exception
+   */
+  public void testClientIndexUpdateWithRIOnOverlapKeys() throws Exception{
+    
+    CqQueryUsingPoolDUnitTest cqDUnitTest = new CqQueryUsingPoolDUnitTest("CqRegisterInterestIndexUpdateDunitTest");
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+
+    this.createServer(server, 0, false);
+
+    final int port = server.invokeInt(QueryIndexUpdateRIDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+
+    String poolName = "testClientIndexUpdateWithRegisterInterest";
+    cqDUnitTest.createPool(client, poolName, host0, port);
+    
+    // Create client.
+    cqDUnitTest.createClient(client, port, host0);
+    //Create Index on client
+    cqDUnitTest.createFunctionalIndex(client, "IdIndex", "p.ID", "/root/regionA p");
+
+    final int size = 10;
+    // Init values at client
+    this.createValues(client, cqDUnitTest.regions[0], size, 1);
+
+    //wait for index to get updated.
+    pause(5 * 1000);
+    //this.validateQueryOnIndex(client, incompleteQ+"p.getID() > 0", 10);
+    
+    this.validateQueryOnIndex(client, incompleteQ+"p.ID > 0", 10);
+
+    // Init values at server.
+    this.createValues(server, cqDUnitTest.regions[0], size, 4 /*start index*/);
+
+    //Register Interest in all Keys on server 
+    this.registerInterestList(client, cqDUnitTest.regions[0], size, KEYS, 4 /*start index*/);
+
+    //Wait for Index to get updated.
+    pause(5 * 1000);
+
+    //This query execution should fail as it will run on client index and index are not updated just by registerInterest.
+    //Validate query results.
+    this.validateQueryOnIndex(client, incompleteQ+"p.ID < "+ 4*4, 3);
+    this.validateQueryOnIndex(client, incompleteQ+"p.ID >= 16", 7);
+
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server);
+  }
+
+  public void testClientIndexUpdateWithRIOnRegion() throws Exception{
+    
+    CqQueryUsingPoolDUnitTest cqDUnitTest = new CqQueryUsingPoolDUnitTest("CqRegisterInterestIndexUpdateDunitTest");
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+
+    this.createServer(server, 0, false);
+
+    final int port = server.invokeInt(QueryIndexUpdateRIDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+
+    //Init values at server. 
+    final int size = 10;
+    this.createValues(server, cqDUnitTest.regions[0], size);
+
+    String poolName = "testClientIndexUpdateWithRegisterInterest";
+    cqDUnitTest.createPool(client, poolName, host0, port);
+    
+    // Create client.
+    cqDUnitTest.createClient(client, port, host0);
+    //Create Index on client
+    cqDUnitTest.createFunctionalIndex(client, "IdIndex", "p.ID", "/root/regionA p");
+
+    //Register Interest in all Keys on server 
+    cqDUnitTest.registerInterestListCQ(client, cqDUnitTest.regions[0], size, true);
+
+    //Wait for Index to get updated.
+    pause(5 * 1000);
+
+    //This query execution should fail as it will run on client index and index are not updated just by registerInterest.
+    //Validate query results.
+    this.validateQueryOnIndex(client, cqDUnitTest.cqs[0], size);
+
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server);
+  }
+
+  public void testClientIndexUpdateWithRIOnRegEx() throws Exception{
+    
+    CqQueryUsingPoolDUnitTest cqDUnitTest = new CqQueryUsingPoolDUnitTest("QueryIndexUpdateRIDunitTest");
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+
+    this.createServer(server, 0, false);
+
+    final int port = server.invokeInt(QueryIndexUpdateRIDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+
+    //Init values at server. 
+    final int size = 10;
+    this.createValues(server, cqDUnitTest.regions[0], size);
+
+    String poolName = "testClientIndexUpdateWithRegisterInterest";
+    cqDUnitTest.createPool(client, poolName, host0, port);
+    
+    // Create client.
+    cqDUnitTest.createClient(client, port, host0);
+    //Create Index on client
+    cqDUnitTest.createFunctionalIndex(client, "IdIndex", "p.ID", "/root/regionA p");
+
+    //Register Interest in all Keys on server 
+    this.registerInterestList(client, cqDUnitTest.regions[0], 2, REGEX);
+
+    //Wait for Index to get updated.
+    pause(5 * 1000);
+
+    //This query execution should fail as it will run on client index and index are not updated just by registerInterest.
+    //Validate query results.
+    this.validateQueryOnIndex(client, cqDUnitTest.cqs[0], 2);
+
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server);
+  }
+
+  /**
+   * This test tests the RegionClearedException Path in AbsractRegionMap while doing
+   * initialImagePut() during registerInterest on client.
+   * 
+   * @throws Exception
+   */
+  public void testClientIndexUpdateWithRIOnClearedRegion() throws Exception{
+    
+    CqQueryUsingPoolDUnitTest cqDUnitTest = new CqQueryUsingPoolDUnitTest("QueryIndexUpdateRIDunitTest");
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+
+    this.createServer(server, 0, false);
+
+    final int port = server.invokeInt(QueryIndexUpdateRIDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+
+    //Init values at server. 
+    final int size = 1000;
+    this.createValues(server, cqDUnitTest.regions[0], size);
+
+    String poolName = "testClientIndexUpdateWithRegisterInterest";
+    cqDUnitTest.createPool(client, poolName, host0, port);
+    
+    // Create client.
+    cqDUnitTest.createClient(client, port, host0);
+    //Create Index on client
+    cqDUnitTest.createFunctionalIndex(client, "IdIndex", "p.ID", "/root/regionA p");
+
+    //Create entries on client to clear region later
+    this.createValues(client, cqDUnitTest.regions[0], size);
+
+    //Register Interest in all Keys on server 
+    //client.invoke(this.getSRRegisterInterestList(cqDUnitTest.regions[0], size, -1 /* Default ALL KEYS */, 0));
+    //this.asyncRegisterInterestList(client, cqDUnitTest.regions[0], size, -1 /* Default ALL KEYS */, 0);
+    registerInterestList(client, cqDUnitTest.regions[0], size, -1);
+    
+    //Wait for Index to get updated.
+    //pause(500);
+    
+    //Start clearing region on client asynchronously.
+    //this.asyncClearRegion(client, cqDUnitTest.regions[0]);
+    client.invoke(this.getSRClearRegion(cqDUnitTest.regions[0]));
+    
+   //Let register interest finish during region clearance
+    //pause(5*1000);
+    
+    //This query execution should fail as it will run on client index and region has been cleared.
+    //Validate query results.
+    this.validateQueryOnIndexWithRegion(client, cqDUnitTest.cqs[0], 0, region);
+
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server);
+  }
+
+  /* 
+   * Same tests as above using Partitioned Regions. 
+   */
+
+  public void testClientIndexUpdateWithRIOnPRRegion() throws Exception{
+    
+    CqQueryUsingPoolDUnitTest cqDUnitTest = new CqQueryUsingPoolDUnitTest("QueryIndexUpdateRIDunitTest");
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+
+    this.createServer(server, 0, true);
+
+    final int port = server.invokeInt(QueryIndexUpdateRIDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+
+    // Init values at server. 
+    final int size = 10;
+    this.createValues(server, ROOT, size);
+
+    String poolName = "testClientIndexUpdateWithRegisterInterest";
+    cqDUnitTest.createPool(client, poolName, host0, port);
+    
+    // Create client.
+    this.createClient(client, port, host0);
+    //Create Index on client
+    cqDUnitTest.createFunctionalIndex(client, "IdIndex", "p.ID", "/root p");
+
+    //Register Interest in all Keys on server 
+    this.registerInterestList(client, ROOT, size, 0);
+
+    //Wait for Index to get updated.
+    pause(5 * 1000);
+
+    //This query execution should fail as it will run on client index and index are not updated just by registerInterest.
+    //Validate query results.
+    this.validateQueryOnIndex(client, this.rootQ, size);
+
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server);
+  }
+
+  public void testClientIndexUpdateWithRIOnPRKeys() throws Exception{
+    
+    CqQueryUsingPoolDUnitTest cqDUnitTest = new CqQueryUsingPoolDUnitTest("QueryIndexUpdateRIDunitTest");
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+
+    this.createServer(server, 0, true);
+
+    final int port = server.invokeInt(QueryIndexUpdateRIDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+
+    // Init values at server. 
+    final int size = 10;
+    this.createValues(server, ROOT, size);
+
+    String poolName = "testClientIndexUpdateWithRegisterInterest";
+    cqDUnitTest.createPool(client, poolName, host0, port);
+    
+    // Create client.
+    this.createClient(client, port, host0);
+    //Create Index on client
+    cqDUnitTest.createFunctionalIndex(client, "IdIndex", "p.ID", "/root p");
+
+    //Register Interest in all Keys on server 
+    this.registerInterestList(client, ROOT, 4, KEYS);
+
+    //Wait for Index to get updated.
+    pause(5 * 1000);
+
+    //This query execution should fail as it will run on client index and index are not updated just by registerInterest.
+    //Validate query results.
+    this.validateQueryOnIndex(client, this.rootQ, 4);
+
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server);
+  }
+
+  public void testClientIndexUpdateWithRIOnPRRegEx() throws Exception{
+    
+    CqQueryUsingPoolDUnitTest cqDUnitTest = new CqQueryUsingPoolDUnitTest("QueryIndexUpdateRIDunitTest");
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+
+    this.createServer(server, 0, true);
+
+    final int port = server.invokeInt(QueryIndexUpdateRIDUnitTest.class,
+        "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+
+    // Init values at server. 
+    final int size = 10;
+    this.createValues(server, ROOT, size);
+
+    String poolName = "testClientIndexUpdateWithRegisterInterest";
+    cqDUnitTest.createPool(client, poolName, host0, port);
+    
+    // Create client.
+    this.createClient(client, port, host0);
+    //Create Index on client
+    cqDUnitTest.createFunctionalIndex(client, "IdIndex", "p.ID", "/root p");
+
+    //Register Interest in all Keys on server 
+    this.registerInterestList(client, "root", 2, REGEX);
+
+    //Wait for Index to get updated.
+    pause(5 * 1000);
+
+    //This query execution should fail as it will run on client index and index are not updated just by registerInterest.
+    //Validate query results.
+    this.validateQueryOnIndex(client, this.rootQ, 2);
+
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server);
+  }
+
+  /* Register Interest on data on server */
+  public void registerInterestList(VM vm, final String regionName, final int keySize, final int policy) {
+    registerInterestList(vm, regionName, keySize, policy, 0);    
+  }
+
+  /* Register Interest on data on server */
+  public void registerInterestList(VM vm, final String regionName, final int keySize, final int policy, final int start) {
+    vm.invoke(new CacheSerializableRunnable("Register InterestList") {
+      public void run2() throws CacheException {
+        
+        // Get Query Service.
+        Region region = null;
+        try {
+          if("root".equals(regionName)){
+            region = getRootRegion();
+          } else {
+            region = getRootRegion().getSubregion(regionName);
+          }
+          region.getAttributesMutator().setCacheListener(new CertifiableTestCacheListener(getLogWriter()));
+        } catch (Exception cqe) {
+          AssertionError err = new AssertionError("Failed to get Region.");
+          err.initCause(cqe);
+          throw err;
+        }
+        try {
+          switch (policy) {
+            case REGEX:
+              region.registerInterestRegex(REGULAR_EXPRESSION);
+              break;
+            case KEYS:
+              List list = new ArrayList();
+              for (int i = start != 0 ? start : 1; i <= keySize; i++) {
+                list.add(KEY+i);
+              }
+              region.registerInterest(list);
+              break;
+            default:
+              region.registerInterest("ALL_KEYS");
+          }
+        } catch (Exception ex) {
+          AssertionError err = new AssertionError("Failed to Register InterestList");
+          err.initCause(ex);
+          throw err;
+        }
+      }
+    });   
+  }
+
+  /* Register Interest on data on server */
+  public void asyncRegisterInterestList(VM vm, final String regionName, final int keySize, final int policy, final int start) {
+    vm.invokeAsync(new CacheSerializableRunnable("Register InterestList") {
+      public void run2() throws CacheException {
+        
+        // Get Query Service.
+        Region region = null;
+        try {
+          if("root".equals(regionName)){
+            region = getRootRegion();
+          } else {
+            region = getRootRegion().getSubregion(regionName);
+          }
+          region.getAttributesMutator().setCacheListener(new CertifiableTestCacheListener(getLogWriter()));
+        } catch (Exception cqe) {
+          AssertionError err = new AssertionError("Failed to get Region.");
+          err.initCause(cqe);
+          throw err;
+        }
+        try {
+          switch (policy) {
+            case REGEX:
+              region.registerInterestRegex(REGULAR_EXPRESSION);
+              break;
+            case KEYS:
+              List list = new ArrayList();
+              for (int i = start != 0 ? start : 1; i <= keySize; i++) {
+                list.add(KEY+i);
+              }
+              region.registerInterest(list);
+              break;
+            default:
+              region.registerInterest("ALL_KEYS");
+          }
+        } catch (Exception ex) {
+          AssertionError err = new AssertionError("Failed to Register InterestList");
+          err.initCause(ex);
+          throw err;
+        }
+      }
+    });   
+  }
+
+  public void createServer(VM server, final int thePort, final boolean partitioned)
+  {
+    SerializableRunnable createServer = new CacheSerializableRunnable(
+        "Create Cache Server") {
+      public void run2() throws CacheException
+      {
+        getLogWriter().info("### Create Cache Server. ###");
+        AttributesFactory factory = new AttributesFactory();
+        factory.setMirrorType(MirrorType.KEYS_VALUES);
+
+        // setting the eviction attributes.
+        if (partitioned) {
+          factory.setDataPolicy(DataPolicy.PARTITION);
+          createRootRegion(factory.createRegionAttributes());
+        } else {
+          factory.setScope(Scope.DISTRIBUTED_ACK);
+          createRegion(region, factory.createRegionAttributes());
+        }
+
+        
+        
+        pause(2000);
+
+        try {
+          startBridgeServer(thePort, true);
+        }
+
+        catch (Exception ex) {
+          fail("While starting CacheServer", ex);
+        }
+        pause(2000);
+        
+      }
+    };
+
+    server.invoke(createServer);
+  }
+
+  /**
+   * Starts a bridge server on the given port, using the given
+   * deserializeValues and notifyBySubscription to serve up the
+   * given region.
+   *
+   * @since 6.6
+   */
+  public void startBridgeServer(int port, boolean notifyBySubscription)
+  throws IOException {
+    
+    Cache cache = getCache();
+    CacheServer bridge = cache.addCacheServer();
+    bridge.setPort(port);
+    bridge.setNotifyBySubscription(notifyBySubscription);
+    bridge.start();
+    bridgeServerPort = bridge.getPort();
+  }
+
+  /* Create Init values */
+  public void createValues(VM vm, final String regionName, final int size) {
+    createValues(vm, regionName, size, 0);
+  }
+
+
+  /**
+   * Creates Init Values. start specifies the start index from which key no would start.
+   * @param vm
+   * @param regionName
+   * @param size
+   * @param start
+   */
+  public void createValues(VM vm, final String regionName, final int size, final int start) {
+    vm.invoke(new CacheSerializableRunnable("Create values") {
+      public void run2() throws CacheException {
+        Region region1;
+        if(!"root".equals(regionName)){
+          region1 = getRootRegion().getSubregion(regionName);
+        } else {
+          region1 = getRootRegion();
+        }
+        for (int i = ((start != 0) ? start : 1); i <= size; i++) {
+//          getLogWriter().info("### puting '"+KEY+i+"' in region " + region1);
+          region1.put(KEY+i, new Portfolio((start != 0 ? start : 1) * i, i));
+        }
+        getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
+      }
+    });
+  }
+
+  /* Returns Cache Server Port */
+  static int getCacheServerPort() {
+    return bridgeServerPort;
+  }
+
+  /* Create Client */
+  public void createClient(VM client, final int serverPort, final String serverHost) {
+    int[] serverPorts = new int[] {serverPort};
+    createClient(client, serverPorts, serverHost, null, null); 
+  }
+
+  /* Create Client */
+  public void createClient(VM client, final int[] serverPorts, final String serverHost, final String redundancyLevel, 
+      final String poolName) {
+    SerializableRunnable createQService =
+      new CacheSerializableRunnable("Create Client") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Create Client. ###");
+        //Region region1 = null;
+        // Initialize CQ Service.
+        try {
+          getCache().getQueryService();
+        } catch (Exception cqe) {
+          fail("Failed to getCQService.", cqe);
+        }
+        
+        AttributesFactory regionFactory = new AttributesFactory();
+        regionFactory.setScope(Scope.LOCAL);
+        
+        if (poolName != null) {
+          regionFactory.setPoolName(poolName);
+        } else {
+          if (redundancyLevel != null){
+            ClientServerTestCase.configureConnectionPool(regionFactory, serverHost, serverPorts, true, Integer.parseInt(redundancyLevel), -1, null);
+          } else {
+            ClientServerTestCase.configureConnectionPool(regionFactory, serverHost,serverPorts, true, -1, -1, null);
+          }
+        }
+               
+          createRootRegion(regionFactory.createRegionAttributes());
+          getLogWriter().info("### Successfully Created Root Region on Client");
+      }
+    };
+    
+    client.invoke(createQService);
+  }
+
+  public void validateQueryOnIndex(VM vm, final String query, final int resultSize) {
+    validateQueryOnIndexWithRegion(vm, query, resultSize, null);
+  }
+
+  /**
+   * Validates a query result with client region values if region is not null, otherwise verifies the size only.
+   * @param vm
+   * @param query
+   * @param resultSize
+   * @param region
+   */
+  public void validateQueryOnIndexWithRegion(VM vm, final String query, final int resultSize, final String region) {
+    vm.invoke(new CacheSerializableRunnable("Validate Query") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Validating Query. ###");
+        QueryService qs = getCache().getQueryService();
+        
+        Query q = qs.newQuery(query);
+        //Set the index observer
+        QueryObserverImpl observer = new QueryObserverImpl();
+        QueryObserverHolder.setInstance(observer);
+        try {
+          Object r = q.execute();
+          if(r instanceof SelectResults){
+            int rSize = ((SelectResults)r).asSet().size();
+            getLogWriter().info("### Result Size is :" + rSize);
+            
+            if(region == null) {
+              assertEquals(resultSize, rSize);
+            } else {
+              Region reg;
+              if(region != null && (reg = getCache().getRegion("/root/"+region)) != null) {
+                assertEquals(rSize, reg.size());
+                for (Object value : reg.values()) {
+                  if(!((SelectResults)r).asSet().contains((Portfolio)value)){
+                    fail("Query resultset mismatch with region values for value: " + value);
+                  }                
+                }
+              }
+            }
+          }
+        }
+        catch (Exception e) {
+          fail("Failed to execute the query.", e);
+        }
+        if(!observer.isIndexesUsed) {
+          fail("Index not used for query");
+        }
+      }
+    });
+  }
+
+  public void asyncClearRegion(VM vm, final String regionName){
+    vm.invokeAsync(new CacheSerializableRunnable("Destroy entries") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Clearing Region. ###");
+        Region region1;
+        if(!"root".equals(regionName)){
+          region1 = getRootRegion().getSubregion(regionName);
+        } else {
+          region1 = getRootRegion();
+        }
+        region1.clear();
+        getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
+      }
+    });
+  }
+
+  private SerializableRunnable getSRClearRegion(final String regionName) {
+    SerializableRunnable sr = new CacheSerializableRunnable("Destroy entries") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Clearing Region. ###");
+        Region region1;
+        if(!"root".equals(regionName)){
+          region1 = getRootRegion().getSubregion(regionName);
+        } else {
+          region1 = getRootRegion();
+        }
+        region1.clear();
+        getLogWriter().info("### Number of Entries in Region :" + region1.keys().size());
+      }
+    };
+    return sr;
+  }
+
+  private SerializableRunnable getSRRegisterInterestList(final String regionName, 
+      final int keySize, final int policy, final int start) {
+    SerializableRunnable sr = new CacheSerializableRunnable("Register InterestList") {
+      public void run2() throws CacheException {
+        
+        // Get Query Service.
+        Region region = null;
+        try {
+          if("root".equals(regionName)){
+            region = getRootRegion();
+          } else {
+            region = getRootRegion().getSubregion(regionName);
+          }
+          region.getAttributesMutator().setCacheListener(new CertifiableTestCacheListener(getLogWriter()));
+        } catch (Exception cqe) {
+          AssertionError err = new AssertionError("Failed to get Region.");
+          err.initCause(cqe);
+          throw err;
+        }
+        try {
+          switch (policy) {
+            case REGEX:
+              region.registerInterestRegex(REGULAR_EXPRESSION);
+              break;
+            case KEYS:
+              List list = new ArrayList();
+              for (int i = start != 0 ? start : 1; i <= keySize; i++) {
+                list.add(KEY+i);
+              }
+              region.registerInterest(list);
+              break;
+            default:
+              region.registerInterest("ALL_KEYS");
+          }
+        } catch (Exception ex) {
+          AssertionError err = new AssertionError("Failed to Register InterestList");
+          err.initCause(ex);
+          throw err;
+        }
+      }
+    };    
+   return sr;
+  }
+
+  public static class QueryObserverImpl extends QueryObserverAdapter {
+    boolean isIndexesUsed = false;
+    ArrayList indexesUsed = new ArrayList();
+
+    public void beforeIndexLookup(Index index, int oper, Object key) {
+      indexesUsed.add(index.getName());
+    }
+
+    public void afterIndexLookup(Collection results) {
+      if (results != null) {
+        isIndexesUsed = true;
+      }
+    }
+  }
+
+}


[69/70] incubator-geode git commit: Merge remote-tracking branch 'origin/wan_cq_donation' into develop

Posted by up...@apache.org.
Merge remote-tracking branch 'origin/wan_cq_donation' into develop


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/46ae4ef5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/46ae4ef5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/46ae4ef5

Branch: refs/heads/develop
Commit: 46ae4ef56d3548de033d3e20ff1e786520528b28
Parents: c01506b 441c29c
Author: Dan Smith <up...@apache.org>
Authored: Thu Jan 28 09:56:14 2016 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Thu Jan 28 09:56:14 2016 -0800

----------------------------------------------------------------------
 gemfire-assembly/build.gradle                   |   10 +
 gemfire-cq/build.gradle                         |   22 +
 .../cache/client/internal/CloseCQOp.java        |   72 +
 .../cache/client/internal/CreateCQOp.java       |  163 +
 .../cache/client/internal/CreateCQWithIROp.java |   92 +
 .../cache/client/internal/GetDurableCQsOp.java  |  135 +
 .../client/internal/ServerCQProxyImpl.java      |  111 +
 .../gemfire/cache/client/internal/StopCQOp.java |   72 +
 .../cache/query/internal/cq/ClientCQImpl.java   |  615 +++
 .../internal/cq/CqAttributesMutatorImpl.java    |   68 +
 .../cache/query/internal/cq/CqConflatable.java  |  223 +
 .../cache/query/internal/cq/CqEventImpl.java    |  162 +
 .../cache/query/internal/cq/CqListenerImpl.java |   56 +
 .../cache/query/internal/cq/CqQueryImpl.java    |  383 ++
 .../query/internal/cq/CqServiceFactoryImpl.java |   69 +
 .../cache/query/internal/cq/CqServiceImpl.java  | 2087 +++++++
 .../internal/cq/CqServiceStatisticsImpl.java    |  100 +
 .../query/internal/cq/CqServiceVsdStats.java    |  411 ++
 .../query/internal/cq/CqStatisticsImpl.java     |   75 +
 .../cache/query/internal/cq/ServerCQImpl.java   |  655 +++
 .../tier/sockets/command/BaseCQCommand.java     |   59 +
 .../cache/tier/sockets/command/CloseCQ.java     |  131 +
 .../cache/tier/sockets/command/ExecuteCQ.java   |  168 +
 .../cache/tier/sockets/command/ExecuteCQ61.java |  220 +
 .../cache/tier/sockets/command/GetCQStats.java  |  100 +
 .../tier/sockets/command/GetDurableCQs.java     |  143 +
 .../cache/tier/sockets/command/MonitorCQ.java   |  100 +
 .../cache/tier/sockets/command/StopCQ.java      |  135 +
 ...cache.query.internal.cq.spi.CqServiceFactory |   15 +
 .../gemfire/cache/query/cq/CQJUnitTest.java     |  150 +
 .../cache/query/cq/dunit/CqDataDUnitTest.java   | 1162 ++++
 .../dunit/CqDataOptimizedExecuteDUnitTest.java  |   54 +
 .../cq/dunit/CqDataUsingPoolDUnitTest.java      | 1567 ++++++
 ...qDataUsingPoolOptimizedExecuteDUnitTest.java |   53 +
 .../cache/query/cq/dunit/CqPerfDUnitTest.java   | 1044 ++++
 .../cq/dunit/CqPerfUsingPoolDUnitTest.java      | 1004 ++++
 .../cache/query/cq/dunit/CqQueryDUnitTest.java  | 4004 ++++++++++++++
 .../dunit/CqQueryOptimizedExecuteDUnitTest.java |  311 ++
 .../cq/dunit/CqQueryUsingPoolDUnitTest.java     | 3322 +++++++++++
 ...QueryUsingPoolOptimizedExecuteDUnitTest.java |   50 +
 .../cq/dunit/CqResultSetUsingPoolDUnitTest.java | 1139 ++++
 ...ltSetUsingPoolOptimizedExecuteDUnitTest.java |  231 +
 .../cache/query/cq/dunit/CqStateDUnitTest.java  |  134 +
 .../cache/query/cq/dunit/CqStatsDUnitTest.java  |  441 ++
 .../dunit/CqStatsOptimizedExecuteDUnitTest.java |   51 +
 .../cq/dunit/CqStatsUsingPoolDUnitTest.java     |  452 ++
 ...StatsUsingPoolOptimizedExecuteDUnitTest.java |   51 +
 .../query/cq/dunit/CqTimeTestListener.java      |  266 +
 .../PartitionedRegionCqQueryDUnitTest.java      | 1788 ++++++
 ...dRegionCqQueryOptimizedExecuteDUnitTest.java |  246 +
 .../query/cq/dunit/PrCqUsingPoolDUnitTest.java  | 2029 +++++++
 .../PrCqUsingPoolOptimizedExecuteDUnitTest.java |   50 +
 .../cache/query/dunit/PdxQueryCQDUnitTest.java  |  702 +++
 .../cache/query/dunit/PdxQueryCQTestBase.java   |  494 ++
 .../dunit/QueryIndexUpdateRIDUnitTest.java      |  819 +++
 .../query/dunit/QueryMonitorDUnitTest.java      | 1296 +++++
 .../cache/snapshot/ClientSnapshotDUnitTest.java |  284 +
 .../AnalyzeCQSerializablesJUnitTest.java        |   79 +
 .../cache/PRDeltaPropagationDUnitTest.java      | 1212 ++++
 .../internal/cache/PutAllCSDUnitTest.java       | 4419 +++++++++++++++
 .../cache/RemoteCQTransactionDUnitTest.java     | 1121 ++++
 .../internal/cache/ha/CQListGIIDUnitTest.java   |  820 +++
 .../cache/ha/HADispatcherDUnitTest.java         |  695 +++
 .../sockets/ClientToServerDeltaDUnitTest.java   | 1037 ++++
 .../DeltaPropagationWithCQDUnitTest.java        |  341 ++
 ...ToRegionRelationCQRegistrationDUnitTest.java |  786 +++
 .../sockets/DurableClientCrashDUnitTest.java    |   99 +
 .../sockets/DurableClientNetDownDUnitTest.java  |   80 +
 .../sockets/DurableClientSimpleDUnitTest.java   | 3404 ++++++++++++
 .../tier/sockets/DurableClientTestCase.java     | 2089 +++++++
 .../CacheServerManagementDUnitTest.java         |  571 ++
 .../cli/commands/ClientCommandsDUnitTest.java   | 1443 +++++
 .../DurableClientCommandsDUnitTest.java         |  433 ++
 .../internal/pulse/TestCQDUnitTest.java         |  147 +
 .../internal/pulse/TestClientsDUnitTest.java    |  108 +
 .../internal/pulse/TestServerDUnitTest.java     |   99 +
 .../ClientAuthorizationTwoDUnitTest.java        |  245 +
 .../security/ClientAuthzObjectModDUnitTest.java |  416 ++
 .../ClientCQPostAuthorizationDUnitTest.java     |  522 ++
 .../ClientPostAuthorizationDUnitTest.java       |  398 ++
 .../gemfire/security/MultiuserAPIDUnitTest.java |  391 ++
 .../MultiuserDurableCQAuthzDUnitTest.java       |  489 ++
 .../gemfire/codeAnalysis/excludedClasses.txt    |    2 +
 .../gemstone/gemfire/codeAnalysis/openBugs.txt  |   21 +
 .../sanctionedDataSerializables.txt             |    4 +
 .../codeAnalysis/sanctionedSerializables.txt    |    1 +
 .../tier/sockets/durablecq-client-cache.xml     |   37 +
 .../tier/sockets/durablecq-server-cache.xml     |   32 +
 gemfire-wan/build.gradle                        |   22 +
 .../client/internal/GatewaySenderBatchOp.java   |  313 ++
 .../cache/client/internal/SenderProxy.java      |   43 +
 .../internal/locator/wan/LocatorDiscovery.java  |  227 +
 .../internal/locator/wan/LocatorHelper.java     |  143 +
 .../locator/wan/LocatorJoinMessage.java         |  105 +
 .../wan/LocatorMembershipListenerImpl.java      |  230 +
 .../locator/wan/RemoteLocatorJoinRequest.java   |   87 +
 .../locator/wan/RemoteLocatorJoinResponse.java  |   89 +
 .../locator/wan/RemoteLocatorPingRequest.java   |   56 +
 .../locator/wan/RemoteLocatorPingResponse.java  |   55 +
 .../locator/wan/RemoteLocatorRequest.java       |   66 +
 .../locator/wan/RemoteLocatorResponse.java      |   74 +
 .../internal/locator/wan/WANFactoryImpl.java    |   74 +
 .../locator/wan/WanLocatorDiscovererImpl.java   |  138 +
 .../cache/wan/AbstractRemoteGatewaySender.java  |  169 +
 .../cache/wan/GatewayReceiverFactoryImpl.java   |  147 +
 .../internal/cache/wan/GatewayReceiverImpl.java |  253 +
 .../wan/GatewaySenderEventRemoteDispatcher.java |  767 +++
 .../cache/wan/GatewaySenderFactoryImpl.java     |  389 ++
 .../wan/parallel/ParallelGatewaySenderImpl.java |  267 +
 ...rentParallelGatewaySenderEventProcessor.java |   67 +
 ...moteParallelGatewaySenderEventProcessor.java |  122 +
 ...urrentSerialGatewaySenderEventProcessor.java |   45 +
 ...RemoteSerialGatewaySenderEventProcessor.java |   50 +
 .../wan/serial/SerialGatewaySenderImpl.java     |  260 +
 ...ternal.locator.wan.LocatorMembershipListener |   15 +
 ...ne.gemfire.internal.cache.wan.spi.WANFactory |   15 +
 .../cache/CacheXml70GatewayDUnitTest.java       |  243 +
 .../cache/CacheXml80GatewayDUnitTest.java       |   77 +
 .../AnalyzeWANSerializablesJUnitTest.java       |   91 +
 .../internal/cache/UpdateVersionDUnitTest.java  |  960 ++++
 .../gemfire/internal/cache/wan/WANTestBase.java | 5178 ++++++++++++++++++
 ...oncurrentParallelGatewaySenderDUnitTest.java |  860 +++
 ...ntParallelGatewaySenderOffHeapDUnitTest.java |   32 +
 ...allelGatewaySenderOperation_1_DUnitTest.java |  848 +++
 ...allelGatewaySenderOperation_2_DUnitTest.java |  579 ++
 ...tSerialGatewaySenderOperationsDUnitTest.java |  111 +
 ...GatewaySenderOperationsOffHeapDUnitTest.java |   32 +
 .../ConcurrentWANPropogation_1_DUnitTest.java   |  608 ++
 .../ConcurrentWANPropogation_2_DUnitTest.java   |  485 ++
 .../cache/wan/disttx/DistTXWANDUnitTest.java    |  209 +
 .../CommonParallelGatewaySenderDUnitTest.java   |  481 ++
 ...onParallelGatewaySenderOffHeapDUnitTest.java |   32 +
 ...wWANConcurrencyCheckForDestroyDUnitTest.java |  526 ++
 .../cache/wan/misc/PDXNewWanDUnitTest.java      |  787 +++
 ...dRegion_ParallelWANPersistenceDUnitTest.java |  752 +++
 ...dRegion_ParallelWANPropogationDUnitTest.java | 1132 ++++
 .../SenderWithTransportFilterDUnitTest.java     |  274 +
 ...downAllPersistentGatewaySenderDUnitTest.java |  205 +
 .../wan/misc/WANConfigurationJUnitTest.java     |  617 +++
 .../wan/misc/WANLocatorServerDUnitTest.java     |  193 +
 .../cache/wan/misc/WANSSLDUnitTest.java         |  151 +
 .../wan/misc/WanAutoDiscoveryDUnitTest.java     |  557 ++
 .../cache/wan/misc/WanValidationsDUnitTest.java | 1678 ++++++
 ...GatewaySenderOperationsOffHeapDUnitTest.java |   34 +
 ...ewaySenderQueueOverflowOffHeapDUnitTest.java |   34 +
 .../ParallelWANConflationOffHeapDUnitTest.java  |   34 +
 ...nceEnabledGatewaySenderOffHeapDUnitTest.java |   34 +
 ...ropogationConcurrentOpsOffHeapDUnitTest.java |   34 +
 .../ParallelWANPropogationOffHeapDUnitTest.java |   34 +
 ...erialGatewaySenderQueueOffHeapDUnitTest.java |   34 +
 ...nceEnabledGatewaySenderOffHeapDUnitTest.java |   34 +
 .../SerialWANPropogationOffHeapDUnitTest.java   |   34 +
 ...ation_PartitionedRegionOffHeapDUnitTest.java |   34 +
 ...arallelGatewaySenderOperationsDUnitTest.java | 1984 +++++++
 ...llelGatewaySenderQueueOverflowDUnitTest.java |  531 ++
 .../ParallelWANConflationDUnitTest.java         |  496 ++
 ...ersistenceEnabledGatewaySenderDUnitTest.java | 1823 ++++++
 ...llelWANPropagationClientServerDUnitTest.java |  114 +
 ...lelWANPropagationConcurrentOpsDUnitTest.java |  290 +
 .../ParallelWANPropagationDUnitTest.java        | 1448 +++++
 ...ParallelWANPropagationLoopBackDUnitTest.java |  425 ++
 .../wan/parallel/ParallelWANStatsDUnitTest.java |  632 +++
 ...tewaySenderDistributedDeadlockDUnitTest.java |  407 ++
 ...rialGatewaySenderEventListenerDUnitTest.java |  390 ++
 .../SerialGatewaySenderOperationsDUnitTest.java |  602 ++
 .../SerialGatewaySenderQueueDUnitTest.java      |  337 ++
 ...ersistenceEnabledGatewaySenderDUnitTest.java |  602 ++
 .../SerialWANPropagationLoopBackDUnitTest.java  |  538 ++
 .../serial/SerialWANPropogationDUnitTest.java   | 1602 ++++++
 ...NPropogation_PartitionedRegionDUnitTest.java |  439 ++
 .../SerialWANPropogationsFeatureDUnitTest.java  |  373 ++
 .../wan/serial/SerialWANStatsDUnitTest.java     |  596 ++
 .../wan/wancommand/WANCommandTestBase.java      |  513 ++
 ...anCommandCreateGatewayReceiverDUnitTest.java |  699 +++
 .../WanCommandCreateGatewaySenderDUnitTest.java |  763 +++
 ...WanCommandGatewayReceiverStartDUnitTest.java |  327 ++
 .../WanCommandGatewayReceiverStopDUnitTest.java |  332 ++
 .../WanCommandGatewaySenderStartDUnitTest.java  |  416 ++
 .../WanCommandGatewaySenderStopDUnitTest.java   |  367 ++
 .../wan/wancommand/WanCommandListDUnitTest.java |  403 ++
 .../WanCommandPauseResumeDUnitTest.java         |  716 +++
 .../wancommand/WanCommandStatusDUnitTest.java   |  582 ++
 .../management/WANManagementDUnitTest.java      |  525 ++
 .../ClusterConfigurationDUnitTest.java          | 1055 ++++
 .../pulse/TestRemoteClusterDUnitTest.java       |  274 +
 .../gemfire/codeAnalysis/excludedClasses.txt    |    2 +
 .../gemstone/gemfire/codeAnalysis/openBugs.txt  |   21 +
 .../sanctionedDataSerializables.txt             |   28 +
 .../codeAnalysis/sanctionedSerializables.txt    |    0
 settings.gradle                                 |    2 +
 190 files changed, 94367 insertions(+)
----------------------------------------------------------------------



[17/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderOffHeapDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderOffHeapDUnitTest.java
new file mode 100644
index 0000000..fe21691
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderOffHeapDUnitTest.java
@@ -0,0 +1,16 @@
+package com.gemstone.gemfire.internal.cache.wan.misc;
+
+@SuppressWarnings("serial")
+public class CommonParallelGatewaySenderOffHeapDUnitTest extends
+    CommonParallelGatewaySenderDUnitTest {
+
+  public CommonParallelGatewaySenderOffHeapDUnitTest(String name) {
+    super(name);
+  }
+
+  @Override
+  public boolean isOffHeap() {
+    return true;
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
new file mode 100644
index 0000000..4cff68d
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
@@ -0,0 +1,521 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+/**
+ * 
+ */
+package com.gemstone.gemfire.internal.cache.wan.misc;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.internal.cache.DistributedCacheOperation;
+import com.gemstone.gemfire.internal.cache.EntrySnapshot;
+import com.gemstone.gemfire.internal.cache.LocalRegion;
+import com.gemstone.gemfire.internal.cache.LocalRegion.NonTXEntry;
+import com.gemstone.gemfire.internal.cache.RegionEntry;
+import com.gemstone.gemfire.internal.cache.Token.Tombstone;
+import com.gemstone.gemfire.internal.cache.versions.VersionTag;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+
+import dunit.AsyncInvocation;
+
+/**
+ * @author shobhit
+ *
+ * Test verifies that version tag for destroyed entry is propagated back to
+ * origin distributed system if the version tag is applied and replaces old
+ * version information in destination distributed system.
+ *
+ * Version tag information which is relevant between multiple distributed
+ * systems consistency check is basically dsid and timestamp.
+ */
+public class NewWANConcurrencyCheckForDestroyDUnitTest extends WANTestBase {
+
+  //These fields are used as BlackBoard for test data verification.
+  static long destroyTimeStamp;
+  static int destroyingMember;
+  
+  public NewWANConcurrencyCheckForDestroyDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+  }
+
+  public void testVersionTagTimestampForDestroy() {
+    
+    
+    // create three distributed systems with each having a cache containing
+    // a Replicated Region with one entry and concurrency checks enabled.
+
+    // Site 2 and Site 3 only know about Site 1 but Site 1 knows about both
+    // Site 2 and Site 3.
+
+    // Site 1
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnRecPort = (Integer) vm1.invoke(WANTestBase.class, "createReceiver", new Object[] { lnPort });
+    
+    //Site 2
+    Integer nyPort = (Integer)vm2.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer nyRecPort = (Integer) vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    //Site 3
+    Integer tkPort = (Integer)vm4.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 3, lnPort });
+    Integer tkRecPort = (Integer) vm5.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
+
+    getLogWriter().info("Created locators and receivers in 3 distributed systems");
+     
+    //Site 1
+    vm1.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+      true, 10, 1, false, false, null, true });
+    vm1.invoke(WANTestBase.class, "createSender", new Object[] { "ln2", 3,
+      true, 10, 1, false, false, null, true });
+    
+    vm1.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {"repRegion", "ln1,ln2", 0, 1, isOffHeap() });
+    vm1.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
+    vm1.invoke(WANTestBase.class, "startSender", new Object[] { "ln2" });
+    vm1.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln1" });
+    vm1.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln2" });
+    
+    //Site 2
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ny1", 1,
+      true, 10, 1, false, false, null, true });
+    
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {"repRegion", "ny1", 0, 1, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ny1" });
+    vm3.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ny1" });
+    
+    //Site 3 which only knows about Site 1.
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "tk1", 1,
+      true, 10, 1, false, false, null, true });
+    
+    vm5.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {"repRegion", "tk1", 0, 1, isOffHeap() });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "tk1" });
+    vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "tk1" });
+    
+    pause(2000);
+    
+    // Perform a put in vm1
+    vm1.invoke(new CacheSerializableRunnable("Putting an entry in ds1") {
+      
+      @Override
+      public void run2() throws CacheException {
+        assertNotNull(cache);
+        
+        Region region = cache.getRegion("/repRegion");
+        region.put("testKey", "testValue");
+        
+        assertEquals(1, region.size());
+      }
+    });
+
+    //wait for vm1 to propagate put to vm3 and vm5
+    pause(2000); 
+
+    destroyTimeStamp = (Long) vm3.invoke(NewWANConcurrencyCheckForDestroyDUnitTest.class, "getVersionTimestampAfterOp");
+    
+    //wait for vm1 to propagate destroyed entry's new version tag to vm5
+    pause(2000); 
+
+    vm5.invoke(NewWANConcurrencyCheckForDestroyDUnitTest.class, "verifyTimestampAfterOp", 
+          new Object[] {destroyTimeStamp, 1 /* ds 3 receives gatway event only from ds 1*/});
+  }
+
+  /**
+   * Test creates two sites and one Replicated Region on each with Serial
+   * GatewaySender on each. Test checks for sequence of events being sent from
+   * site1 to site2 for PUTALL and PUT and finally checks for final timestamp in
+   * version for RegionEntry with key "testKey". If timestamp on both site is
+   * same that means events were transferred in correct sequence.
+   */
+  public void testPutAllEventSequenceOnSerialGatewaySenderWithRR() {
+    
+    // create two distributed systems with each having a cache containing
+    // a Replicated Region with one entry and concurrency checks enabled.
+
+    // Site 1
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnRecPort = (Integer) vm1.invoke(WANTestBase.class, "createReceiver", new Object[] { lnPort });
+    
+    //Site 2
+    Integer nyPort = (Integer)vm2.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer nyRecPort = (Integer) vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    getLogWriter().info("Created locators and receivers in 2 distributed systems");
+     
+    //Site 1
+    vm1.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+      false, 10, 1, false, false, null, true });
+    
+    vm1.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {"repRegion", "ln1", isOffHeap() });
+    vm1.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
+    vm1.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln1" });
+    
+    //Site 2
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ny1", 1,
+      false, 10, 1, false, false, null, true });
+    
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {"repRegion", "ny1", isOffHeap() });
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ny1" });
+    vm3.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ny1" });
+    
+    pause(2000);
+    
+    // Perform a put in vm1
+    AsyncInvocation asynch1 = vm1.invokeAsync(new CacheSerializableRunnable("Putting an entry in ds1") {
+      
+      @Override
+      public void run2() throws CacheException {
+        assertNotNull(cache);
+        // Test hook to make put wait after RE lock is released but before Gateway events are sent.
+        DistributedCacheOperation.SLOW_DISTRIBUTION_MS = 2000; 
+        
+        Region region = cache.getRegion("/repRegion");
+        Map testMap = new HashMap();
+        testMap.put("testKey", "testValue1");
+        region.putAll(testMap);
+        
+        assertEquals(1, region.size());
+        assertEquals("testValue2", region.get("testKey"));
+      }
+    });
+
+    //wait for vm1 to propagate put to vm3
+    pause(1000); 
+
+    AsyncInvocation asynch2 = vm1.invokeAsync(new CacheSerializableRunnable("Putting an entry in ds1") {
+      
+      @Override
+      public void run2() throws CacheException {
+        assertNotNull(cache);
+        Region region = cache.getRegion("/repRegion");
+        
+        while (!region.containsKey("testKey")) {
+          pause(10);
+        }
+        // Test hook to make put wait after RE lock is released but before Gateway events are sent.
+        DistributedCacheOperation.SLOW_DISTRIBUTION_MS = 0; 
+        
+        region.put("testKey", "testValue2");
+        
+        assertEquals(1, region.size());
+        assertEquals("testValue2", region.get("testKey"));
+      }
+    });
+
+    try {
+      asynch1.join(5000);
+      asynch2.join(5000);
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+    } finally {
+      vm1.invoke(new CacheSerializableRunnable("Reset Test Hook") {
+        
+        @Override
+        public void run2() throws CacheException {
+          DistributedCacheOperation.SLOW_DISTRIBUTION_MS = 0;
+        }
+      });
+    }
+
+    //Wait for all Gateway events be received by vm3.
+    pause(1000);
+
+    long putAllTimeStampVm1 = (Long) vm1.invoke(NewWANConcurrencyCheckForDestroyDUnitTest.class, "getVersionTimestampAfterPutAllOp");
+    
+    long putAllTimeStampVm3 = (Long) vm3.invoke(NewWANConcurrencyCheckForDestroyDUnitTest.class, "getVersionTimestampAfterPutAllOp");
+    
+    assertEquals(putAllTimeStampVm1, putAllTimeStampVm3);
+  }
+
+/**
+ * This is similar to above test but for PartitionedRegion.
+ */
+public void testPutAllEventSequenceOnSerialGatewaySenderWithPR() {
+    
+    // create two distributed systems with each having a cache containing
+    // a Replicated Region with one entry and concurrency checks enabled.
+
+    // Site 1
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnRecPort = (Integer) vm1.invoke(WANTestBase.class, "createReceiver", new Object[] { lnPort });
+    
+    //Site 2
+    Integer nyPort = (Integer)vm2.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer nyRecPort = (Integer) vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    getLogWriter().info("Created locators and receivers in 2 distributed systems");
+     
+    //Site 1
+    vm1.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+      false, 10, 1, false, false, null, true });
+    
+    vm1.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {"repRegion", "ln1", 0, 1, isOffHeap() });
+    vm1.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
+    vm1.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln1" });
+    
+    //Site 2
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ny1", 1,
+      false, 10, 1, false, false, null, true });
+    
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {"repRegion", "ny1", 0, 1, isOffHeap() });
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ny1" });
+    vm3.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ny1" });
+    
+    pause(2000);
+    
+    // Perform a put in vm1
+    AsyncInvocation asynch1 = vm1.invokeAsync(new CacheSerializableRunnable("Putting an entry in ds1") {
+      
+      @Override
+      public void run2() throws CacheException {
+        assertNotNull(cache);
+        // Test hook to make put wait after RE lock is released but before Gateway events are sent.
+        DistributedCacheOperation.SLOW_DISTRIBUTION_MS = 2000; 
+        
+        Region region = cache.getRegion("/repRegion");
+        Map testMap = new HashMap();
+        testMap.put("testKey", "testValue1");
+        region.putAll(testMap);
+        
+        assertEquals(1, region.size());
+        assertEquals("testValue2", region.get("testKey"));
+      }
+    });
+
+    //wait for vm1 to propagate put to vm3
+    pause(1000); 
+
+    AsyncInvocation asynch2 = vm1.invokeAsync(new CacheSerializableRunnable("Putting an entry in ds1") {
+      
+      @Override
+      public void run2() throws CacheException {
+        assertNotNull(cache);
+        Region region = cache.getRegion("/repRegion");
+        
+        while (!region.containsKey("testKey")) {
+          pause(10);
+        }
+        // Test hook to make put wait after RE lock is released but before Gateway events are sent.
+        DistributedCacheOperation.SLOW_DISTRIBUTION_MS = 0; 
+        
+        region.put("testKey", "testValue2");
+        
+        assertEquals(1, region.size());
+        assertEquals("testValue2", region.get("testKey"));
+      }
+    });
+
+    try {
+      asynch1.join(5000);
+      asynch2.join(5000);
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+    } finally {
+      vm1.invoke(new CacheSerializableRunnable("Reset Test Hook") {
+        
+        @Override
+        public void run2() throws CacheException {
+          DistributedCacheOperation.SLOW_DISTRIBUTION_MS = 0;
+        }
+      });
+    }
+
+    //Wait for all Gateway events be received by vm3.
+    pause(1000);
+
+    long putAllTimeStampVm1 = (Long) vm1.invoke(NewWANConcurrencyCheckForDestroyDUnitTest.class, "getVersionTimestampAfterPutAllOp");
+    
+    long putAllTimeStampVm3 = (Long) vm3.invoke(NewWANConcurrencyCheckForDestroyDUnitTest.class, "getVersionTimestampAfterPutAllOp");
+    
+    assertEquals(putAllTimeStampVm1, putAllTimeStampVm3);
+  }
+
+  /**
+   * Tests if conflict checks are happening based on DSID and timestamp even if
+   * version tag is generated in local distributed system.
+   */
+  public void testConflicChecksBasedOnDsidAndTimeStamp() {
+
+    
+    // create two distributed systems with each having a cache containing
+    // a Replicated Region with one entry and concurrency checks enabled.
+
+    // Site 1
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer lnRecPort = (Integer) vm1.invoke(WANTestBase.class, "createReceiver", new Object[] { lnPort });
+    
+    //Site 2
+    Integer nyPort = (Integer)vm2.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    Integer nyRecPort = (Integer) vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    
+    getLogWriter().info("Created locators and receivers in 2 distributed systems");
+
+    //Site 1
+    vm1.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2,
+      false, 10, 1, false, false, null, true });
+    
+    vm1.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {"repRegion", "ln1", isOffHeap() });
+    vm1.invoke(WANTestBase.class, "startSender", new Object[] { "ln1" });
+    vm1.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln1" });
+    
+    //Site 2
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {"repRegion", "ny1", isOffHeap() });
+    
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { nyPort });
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ny1", 1,
+      false, 10, 1, false, false, null, true });
+    
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {"repRegion", "ny1", isOffHeap() });
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ny1" });
+    vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ny1" });
+    
+    pause(2000);
+    
+    // Perform a put in vm1
+    vm1.invoke(new CacheSerializableRunnable("Putting an entry in ds1") {
+      
+      @Override
+      public void run2() throws CacheException {
+        assertNotNull(cache);
+        
+        Region region = cache.getRegion("/repRegion");
+        region.put("testKey", "testValue1");
+        
+        assertEquals(1, region.size());
+      }
+    });
+
+    //wait for vm4 to have later timestamp before sending operation to vm1
+    pause(300); 
+
+    AsyncInvocation asynch = vm4.invokeAsync(new CacheSerializableRunnable("Putting an entry in ds2 in vm4") {
+      
+      @Override
+      public void run2() throws CacheException {
+        assertNotNull(cache);
+        Region region = cache.getRegion("/repRegion");
+        
+        region.put("testKey", "testValue2");
+        
+        assertEquals(1, region.size());
+        assertEquals("testValue2", region.get("testKey"));
+      }
+    });
+
+    try {
+      asynch.join(2000);
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+    }
+
+    //Wait for all local ds events be received by vm3.
+    pause(1000);
+
+    vm3.invoke(new CacheSerializableRunnable("Check dsid") {
+      
+      @Override
+      public void run2() throws CacheException {
+        Region region = cache.getRegion("repRegion");
+        
+        Region.Entry entry = ((LocalRegion)region).getEntry("testKey", /*null,*/
+            true); //commented while merging revision 43582
+        RegionEntry re = null;
+        if (entry instanceof EntrySnapshot) {
+          re = ((EntrySnapshot)entry).getRegionEntry();
+        } else if (entry instanceof NonTXEntry) {
+          re = ((NonTXEntry)entry).getRegionEntry();
+        }
+        VersionTag tag = re.getVersionStamp().asVersionTag();
+        assertEquals(2, tag.getDistributedSystemId());
+      }
+    });
+
+    // Check vm3 has latest timestamp from vm4.
+    long putAllTimeStampVm1 = (Long) vm4.invoke(NewWANConcurrencyCheckForDestroyDUnitTest.class, "getVersionTimestampAfterPutAllOp");
+    
+    long putAllTimeStampVm3 = (Long) vm3.invoke(NewWANConcurrencyCheckForDestroyDUnitTest.class, "getVersionTimestampAfterPutAllOp");
+    
+    assertEquals(putAllTimeStampVm1, putAllTimeStampVm3);
+  }
+  
+  /*
+   * For VM1 in ds 1. Used in testPutAllEventSequenceOnSerialGatewaySender.
+   */
+  public static long getVersionTimestampAfterPutAllOp() {
+    Region region = cache.getRegion("repRegion");
+    
+    while (!(region.containsKey("testKey") /*&& region.get("testKey").equals("testValue2") */)) {
+      pause(10);
+    }
+    assertEquals(1, region.size());
+
+    Region.Entry entry = ((LocalRegion)region).getEntry("testKey", /*null,*/ true);
+    RegionEntry re = null;
+    if (entry instanceof EntrySnapshot) {
+      re = ((EntrySnapshot)entry).getRegionEntry();
+    } else if (entry instanceof NonTXEntry) {
+      re = ((NonTXEntry)entry).getRegionEntry();
+    }
+    if (re != null) {
+      getLogWriter().fine("RegionEntry for testKey: " + re.getKey() + " " + re.getValueInVM((LocalRegion) region));
+      
+      VersionTag tag = re.getVersionStamp().asVersionTag();
+      return tag.getVersionTimeStamp();
+    } else {
+      return -1;
+    }
+  }
+
+  /*
+   * For VM3 in ds 2.
+   */
+  public static long getVersionTimestampAfterOp() {
+    Region region = cache.getRegion("repRegion");
+    assertEquals(1, region.size());
+    
+    region.destroy("testKey");
+
+    Region.Entry entry = ((LocalRegion)region).getEntry("testKey", /*null,*/ true);
+    RegionEntry re = ((EntrySnapshot)entry).getRegionEntry();
+    getLogWriter().fine("RegionEntry for testKey: " + re.getKey() + " " + re.getValueInVM((LocalRegion) region));
+    assertTrue(re.getValueInVM((LocalRegion) region) instanceof Tombstone);
+    
+    VersionTag tag = re.getVersionStamp().asVersionTag();
+    return tag.getVersionTimeStamp();
+  }
+
+  /*
+   * For VM 5 in ds 3.
+   */
+  public static void verifyTimestampAfterOp(long timestamp, int memberid) {
+    Region region = cache.getRegion("repRegion");
+    assertEquals(0, region.size());
+
+    Region.Entry entry = ((LocalRegion)region).getEntry("testKey", /*null,*/ true);
+    RegionEntry re = ((EntrySnapshot)entry).getRegionEntry();
+    assertTrue(re.getValueInVM((LocalRegion) region) instanceof Tombstone);
+    
+    VersionTag tag = re.getVersionStamp().asVersionTag();
+    assertEquals(timestamp, tag.getVersionTimeStamp());
+    assertEquals(memberid, tag.getDistributedSystemId());
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java
new file mode 100644
index 0000000..cf78e24
--- /dev/null
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java
@@ -0,0 +1,779 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.internal.cache.wan.misc;
+
+import com.gemstone.gemfire.cache.CacheWriterException;
+import com.gemstone.gemfire.cache.client.ServerOperationException;
+import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+
+import dunit.AsyncInvocation;
+
+public class PDXNewWanDUnitTest extends WANTestBase{
+
+  private static final long serialVersionUID = 1L;
+  
+  public PDXNewWanDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+  }
+
+  /**
+   * Test
+   *   1> Site 1 : 1 locator, 1 member
+   *   2> Site 2 : 1 locator, 1 member
+   *   3> DR is defined on  member 1 on site1
+   *   4> Serial GatewaySender is defined on member 1 on site1
+   *   5> Same DR is defined on site2 member 1
+   *   6> Put is done with value which is PDXSerializable
+   *   7> Validate whether other sites member receive this put operation.    
+   */
+  public void testWANPDX_RR_SerialSender() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    
+    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { testName + "_RR",
+        1 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
+        testName + "_RR", 1 });
+  }
+  
+  /**
+   * Test
+   *   1> Site 1 : 1 locator, 1 member
+   *   2> Site 2 : 1 locator, 1 member
+   *   3> DR is defined on  member 1 on site1
+   *   4> Serial GatewaySender is defined on member 1 on site1
+   *   5> Same DR is defined on site2 member 1
+   *   6> Put is done with value which is PDXSerializable
+   *   7> Validate whether other sites member receive this put operation.
+   *   8> Bounce site 1 and delete all of it's data
+   *   9> Make sure that site 1 get the the PDX types along with entries
+   *   and can deserialize entries.     
+   */
+  public void testWANPDX_RemoveRomoteData() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver_PDX", new Object[] { nyPort });
+
+    vm3.invoke(WANTestBase.class, "createCache_PDX", new Object[] { lnPort });
+
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    
+    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { testName + "_RR",
+        1 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
+        testName + "_RR", 1 });
+    
+    
+    //bounce vm2
+    vm2.invoke(WANTestBase.class, "closeCache");
+    
+    vm2.invoke(WANTestBase.class, "deletePDXDir");
+    
+    vm2.invoke(WANTestBase.class, "createReceiver_PDX", new Object[] { nyPort });
+    
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", null, isOffHeap() });
+    
+    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { testName + "_RR",
+      2 });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
+      testName + "_RR", 2 });
+  }
+  
+  /**
+   * Test
+   *   1> Site 1 : 1 locator, 1 member
+   *   2> Site 2 : 1 locator, 1 member
+   *   3> DR is defined on  member 1 on site1
+   *   4> Serial GatewaySender is defined on member 1 on site1
+   *   5> Same DR is defined on site2 member 1
+   *   6> Put is done with value which is PDXSerializable
+   *   7> Validate whether other sites member receive this put operation.
+   *   8> Bounce site 1 and delete all of it's data
+   *   9> Make some conflicting PDX registries in site 1 before the reconnect
+   *   10> Make sure we flag a warning about the conflicting updates.     
+   */
+  public void testWANPDX_ConflictingData() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver_PDX", new Object[] { nyPort });
+
+    vm3.invoke(WANTestBase.class, "createCache_PDX", new Object[] { lnPort });
+
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    
+    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { testName + "_RR",
+        1 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
+        testName + "_RR", 1 });
+    
+    //bounce vm3
+    vm3.invoke(WANTestBase.class, "closeCache");
+    
+    ExpectedException ex1 = addExpectedException("Trying to add a PDXType with the same id");
+    ExpectedException ex2 = addExpectedException("CacheWriterException");
+    ExpectedException ex3 = addExpectedException("does match the existing PDX type");
+    ExpectedException ex4 = addExpectedException("ServerOperationException");
+    ExpectedException ex5 = addExpectedException("Stopping the processor");
+    
+    try {
+    //blow away vm3's PDX data
+    vm3.invoke(WANTestBase.class, "deletePDXDir");
+    
+    vm3.invoke(WANTestBase.class, "createCache_PDX", new Object[] { lnPort });
+
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    
+    //Define a different type from vm3
+    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable2", new Object[] { testName + "_RR",
+      2 });
+    
+    //Give the updates some time to make it over the WAN
+    pause(10000);
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
+      testName + "_RR", 1 });
+    
+    vm3.invoke(WANTestBase.class, "closeCache");
+    } finally {
+      ex1.remove();
+      ex2.remove();
+      ex3.remove();
+      ex4.remove();
+      ex5.remove();
+    }
+  }
+  
+  /**
+   * Test
+   *   1> Site 1 : 1 locator, 1 member
+   *   2> Site 2 : 1 locator, 1 member
+   *   3> Site 3 : 1 locator, 1 member
+   *   3> DR is defined on  member 1 on site1
+   *   4> Serial GatewaySender is defined on member 1 on site1
+   *   5> Same DR is defined on site2 member 1
+   *   6> Put is done with value which is PDXSerializable
+   *   7> Validate whether other sites member receive this put operation.    
+   */
+  public void testWANPDX_RR_SerialSender3Sites() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+    
+    Integer tkPort = (Integer)vm2.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 3, lnPort });
+
+    vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { lnPort });
+    vm4.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm5.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort });
+
+
+    //Create all of our gateway senders
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ny", 2,
+        false, 100, 10, false, false, null, true });
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "tk", 3,
+      false, 100, 10, false, false, null, true });
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 1,
+      false, 100, 10, false, false, null, true });
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "tk", 3,
+    false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 1,
+      false, 100, 10, false, false, null, true });
+    vm5.invoke(WANTestBase.class, "createSender", new Object[] { "ny", 2,
+    false, 100, 10, false, false, null, true });
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ny,tk", isOffHeap() });
+    vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln,tk", isOffHeap() });
+    vm5.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+      testName + "_RR", "ln,ny", isOffHeap() });
+    
+    //Start all of the senders
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ny" });
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "tk" });
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "tk" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm5.invoke(WANTestBase.class, "startSender", new Object[] { "ny" });
+    
+    //Pause ln to ny. This means the PDX type will not be dispatched
+    //to ny from ln
+    vm3.invoke(WANTestBase.class, "pauseSender", new Object[] { "ny" });
+    
+    pause(5000);
+    
+    //Do some puts that define a PDX type in ln
+    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { testName + "_RR",
+      1 });
+    
+    //Make sure that tk received the update
+    vm5.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
+      testName + "_RR", 1 });
+    
+    //Make ny didn't receive the update because the sender is paused 
+    vm4.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
+      testName + "_RR", 0 });
+    
+    //Now, do a put from tk. This serialized object will be distributed
+    //to ny from tk, using the type defined by ln.
+    vm5.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { testName + "_RR",
+      2 });
+    
+    //Verify the ny can read the object
+    vm4.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
+      testName + "_RR", 2 });
+    
+    //Wait for vm3 to receive the update (prevents a broken pipe suspect string) 
+    vm3.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
+      testName + "_RR", 2 });
+  }
+  
+  public void testWANPDX_RR_SerialSender_StartedLater() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    
+    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { testName + "_RR",
+        10 });
+
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { testName + "_RR",
+      40 });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
+        testName + "_RR", 40 });
+  }
+  
+  /**
+   * Test
+   *   1> Site 1 : 1 locator, 1 member
+   *   2> Site 2 : 1 locator, 1 member
+   *   3> PR is defined on  member 1 on site1
+   *   4> Serial GatewaySender is defined on member 1 on site1
+   *   5> Same PR is defined on site2 member 1
+   *   6> Put is done with value which is PDXSerializable
+   *   7> Validate whether other sites member receive this put operation.    
+   */
+  
+  public void testWANPDX_PR_SerialSender() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 0, 2, isOffHeap() });
+
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 0, 2, isOffHeap() });
+    
+    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { testName + "_PR",
+        1 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
+        testName + "_PR", 1 });
+  }
+  
+  public void testWANPDX_PR_SerialSender_StartedLater() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver_PDX", new Object[] { nyPort });
+
+    vm3.invoke(WANTestBase.class, "createCache_PDX", new Object[] { lnPort });
+
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 0, 2, isOffHeap() });
+
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 0, 2, isOffHeap() });
+    
+    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { testName + "_PR",
+        20 });
+    
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { testName + "_PR",
+      40 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
+        testName + "_PR", 40 });
+  }
+  
+  /**
+   * Test
+   *   1> Site 1 : 1 locator, 2 member
+   *   2> Site 2 : 1 locator, 2 member
+   *   3> PR is defined on  member 1, 2 on site1
+   *   4> Serial GatewaySender is defined on member 1 on site1
+   *   5> Same PR is defined on site2 member 1, 2
+   *   6> Put is done with value which is PDXSerializable
+   *   7> Validate whether other sites member receive this put operation.    
+   */
+  
+  public void testWANPDX_PR_MultipleVM_SerialSender() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null,1, 5, isOffHeap() });
+
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 5, isOffHeap() });
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 1, 5, isOffHeap() });
+    
+    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { testName + "_PR",
+        10 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
+        testName + "_PR", 10 });
+  }
+  
+  public void testWANPDX_PR_MultipleVM_SerialSender_StartedLater() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver_PDX", new Object[] { nyPort });
+
+    vm3.invoke(WANTestBase.class, "createCache_PDX", new Object[] { lnPort });
+    vm4.invoke(WANTestBase.class, "createCache_PDX", new Object[] { lnPort });
+    
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 1, 5, isOffHeap() });
+
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 1, 5, isOffHeap() });
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 1, 5, isOffHeap() });
+    
+    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { testName + "_PR",
+        10 });
+
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm4.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { testName + "_PR",
+      40 });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
+        testName + "_PR", 40 });
+  }
+  
+  /**
+   * Test
+   *   1> Site 1 : 1 locator, 1 member
+   *   2> Site 2 : 1 locator, 1 member
+   *   3> PR is defined on  member 1 on site1
+   *   4> Parallel GatewaySender is defined on member 1 on site1
+   *   5> Same PR is defined on site2 member 1
+   *   6> Put is done with value which is PDXSerializable
+   *   7> Validate whether other sites member receive this put operation.    
+   */
+  
+  public void testWANPDX_PR_ParallelSender() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 0, 1, isOffHeap() });
+    
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 0, 1, isOffHeap() });
+    
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { testName + "_PR",
+        1 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
+        testName + "_PR", 1});
+  }
+  
+  public void testWANPDX_PR_ParallelSender_47826() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2, true,
+        100, 10, false, false, null, true });
+
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 0, 1, isOffHeap() });
+
+    vm3.invoke(WANTestBase.class, "unsetRemoveFromQueueOnException",
+        new Object[] { "ln" });
+
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] {
+        testName + "_PR", 1 });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 0, 1, isOffHeap() });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
+        testName + "_PR", 1 });
+  }
+  
+  public void testWANPDX_PR_ParallelSender_StartedLater() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver_PDX", new Object[] { nyPort });
+
+    vm3.invoke(WANTestBase.class, "createCache_PDX", new Object[] { lnPort });
+
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 0, 2, isOffHeap() });
+
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 0, 2, isOffHeap() });
+    
+    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { testName + "_PR",
+        10 });
+
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { testName + "_PR",
+      40 });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
+        testName + "_PR", 40 });
+  }
+  
+  
+  public void testWANPDX_PR_MultipleVM_ParallelSender() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true });
+    
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 0, 2, isOffHeap() });
+
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 0, 2, isOffHeap() });
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 0, 2, isOffHeap() });
+    
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { testName + "_PR",
+        10 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
+        testName + "_PR", 10 });
+  }
+  
+  public void testWANPDX_PR_MultipleVM_ParallelSender_StartedLater() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver_PDX", new Object[] { nyPort });
+
+    vm3.invoke(WANTestBase.class, "createCache_PDX", new Object[] { lnPort });
+    vm4.invoke(WANTestBase.class, "createCache_PDX", new Object[] { lnPort });
+
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, null, true });
+   vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, null, true });
+    
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 0, 2, isOffHeap() });
+
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 0, 2, isOffHeap() });
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 0, 2, isOffHeap() });
+    
+    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { testName + "_PR",
+        10 });
+
+    AsyncInvocation inv1 = vm3.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    AsyncInvocation inv2 = vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    try{
+      inv1.join();
+      inv2.join();
+    }
+    catch(InterruptedException ie) {
+      fail("Caught interrupted exception");
+    }
+    
+    vm4.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { testName + "_PR",
+      40 });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
+        testName + "_PR", 40 });
+  }
+  
+  
+  public void testWANPDX_RR_SerialSenderWithFilter() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, new PDXGatewayEventFilter(), true });
+
+    vm2.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", null, isOffHeap() });
+
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm3.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] {
+        testName + "_RR", "ln", isOffHeap() });
+    
+    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { testName + "_RR",
+        1 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
+        testName + "_RR", 1 });
+    
+    vm3.invoke(PDXNewWanDUnitTest.class, "verifyFilterInvocation", new Object[] { 1});
+  }
+  
+  
+  public void testWANPDX_PR_MultipleVM_ParallelSenderWithFilter() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+    vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        true, 100, 10, false, false, new PDXGatewayEventFilter(), true });
+    vm4.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+      true, 100, 10, false, false, new PDXGatewayEventFilter(), true });
+    
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 0, 2, isOffHeap() });
+
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 0, 2, isOffHeap() });
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", "ln", 0, 2, isOffHeap() });
+    
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+    
+    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { testName + "_PR",
+        10 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
+        testName + "_PR", 10 });
+    
+    vm3.invoke(PDXNewWanDUnitTest.class, "verifyFilterInvocation", new Object[] { 5});
+    vm4.invoke(PDXNewWanDUnitTest.class, "verifyFilterInvocation", new Object[] { 5});
+  }
+  
+  
+  /**
+   * When remote site bounces then we should send pdx event again.
+   */
+  
+  public void Bug_testWANPDX_PR_SerialSender_RemoteSite_Bounce() {
+    Integer lnPort = (Integer)vm0.invoke(WANTestBase.class,
+        "createFirstLocatorWithDSId", new Object[] { 1 });
+    Integer nyPort = (Integer)vm1.invoke(WANTestBase.class,
+        "createFirstRemoteLocator", new Object[] { 2, lnPort });
+
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+
+    vm3.invoke(WANTestBase.class, "createCache", new Object[] { lnPort });
+
+    vm3.invoke(WANTestBase.class, "createSender", new Object[] { "ln", 2,
+        false, 100, 10, false, false, null, true });
+
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", null, 0, 2, isOffHeap() });
+
+    vm3.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
+
+    vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+        testName + "_PR", "ln", 0, 2, isOffHeap() });
+    
+    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { testName + "_PR",
+        1 });
+
+    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
+        testName + "_PR", 1 });
+    
+    vm2.invoke(WANTestBase.class, "killSender", new Object[] {});
+    
+    vm2.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    vm4.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort });
+    
+    vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 1, 2, isOffHeap() });
+    vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
+      testName + "_PR", null, 1, 2, isOffHeap() });
+    
+    vm3.invoke(WANTestBase.class, "doPutsPDXSerializable", new Object[] { testName + "_PR",
+      1 });
+    
+    vm2.invoke(WANTestBase.class, "validateRegionSize_PDX", new Object[] {
+      testName + "_PR", 1 });
+  }
+  
+
+  
+  
+  public static void verifyFilterInvocation(int invocation) {
+    assertEquals(((PDXGatewayEventFilter)eventFilter).beforeEnqueueInvoked, invocation);
+    assertEquals(((PDXGatewayEventFilter)eventFilter).beforeTransmitInvoked, invocation);
+    assertEquals(((PDXGatewayEventFilter)eventFilter).afterAckInvoked, invocation);
+  }
+
+  
+  
+}


[63/70] incubator-geode git commit: GEODE-819: Fix dunit imports in WAN and CQ tests

Posted by up...@apache.org.
GEODE-819: Fix dunit imports in WAN and CQ tests

Merging from develop to wan_cq_donation picked up some package renames
of the dunit framework. These needed to be applied to all of the wan and
cq tests.


Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/27d965d9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/27d965d9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/27d965d9

Branch: refs/heads/develop
Commit: 27d965d96d0131d094ec1d54172d40d6439ff191
Parents: 8d8b573
Author: Dan Smith <up...@apache.org>
Authored: Tue Jan 26 11:07:34 2016 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Tue Jan 26 11:10:25 2016 -0800

----------------------------------------------------------------------
 .../cache/query/cq/dunit/CqDataDUnitTest.java        | 11 +++++------
 .../cq/dunit/CqDataOptimizedExecuteDUnitTest.java    |  3 +--
 .../query/cq/dunit/CqDataUsingPoolDUnitTest.java     |  9 ++++-----
 .../CqDataUsingPoolOptimizedExecuteDUnitTest.java    |  3 +--
 .../cache/query/cq/dunit/CqPerfDUnitTest.java        |  7 +++----
 .../query/cq/dunit/CqPerfUsingPoolDUnitTest.java     |  7 +++----
 .../cache/query/cq/dunit/CqQueryDUnitTest.java       | 15 +++++++--------
 .../cq/dunit/CqQueryOptimizedExecuteDUnitTest.java   |  7 +++----
 .../query/cq/dunit/CqQueryUsingPoolDUnitTest.java    | 13 ++++++-------
 .../CqQueryUsingPoolOptimizedExecuteDUnitTest.java   |  3 +--
 .../cq/dunit/CqResultSetUsingPoolDUnitTest.java      |  7 +++----
 ...qResultSetUsingPoolOptimizedExecuteDUnitTest.java |  7 +++----
 .../cache/query/cq/dunit/CqStateDUnitTest.java       | 11 +++++------
 .../cache/query/cq/dunit/CqStatsDUnitTest.java       |  7 +++----
 .../cq/dunit/CqStatsOptimizedExecuteDUnitTest.java   |  3 +--
 .../query/cq/dunit/CqStatsUsingPoolDUnitTest.java    |  7 +++----
 .../CqStatsUsingPoolOptimizedExecuteDUnitTest.java   |  3 +--
 .../cache/query/cq/dunit/CqTimeTestListener.java     |  5 ++---
 .../cq/dunit/PartitionedRegionCqQueryDUnitTest.java  |  7 +++----
 ...tionedRegionCqQueryOptimizedExecuteDUnitTest.java |  7 +++----
 .../cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java |  7 +++----
 .../PrCqUsingPoolOptimizedExecuteDUnitTest.java      |  3 +--
 .../cache/query/dunit/PdxQueryCQDUnitTest.java       |  8 ++++----
 .../cache/query/dunit/PdxQueryCQTestBase.java        | 12 +++---------
 .../query/dunit/QueryIndexUpdateRIDUnitTest.java     |  7 +++----
 .../cache/query/dunit/QueryMonitorDUnitTest.java     | 11 +++++------
 .../cache/snapshot/ClientSnapshotDUnitTest.java      |  5 ++---
 .../internal/cache/PRDeltaPropagationDUnitTest.java  |  9 ++++-----
 .../gemfire/internal/cache/PutAllCSDUnitTest.java    | 13 ++++++-------
 .../internal/cache/RemoteCQTransactionDUnitTest.java |  7 +++----
 .../internal/cache/ha/CQListGIIDUnitTest.java        |  6 +++---
 .../internal/cache/ha/HADispatcherDUnitTest.java     |  7 +++----
 .../tier/sockets/ClientToServerDeltaDUnitTest.java   |  7 +++----
 .../sockets/DeltaPropagationWithCQDUnitTest.java     |  7 +++----
 ...DeltaToRegionRelationCQRegistrationDUnitTest.java |  9 ++++-----
 .../tier/sockets/DurableClientSimpleDUnitTest.java   | 11 +++++------
 .../cache/tier/sockets/DurableClientTestCase.java    |  7 +++----
 .../management/CacheServerManagementDUnitTest.java   |  9 ++++-----
 .../cli/commands/ClientCommandsDUnitTest.java        | 10 +++++-----
 .../cli/commands/DurableClientCommandsDUnitTest.java |  7 +++----
 .../management/internal/pulse/TestCQDUnitTest.java   |  2 +-
 .../internal/pulse/TestClientsDUnitTest.java         |  3 +--
 .../internal/pulse/TestServerDUnitTest.java          |  2 +-
 .../security/ClientAuthorizationTwoDUnitTest.java    |  3 +--
 .../security/ClientAuthzObjectModDUnitTest.java      |  7 +++----
 .../security/ClientCQPostAuthorizationDUnitTest.java |  7 +++----
 .../security/ClientPostAuthorizationDUnitTest.java   |  3 +--
 .../gemfire/security/MultiuserAPIDUnitTest.java      |  4 ++--
 .../security/MultiuserDurableCQAuthzDUnitTest.java   |  5 ++---
 .../internal/cache/UpdateVersionDUnitTest.java       | 11 +++++------
 .../gemfire/internal/cache/wan/WANTestBase.java      |  6 +++---
 .../ConcurrentParallelGatewaySenderDUnitTest.java    |  3 +--
 ...ntParallelGatewaySenderOperation_1_DUnitTest.java |  3 +--
 ...ntParallelGatewaySenderOperation_2_DUnitTest.java |  5 ++---
 ...urrentSerialGatewaySenderOperationsDUnitTest.java |  2 +-
 .../ConcurrentWANPropogation_1_DUnitTest.java        |  3 +--
 .../ConcurrentWANPropogation_2_DUnitTest.java        |  3 +--
 .../cache/wan/disttx/DistTXWANDUnitTest.java         |  5 ++---
 .../misc/CommonParallelGatewaySenderDUnitTest.java   |  5 ++---
 .../NewWANConcurrencyCheckForDestroyDUnitTest.java   |  3 +--
 .../internal/cache/wan/misc/PDXNewWanDUnitTest.java  |  3 +--
 ...icatedRegion_ParallelWANPersistenceDUnitTest.java |  5 ++---
 ...icatedRegion_ParallelWANPropogationDUnitTest.java |  9 ++++-----
 .../wan/misc/SenderWithTransportFilterDUnitTest.java |  3 +--
 .../ShutdownAllPersistentGatewaySenderDUnitTest.java |  9 ++++-----
 .../cache/wan/misc/WANLocatorServerDUnitTest.java    |  3 +--
 .../internal/cache/wan/misc/WANSSLDUnitTest.java     |  3 +--
 .../cache/wan/misc/WanAutoDiscoveryDUnitTest.java    |  5 ++---
 .../ParallelGatewaySenderOperationsDUnitTest.java    |  9 ++++-----
 .../ParallelGatewaySenderQueueOverflowDUnitTest.java |  3 +--
 ...lWANPersistenceEnabledGatewaySenderDUnitTest.java |  5 ++---
 .../ParallelWANPropagationClientServerDUnitTest.java |  3 +--
 ...ParallelWANPropagationConcurrentOpsDUnitTest.java |  3 +--
 .../parallel/ParallelWANPropagationDUnitTest.java    |  3 +--
 .../wan/parallel/ParallelWANStatsDUnitTest.java      |  3 +--
 ...ialGatewaySenderDistributedDeadlockDUnitTest.java |  2 +-
 .../SerialGatewaySenderEventListenerDUnitTest.java   |  3 +--
 .../SerialGatewaySenderOperationsDUnitTest.java      |  5 ++---
 .../serial/SerialGatewaySenderQueueDUnitTest.java    |  3 +--
 ...lWANPersistenceEnabledGatewaySenderDUnitTest.java |  3 +--
 .../wan/serial/SerialWANPropogationDUnitTest.java    |  3 +--
 ...ialWANPropogation_PartitionedRegionDUnitTest.java |  3 +--
 .../cache/wan/serial/SerialWANStatsDUnitTest.java    |  3 +--
 .../cache/wan/wancommand/WANCommandTestBase.java     |  7 +++----
 .../WanCommandCreateGatewayReceiverDUnitTest.java    |  5 ++---
 .../WanCommandGatewayReceiverStartDUnitTest.java     |  5 ++---
 .../WanCommandGatewayReceiverStopDUnitTest.java      |  5 ++---
 .../gemfire/management/WANManagementDUnitTest.java   |  7 +++----
 .../configuration/ClusterConfigurationDUnitTest.java |  9 +++++----
 .../internal/pulse/TestRemoteClusterDUnitTest.java   |  7 +++----
 90 files changed, 222 insertions(+), 306 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java
index 63235d4..c26282c 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataDUnitTest.java
@@ -38,12 +38,11 @@ import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
 import com.gemstone.gemfire.cache30.CacheTestCase;
 import com.gemstone.gemfire.cache30.CertifiableTestCacheListener;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
-
-import dunit.AsyncInvocation;
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * This class tests the ContiunousQuery mechanism in GemFire.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
index 2a44b3e..45f61f8 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataOptimizedExecuteDUnitTest.java
@@ -18,8 +18,7 @@ package com.gemstone.gemfire.cache.query.cq.dunit;
 
 
 import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
-
-import dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 
 /**
  * Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
index 245b6e4..5feb1b5 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolDUnitTest.java
@@ -57,11 +57,10 @@ import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.internal.cache.PoolFactoryImpl;
 import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
-
-import dunit.AsyncInvocation;
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * This class tests the ContiunousQuery mechanism in GemFire.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
index dd0adec..e157fb0 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqDataUsingPoolOptimizedExecuteDUnitTest.java
@@ -18,8 +18,7 @@ package com.gemstone.gemfire.cache.query.cq.dunit;
 
 
 import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
-
-import dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 
 /**
  * Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java
index 989fee0..cdc11f2 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfDUnitTest.java
@@ -35,10 +35,9 @@ import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
 import com.gemstone.gemfire.cache30.CacheTestCase;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * This class tests the ContiunousQuery mechanism in GemFire.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
index 5fd1998..059c8a0 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqPerfUsingPoolDUnitTest.java
@@ -35,10 +35,9 @@ import com.gemstone.gemfire.cache.query.internal.cq.InternalCqQuery;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
 import com.gemstone.gemfire.cache30.CacheTestCase;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * This class tests the ContiunousQuery mechanism in GemFire.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
index 5ee75e3..1ea2fdd 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryDUnitTest.java
@@ -64,11 +64,10 @@ import com.gemstone.gemfire.internal.cache.DistributedRegion;
 import com.gemstone.gemfire.internal.cache.DistributedTombstoneOperation;
 import com.gemstone.gemfire.internal.cache.EventID;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * This class tests the ContiunousQuery mechanism in GemFire.
@@ -2066,7 +2065,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
     try {
       createCQ(client, "testCQCreateClose_0", cqs[0]);
       fail("Trying to create CQ with same name. Should have thrown CQExistsException");
-    } catch (dunit.RMIException rmiExc) {
+    } catch (com.gemstone.gemfire.test.dunit.RMIException rmiExc) {
       Throwable cause = rmiExc.getCause();
       assertTrue("unexpected cause: " + cause.getClass().getName(), cause instanceof AssertionError);
       Throwable causeCause = cause.getCause(); // should be a CQExistsException
@@ -2081,7 +2080,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
     try {
       createCQ(server, "testCQCreateClose_1", cqs[0]);
       fail("Trying to create CQ on Cache Server. Should have thrown Exception.");
-    } catch (dunit.RMIException rmiExc) {
+    } catch (com.gemstone.gemfire.test.dunit.RMIException rmiExc) {
       Throwable cause = rmiExc.getCause();
       assertTrue("unexpected cause: " + cause.getClass().getName(), 
           cause instanceof AssertionError);
@@ -2095,7 +2094,7 @@ public class CqQueryDUnitTest extends CacheTestCase {
     try {
       executeCQ(client, "testCQCreateClose_2", false, "RegionNotFoundException");
       fail("Trying to create CQ on non-existing Region. Should have thrown Exception.");
-    } catch (dunit.RMIException rmiExc) {
+    } catch (com.gemstone.gemfire.test.dunit.RMIException rmiExc) {
       Throwable cause = rmiExc.getCause();
       if (!(cause instanceof AssertionError)) {
         getLogWriter().severe("Expected to see an AssertionError.", cause);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
index 8688057..54ec12d 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryOptimizedExecuteDUnitTest.java
@@ -24,10 +24,9 @@ import com.gemstone.gemfire.cache.query.internal.cq.CqServiceProvider;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
index 343b529..4988831 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolDUnitTest.java
@@ -66,11 +66,10 @@ import com.gemstone.gemfire.internal.cache.LocalRegion;
 import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier;
 import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy;
 import com.gemstone.gemfire.internal.cache.tier.sockets.ClientProxyMembershipID;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * This class tests the ContiunousQuery mechanism in GemFire.
@@ -1783,7 +1782,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
     try {
       createCQ(client, poolName, "testCQCreateClose_0", cqs[0]);
       fail("Trying to create CQ with same name. Should have thrown CQExistsException");
-    } catch (dunit.RMIException rmiExc) {
+    } catch (com.gemstone.gemfire.test.dunit.RMIException rmiExc) {
       Throwable cause = rmiExc.getCause();
       assertTrue("unexpected cause: " + cause.getClass().getName(), cause instanceof AssertionError);
       Throwable causeCause = cause.getCause(); // should be a CQExistsException
@@ -1798,7 +1797,7 @@ public class CqQueryUsingPoolDUnitTest extends CacheTestCase {
     try {
       createCQ(server, "testCQCreateClose_1", cqs[0]);
       fail("Trying to create CQ on Cache Server. Should have thrown Exception.");
-    } catch (dunit.RMIException rmiExc) {
+    } catch (com.gemstone.gemfire.test.dunit.RMIException rmiExc) {
       Throwable cause = rmiExc.getCause();
       assertTrue("unexpected cause: " + cause.getClass().getName(), 
           cause instanceof AssertionError);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
index acfb473..07c1650 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqQueryUsingPoolOptimizedExecuteDUnitTest.java
@@ -17,8 +17,7 @@
 package com.gemstone.gemfire.cache.query.cq.dunit;
 
 import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
-
-import dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 
 /**
  * Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
index 2346e91..de349a5 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolDUnitTest.java
@@ -32,10 +32,9 @@ import com.gemstone.gemfire.cache.query.internal.index.IndexManager;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
 import com.gemstone.gemfire.cache30.CacheTestCase;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * This class tests the ContiunousQuery mechanism in GemFire.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
index 14affa6..74351b0 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqResultSetUsingPoolOptimizedExecuteDUnitTest.java
@@ -30,10 +30,9 @@ import com.gemstone.gemfire.cache.query.internal.cq.ServerCQImpl;
 import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 public class CqResultSetUsingPoolOptimizedExecuteDUnitTest extends CqResultSetUsingPoolDUnitTest{
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
index 56d8f77..6d6213b 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStateDUnitTest.java
@@ -21,12 +21,11 @@ import java.util.Properties;
 import com.gemstone.gemfire.cache.query.CqQuery;
 import com.gemstone.gemfire.cache.query.dunit.HelperTestCase;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
-
-import dunit.AsyncInvocation;
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableCallable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 public class CqStateDUnitTest extends HelperTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
index 2109e24..8f3c260 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsDUnitTest.java
@@ -34,10 +34,9 @@ import com.gemstone.gemfire.cache.query.internal.cq.CqServiceVsdStats;
 import com.gemstone.gemfire.cache.query.internal.cq.InternalCqQuery;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
 import com.gemstone.gemfire.cache30.CacheTestCase;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * This class tests the ContiunousQuery mechanism in GemFire.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
index fdb46c3..f52d655 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsOptimizedExecuteDUnitTest.java
@@ -18,8 +18,7 @@ package com.gemstone.gemfire.cache.query.cq.dunit;
 
 import com.gemstone.gemfire.cache.query.internal.cq.CqService;
 import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
-
-import dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 
 /**
  * Test class for testing {@link CqService#EXECUTE_QUERY_DURING_INIT} flag

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
index 249f3da..1210426 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
@@ -34,10 +34,9 @@ import com.gemstone.gemfire.cache.query.internal.cq.CqServiceVsdStats;
 import com.gemstone.gemfire.cache.query.internal.cq.InternalCqQuery;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
 import com.gemstone.gemfire.cache30.CacheTestCase;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * This class tests the ContiunousQuery mechanism in GemFire.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
index 9769ddd..8723eb3 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
@@ -18,8 +18,7 @@ package com.gemstone.gemfire.cache.query.cq.dunit;
 
 import com.gemstone.gemfire.cache.query.internal.cq.CqService;
 import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
-
-import dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 
 /**
  * Test class for testing {@link CqService#EXECUTE_QUERY_DURING_INIT} flag

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqTimeTestListener.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqTimeTestListener.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqTimeTestListener.java
index cd75e97..23d0728 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqTimeTestListener.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqTimeTestListener.java
@@ -25,9 +25,8 @@ import com.gemstone.gemfire.cache.Operation;
 import com.gemstone.gemfire.cache.query.CqEvent;
 import com.gemstone.gemfire.cache.query.CqListener;
 import com.gemstone.gemfire.cache.query.data.Portfolio;
-
-import dunit.DistributedTestCase;
-import dunit.DistributedTestCase.WaitCriterion;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
 
 /**
  * @author anil.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
index a236909..360c0d9 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryDUnitTest.java
@@ -46,10 +46,9 @@ import com.gemstone.gemfire.cache30.ClientServerTestCase;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
 import com.gemstone.gemfire.cache30.CacheTestCase;
 import com.gemstone.gemfire.internal.cache.LocalRegion;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 /**
  * Test class for Partitioned Region and CQs
  * 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
index 4bbc5e7..e5544b7 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PartitionedRegionCqQueryOptimizedExecuteDUnitTest.java
@@ -23,10 +23,9 @@ import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
 import com.gemstone.gemfire.cache.query.internal.cq.CqServiceProvider;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 public class PartitionedRegionCqQueryOptimizedExecuteDUnitTest extends PartitionedRegionCqQueryDUnitTest{
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
index c8e502f..80cd738 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolDUnitTest.java
@@ -40,12 +40,11 @@ import com.gemstone.gemfire.cache.query.Struct;
 import com.gemstone.gemfire.cache.query.data.Portfolio;
 import com.gemstone.gemfire.cache.server.CacheServer;
 import com.gemstone.gemfire.cache30.ClientServerTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
 import com.gemstone.gemfire.cache30.CacheTestCase;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
 /**
  * Test class for Partitioned Region and CQs
  * 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
index c890c87..5db4b22 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/PrCqUsingPoolOptimizedExecuteDUnitTest.java
@@ -17,8 +17,7 @@
 package com.gemstone.gemfire.cache.query.cq.dunit;
 
 import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
-
-import dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 
 /**
  * Test class for testing {@link CqServiceImpl#EXECUTE_QUERY_DURING_INIT} flag

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java
index 15a74ce..8abed40 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQDUnitTest.java
@@ -35,12 +35,12 @@ import com.gemstone.gemfire.cache.query.Struct;
 import com.gemstone.gemfire.cache.query.cq.dunit.CqQueryTestListener;
 import com.gemstone.gemfire.cache.query.dunit.PdxQueryCQTestBase.TestObject;
 import com.gemstone.gemfire.cache30.ClientServerTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
 
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
-import dunit.DistributedTestCase.WaitCriterion;
 
 public class PdxQueryCQDUnitTest extends PdxQueryCQTestBase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
index 7129f62..3637dce 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/PdxQueryCQTestBase.java
@@ -35,15 +35,10 @@ import com.gemstone.gemfire.cache.Scope;
 import com.gemstone.gemfire.cache.client.PoolFactory;
 import com.gemstone.gemfire.cache.client.PoolManager;
 import com.gemstone.gemfire.cache.query.CacheUtils;
-import com.gemstone.gemfire.cache.query.CqAttributes;
-import com.gemstone.gemfire.cache.query.CqEvent;
-import com.gemstone.gemfire.cache.query.CqListener;
-import com.gemstone.gemfire.cache.query.CqQuery;
 import com.gemstone.gemfire.cache.query.Query;
 import com.gemstone.gemfire.cache.query.QueryService;
 import com.gemstone.gemfire.cache.query.SelectResults;
 import com.gemstone.gemfire.cache.query.Struct;
-import com.gemstone.gemfire.cache.query.cq.dunit.CqQueryTestListener;
 import com.gemstone.gemfire.cache.query.data.PortfolioPdx;
 import com.gemstone.gemfire.cache.query.data.PositionPdx;
 import com.gemstone.gemfire.cache.server.CacheServer;
@@ -56,10 +51,9 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.pdx.PdxReader;
 import com.gemstone.gemfire.pdx.PdxSerializable;
 import com.gemstone.gemfire.pdx.PdxWriter;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 public abstract class PdxQueryCQTestBase extends CacheTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
index 8f80f48..a39f5e8 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryIndexUpdateRIDUnitTest.java
@@ -40,14 +40,13 @@ import com.gemstone.gemfire.cache.query.internal.QueryObserverAdapter;
 import com.gemstone.gemfire.cache.query.internal.QueryObserverHolder;
 import com.gemstone.gemfire.cache.server.CacheServer;
 import com.gemstone.gemfire.cache30.ClientServerTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
 import com.gemstone.gemfire.cache30.CacheTestCase;
 import com.gemstone.gemfire.cache30.CertifiableTestCacheListener;
 
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
-
 /**
  * This class tests register interest behavior on client at startup given that
  * client has already created a Index on region on which it registers interest.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
index f421273..14884bd 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/dunit/QueryMonitorDUnitTest.java
@@ -48,12 +48,11 @@ import com.gemstone.gemfire.distributed.internal.DistributionConfigImpl;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
 import com.gemstone.gemfire.cache30.CacheTestCase;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-
-import dunit.AsyncInvocation;
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * Tests for QueryMonitoring service.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
index 5ccaeb3..cc053fc 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/snapshot/ClientSnapshotDUnitTest.java
@@ -40,9 +40,8 @@ import com.gemstone.gemfire.cache.util.CacheWriterAdapter;
 import com.gemstone.gemfire.cache.util.CqListenerAdapter;
 import com.gemstone.gemfire.cache30.CacheTestCase;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
-
-import dunit.Host;
-import dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
 
 public class ClientSnapshotDUnitTest extends CacheTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
index 4810e28..f77f845 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PRDeltaPropagationDUnitTest.java
@@ -56,11 +56,10 @@ import com.gemstone.gemfire.internal.AvailablePort;
 import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientNotifier;
 import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy;
 import com.gemstone.gemfire.internal.cache.tier.sockets.ConflationDUnitTest;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
index 3737ffb..cd2a26e 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/PutAllCSDUnitTest.java
@@ -75,13 +75,12 @@ import com.gemstone.gemfire.internal.AvailablePort;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.internal.cache.versions.VersionTag;
 import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-
-import dunit.AsyncInvocation;
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableCallable;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * Tests putAll for c/s. Also tests removeAll

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
index 0f089c5..3722afb 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/RemoteCQTransactionDUnitTest.java
@@ -69,10 +69,9 @@ import com.gemstone.gemfire.internal.cache.execute.data.CustId;
 import com.gemstone.gemfire.internal.cache.execute.data.Customer;
 import com.gemstone.gemfire.internal.cache.execute.data.Order;
 import com.gemstone.gemfire.internal.cache.execute.data.OrderId;
-
-import dunit.Host;
-import dunit.SerializableCallable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * @author sbawaska

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
index 4bce2ac..f5f1fc1 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/CQListGIIDUnitTest.java
@@ -58,9 +58,9 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.ConflationDUnitTest;
 import com.gemstone.gemfire.internal.cache.InternalRegionArguments;
 import com.gemstone.gemfire.internal.cache.LocalRegion;
 
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
index 2f64285..ddc907c 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/ha/HADispatcherDUnitTest.java
@@ -54,10 +54,9 @@ import com.gemstone.gemfire.internal.cache.tier.sockets.CacheClientProxy;
 import com.gemstone.gemfire.internal.cache.tier.sockets.CacheServerTestUtil;
 import com.gemstone.gemfire.internal.cache.tier.sockets.ConflationDUnitTest;
 import com.gemstone.gemfire.internal.cache.tier.sockets.HAEventWrapper;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * This Dunit test is to verify that when the dispatcher of CS dispatches the

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
index 968eda9..d04d249 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/ClientToServerDeltaDUnitTest.java
@@ -50,10 +50,9 @@ import com.gemstone.gemfire.internal.AvailablePort;
 import com.gemstone.gemfire.internal.cache.CacheServerImpl;
 import com.gemstone.gemfire.internal.cache.LocalRegion;
 import com.gemstone.gemfire.internal.cache.PartitionedRegionLocalMaxMemoryDUnitTest.TestObject1;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * Test client to server flow for delta propogation

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
index 382b056..2e7efe7 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java
@@ -52,10 +52,9 @@ import com.gemstone.gemfire.internal.AvailablePort;
 import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.internal.cache.CacheServerImpl;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * @author ashetkar

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
index 6902619..ed7232f 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DeltaToRegionRelationCQRegistrationDUnitTest.java
@@ -42,11 +42,10 @@ import com.gemstone.gemfire.distributed.DistributedSystem;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.AvailablePort;
 import com.gemstone.gemfire.internal.cache.CacheServerImpl;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.VM;
-import dunit.DistributedTestCase.WaitCriterion;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase.WaitCriterion;
 /**
  * This tests the flag setting for region ( DataPolicy as Empty ) for
  * Delta propogation for a client while registering CQ

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
index 7771e67..04ce137 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientSimpleDUnitTest.java
@@ -41,12 +41,11 @@ import com.gemstone.gemfire.internal.cache.ClientServerObserver;
 import com.gemstone.gemfire.internal.cache.ClientServerObserverAdapter;
 import com.gemstone.gemfire.internal.cache.ClientServerObserverHolder;
 import com.gemstone.gemfire.internal.cache.PoolFactoryImpl;
-import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
-
-import dunit.AsyncInvocation;
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.VM;
+import com.gemstone.gemfire.internal.i18n.LocalizedStrings;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.VM;
 
 public class DurableClientSimpleDUnitTest extends DurableClientTestCase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
index 98e0624..c3a3482 100755
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/DurableClientTestCase.java
@@ -62,10 +62,9 @@ import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.internal.cache.InternalCache;
 import com.gemstone.gemfire.internal.cache.PoolFactoryImpl;
 import com.gemstone.gemfire.internal.cache.ha.HARegionQueue;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * Class <code>DurableClientTestCase</code> tests durable client

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
index bc9c6a9..58c682b 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/CacheServerManagementDUnitTest.java
@@ -49,11 +49,10 @@ import com.gemstone.gemfire.management.internal.JmxManagerLocatorRequest;
 import com.gemstone.gemfire.management.internal.JmxManagerLocatorResponse;
 import com.gemstone.gemfire.management.internal.MBeanJMXAdapter;
 import com.gemstone.gemfire.management.internal.SystemManagementService;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * Cache Server related management test cases

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
index 5908c5f..d1d9559 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ClientCommandsDUnitTest.java
@@ -63,12 +63,12 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
 import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
 import com.gemstone.gemfire.management.internal.cli.result.CompositeResultData;
 import com.gemstone.gemfire.management.internal.cli.result.CompositeResultData.SectionResultData;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.management.internal.cli.result.TabularResultData;
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableCallable;
-import dunit.SerializableRunnable;
-import dunit.VM;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
index 6010f38..89c7d5e 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DurableClientCommandsDUnitTest.java
@@ -44,10 +44,9 @@ import com.gemstone.gemfire.management.cli.Result.Status;
 import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
 import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
 import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
-
-import dunit.Host;
-import dunit.SerializableCallable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java
index 0497305..131cbcd 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestCQDUnitTest.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.management.DistributedSystemMXBean;
 import com.gemstone.gemfire.management.ManagementService;
 import com.gemstone.gemfire.management.ManagementTestBase;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * This is for testing continuous query.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java
index 9fff40d..814e07e 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestClientsDUnitTest.java
@@ -21,8 +21,7 @@ import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.management.DistributedSystemMXBean;
 import com.gemstone.gemfire.management.ManagementService;
 import com.gemstone.gemfire.management.ManagementTestBase;
-
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * This is for testing Number of clients and can be extended for relevant test

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java
index d53e085..6475fa5 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/management/internal/pulse/TestServerDUnitTest.java
@@ -21,7 +21,7 @@ import com.gemstone.gemfire.internal.AvailablePortHelper;
 import com.gemstone.gemfire.management.DistributedSystemMXBean;
 import com.gemstone.gemfire.management.ManagementService;
 import com.gemstone.gemfire.management.ManagementTestBase;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * This is for testing server count details from MBean

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java
index bd6529a..7725ef6 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthorizationTwoDUnitTest.java
@@ -17,8 +17,7 @@
 package com.gemstone.gemfire.security;
 
 import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode;
-
-import dunit.Host;
+import com.gemstone.gemfire.test.dunit.Host;
 
 /**
  * Tests for authorization from client to server. This tests for authorization

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
index 3fe7652..58f26bb 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientAuthzObjectModDUnitTest.java
@@ -32,10 +32,9 @@ import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.AvailablePort;
 import com.gemstone.gemfire.internal.security.ObjectWithAuthz;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 
 /**
  * Tests for authorization callback that modify objects and callbacks from

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java
index 6115f17..2854c24 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientCQPostAuthorizationDUnitTest.java
@@ -42,10 +42,9 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.internal.AvailablePort;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.internal.logging.InternalLogWriter;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 /**
  * This is for multiuser-authentication
  * 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
index 4ae7430..bd22dfb 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/ClientPostAuthorizationDUnitTest.java
@@ -26,8 +26,7 @@ import security.AuthzCredentialGenerator;
 import security.CredentialGenerator;
 import com.gemstone.gemfire.cache.operations.OperationContext.OperationCode;
 import com.gemstone.gemfire.internal.AvailablePort;
-
-import dunit.Host;
+import com.gemstone.gemfire.test.dunit.Host;
 
 /**
  * Tests for authorization from client to server. This tests for authorization

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java
index 57f649e..26f2e31 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserAPIDUnitTest.java
@@ -36,9 +36,9 @@ import com.gemstone.gemfire.cache.query.Query;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.internal.cache.PoolManagerImpl;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.VM;
 
-import dunit.Host;
-import dunit.VM;
 import security.DummyCredentialGenerator;
 
 public class MultiuserAPIDUnitTest extends ClientAuthorizationTestBase {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java
index c44683f..675f8c6 100644
--- a/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/security/MultiuserDurableCQAuthzDUnitTest.java
@@ -38,9 +38,8 @@ import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.internal.AvailablePort;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.internal.logging.InternalLogWriter;
-
-import dunit.Host;
-import dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 
 /**
  * @author ashetkar

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
index 065ba6c..70ecac5 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
@@ -53,12 +53,11 @@ import com.gemstone.gemfire.internal.cache.versions.VersionSource;
 import com.gemstone.gemfire.internal.cache.versions.VersionStamp;
 import com.gemstone.gemfire.internal.cache.versions.VersionTag;
 import com.gemstone.gemfire.internal.cache.wan.InternalGatewaySenderFactory;
-
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.SerializableCallable;
-import dunit.SerializableRunnable;
-import dunit.VM;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
 
 /**
  * @author Shobhit Agarwal

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
index e3c3a89..230c8d8 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
@@ -113,11 +113,11 @@ import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelGatewaySenderEve
 import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelGatewaySenderQueue;
 import com.gemstone.gemfire.pdx.SimpleClass;
 import com.gemstone.gemfire.pdx.SimpleClass1;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.VM;
 import com.gemstone.gemfire.util.test.TestUtil;
 
-import dunit.DistributedTestCase;
-import dunit.Host;
-import dunit.VM;
 import junit.framework.Assert;
 
 public class WANTestBase extends DistributedTestCase{

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
index b2e2fd2..c14af54 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
@@ -24,12 +24,11 @@ import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
 import com.gemstone.gemfire.internal.cache.wan.BatchException70;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
 import com.gemstone.gemfire.internal.cache.wan.parallel.ConcurrentParallelGatewaySenderEventProcessor;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
 
 import java.net.SocketException;
 import java.util.Set;
 
-import dunit.AsyncInvocation;
-
 /**
  * Test the functionality of ParallelGatewaySender with multiple dispatchers.
  * @author skumar

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
index 216c76a..e0775b7 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
@@ -18,8 +18,7 @@ package com.gemstone.gemfire.internal.cache.wan.concurrent;
 
 import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
 
 /**
  * @author skumar

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
index be8c3ac..f770062 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
@@ -21,9 +21,8 @@ import com.gemstone.gemfire.cache.RegionDestroyedException;
 import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
 import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
-import dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
 /**
  * @author skumar
  *

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
index 3126c4e..b709334 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
@@ -21,8 +21,8 @@ import java.util.Set;
 import com.gemstone.gemfire.cache.wan.GatewaySender;
 import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
 import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
-import dunit.AsyncInvocation;
 
 /**
  * @author skumar

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java
index 7066fc5..804c3ed 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java
@@ -23,8 +23,7 @@ import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
 import com.gemstone.gemfire.internal.cache.wan.BatchException70;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
 
 /**
  * All the test cases are similar to SerialWANPropogationDUnitTest except that

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java
index 1700664..9bcc72b 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java
@@ -23,8 +23,7 @@ import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy;
 import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase.MyGatewayEventFilter;
-
-import dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
 
 /**
  * All the test cases are similar to SerialWANPropogationDUnitTest except that

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
index 242dfbe..ca68454 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
@@ -20,9 +20,8 @@ import com.gemstone.gemfire.CancelException;
 import com.gemstone.gemfire.cache.CacheClosedException;
 import com.gemstone.gemfire.internal.cache.ForceReattemptException;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
-import dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
 
 public class DistTXWANDUnitTest extends WANTestBase {
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
index d2b6595..39e3fed 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
@@ -25,9 +25,8 @@ import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
 import com.gemstone.gemfire.internal.cache.wan.parallel.ConcurrentParallelGatewaySenderEventProcessor;
 import com.gemstone.gemfire.internal.cache.wan.parallel.ConcurrentParallelGatewaySenderQueue;
 import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelGatewaySenderQueue;
-
-import dunit.AsyncInvocation;
-import dunit.DistributedTestCase;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase;
 
 import java.util.Set;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
index 68be55b..62ed047 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
@@ -30,8 +30,7 @@ import com.gemstone.gemfire.internal.cache.RegionEntry;
 import com.gemstone.gemfire.internal.cache.Token.Tombstone;
 import com.gemstone.gemfire.internal.cache.versions.VersionTag;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
 
 /**
  * @author shobhit

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java
index b4d4f2f..0393e82 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java
@@ -19,8 +19,7 @@ package com.gemstone.gemfire.internal.cache.wan.misc;
 import com.gemstone.gemfire.cache.CacheWriterException;
 import com.gemstone.gemfire.cache.client.ServerOperationException;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
 
 public class PDXNewWanDUnitTest extends WANTestBase{
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/27d965d9/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
index e9d9a2c..7d3da8b 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
@@ -20,9 +20,8 @@ import com.gemstone.gemfire.cache.CacheClosedException;
 import com.gemstone.gemfire.cache.DataPolicy;
 import com.gemstone.gemfire.cache.Scope;
 import com.gemstone.gemfire.internal.cache.wan.WANTestBase;
-
-import dunit.AsyncInvocation;
-import dunit.DistributedTestCase.ExpectedException;
+import com.gemstone.gemfire.test.dunit.AsyncInvocation;
+import com.gemstone.gemfire.test.dunit.DistributedTestCase.ExpectedException;
 
 public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBase {
   


[57/70] incubator-geode git commit: GEODE-803: Updating headers on WAN and CQ code

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/RemoteSerialGatewaySenderEventProcessor.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/RemoteSerialGatewaySenderEventProcessor.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/RemoteSerialGatewaySenderEventProcessor.java
index ea02870..56f3b39 100644
--- a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/RemoteSerialGatewaySenderEventProcessor.java
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/RemoteSerialGatewaySenderEventProcessor.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.internal.cache.wan.serial;
 
 import org.apache.logging.log4j.Logger;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderImpl.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderImpl.java b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderImpl.java
index ad89c22..8f0070f 100644
--- a/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderImpl.java
+++ b/gemfire-wan/src/main/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialGatewaySenderImpl.java
@@ -1,12 +1,19 @@
 /*
- * =========================================================================
- * Copyright (c) 2002-2014 Pivotal Software, Inc. All Rights Reserved. 
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * more patents listed at http://www.pivotal.io/patents.
- * ========================================================================
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
-
 package com.gemstone.gemfire.internal.cache.wan.serial;
 import org.apache.logging.log4j.Logger;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/main/resources/.keepme
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/resources/.keepme b/gemfire-wan/src/main/resources/.keepme
deleted file mode 100644
index e69de29..0000000

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/main/resources/META-INF/services/com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListener
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/resources/META-INF/services/com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListener b/gemfire-wan/src/main/resources/META-INF/services/com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListener
index ce96f96..f2aa900 100644
--- a/gemfire-wan/src/main/resources/META-INF/services/com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListener
+++ b/gemfire-wan/src/main/resources/META-INF/services/com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListener
@@ -1 +1,15 @@
-com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListenerImpl
\ No newline at end of file
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+com.gemstone.gemfire.cache.client.internal.locator.wan.LocatorMembershipListenerImpl

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.wan.spi.WANFactory
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.wan.spi.WANFactory b/gemfire-wan/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.wan.spi.WANFactory
index 4d47e35..f4d7aba 100644
--- a/gemfire-wan/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.wan.spi.WANFactory
+++ b/gemfire-wan/src/main/resources/META-INF/services/com.gemstone.gemfire.internal.cache.wan.spi.WANFactory
@@ -1 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 com.gemstone.gemfire.cache.client.internal.locator.wan.WANFactoryImpl

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/cache/CacheXml70GatewayDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/cache/CacheXml70GatewayDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/cache/CacheXml70GatewayDUnitTest.java
index 1a0007c..e9a47e2 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/cache/CacheXml70GatewayDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/cache/CacheXml70GatewayDUnitTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.cache;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/cache/CacheXml80GatewayDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/cache/CacheXml80GatewayDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/cache/CacheXml80GatewayDUnitTest.java
index 54a84d6..9495171 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/cache/CacheXml80GatewayDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/cache/CacheXml80GatewayDUnitTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.cache;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java
index 4ee46d1..be771bc 100755
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/codeAnalysis/AnalyzeWANSerializablesJUnitTest.java
@@ -1,82 +1,91 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-package com.gemstone.gemfire.codeAnalysis;
-
-import static org.junit.Assert.fail;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.junit.AfterClass;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.experimental.categories.Category;
-
-import com.gemstone.gemfire.codeAnalysis.decode.CompiledClass;
-import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
-import com.gemstone.gemfire.util.test.TestUtil;
-
-/**
- * @author bruces
- * 
- */
-@Category(IntegrationTest.class)
-public class AnalyzeWANSerializablesJUnitTest extends AnalyzeSerializablesJUnitTest {
-  
-  @Before
-  public void loadClasses() throws Exception {
-    if (classes.size() > 0) {
-      return;
-    }
-    System.out.println("loadClasses starting");
-    List<String> excludedClasses = loadExcludedClasses(new File(TestUtil.getResourcePath(AnalyzeWANSerializablesJUnitTest.class, "excludedClasses.txt")));
-    List<String> openBugs = loadOpenBugs(new File(TestUtil.getResourcePath(AnalyzeWANSerializablesJUnitTest.class, "openBugs.txt")));
-    excludedClasses.addAll(openBugs);
-    
-    String cp = System.getProperty("java.class.path");
-    System.out.println("java classpath is " + cp);
-    System.out.flush();
-    String[] entries = cp.split(File.pathSeparator);
-    String buildDirName =
-         "gemfire-wan"+File.separatorChar
-        +"build"+File.separatorChar
-        +"classes"+File.separatorChar
-        +"main";
-    String buildDir = null;
-    
-    for (int i=0; i<entries.length  &&  buildDir==null; i++) {
-      System.out.println("examining '" + entries[i] + "'");
-      System.out.flush();
-      if (entries[i].endsWith(buildDirName)) {
-        buildDir = entries[i];
-      }
-    }
-    if (buildDir != null) {
-      System.out.println("loading class files from " + buildDir);
-      System.out.flush();
-      long start = System.currentTimeMillis();
-      loadClassesFromBuild(new File(buildDir), excludedClasses);
-      long finish = System.currentTimeMillis();
-      System.out.println("done loading " + classes.size() + " classes.  elapsed time = "
-          + (finish-start)/1000 + " seconds");
-    }
-    else {
-      fail("unable to find WAN classes");
-    }
-  }
-  
-  @AfterClass
-  public static void cleanup() {
-    if (classes != null) {
-      classes.clear();
-    }
-  }
-  
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.codeAnalysis;
+
+import static org.junit.Assert.fail;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.junit.AfterClass;
+import org.junit.Assume;
+import org.junit.Before;
+import org.junit.experimental.categories.Category;
+
+import com.gemstone.gemfire.codeAnalysis.decode.CompiledClass;
+import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
+import com.gemstone.gemfire.util.test.TestUtil;
+
+/**
+ * @author bruces
+ * 
+ */
+@Category(IntegrationTest.class)
+public class AnalyzeWANSerializablesJUnitTest extends AnalyzeSerializablesJUnitTest {
+  
+  @Before
+  public void loadClasses() throws Exception {
+    if (classes.size() > 0) {
+      return;
+    }
+    System.out.println("loadClasses starting");
+    List<String> excludedClasses = loadExcludedClasses(new File(TestUtil.getResourcePath(AnalyzeWANSerializablesJUnitTest.class, "excludedClasses.txt")));
+    List<String> openBugs = loadOpenBugs(new File(TestUtil.getResourcePath(AnalyzeWANSerializablesJUnitTest.class, "openBugs.txt")));
+    excludedClasses.addAll(openBugs);
+    
+    String cp = System.getProperty("java.class.path");
+    System.out.println("java classpath is " + cp);
+    System.out.flush();
+    String[] entries = cp.split(File.pathSeparator);
+    String buildDirName =
+         "gemfire-wan"+File.separatorChar
+        +"build"+File.separatorChar
+        +"classes"+File.separatorChar
+        +"main";
+    String buildDir = null;
+    
+    for (int i=0; i<entries.length  &&  buildDir==null; i++) {
+      System.out.println("examining '" + entries[i] + "'");
+      System.out.flush();
+      if (entries[i].endsWith(buildDirName)) {
+        buildDir = entries[i];
+      }
+    }
+    if (buildDir != null) {
+      System.out.println("loading class files from " + buildDir);
+      System.out.flush();
+      long start = System.currentTimeMillis();
+      loadClassesFromBuild(new File(buildDir), excludedClasses);
+      long finish = System.currentTimeMillis();
+      System.out.println("done loading " + classes.size() + " classes.  elapsed time = "
+          + (finish-start)/1000 + " seconds");
+    }
+    else {
+      fail("unable to find WAN classes");
+    }
+  }
+  
+  @AfterClass
+  public static void cleanup() {
+    if (classes != null) {
+      classes.clear();
+    }
+  }
+  
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
index cb34278..065ba6c 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/UpdateVersionDUnitTest.java
@@ -1,12 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.gopivotal.com/patents.
- *=========================================================================
- */
-/**
- * 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
index 84b4395..e3c3a89 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
index aac9444..b2e2fd2 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
@@ -1,12 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-/**
- * 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.concurrent;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDUnitTest.java
index e49216b..4edf515 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOffHeapDUnitTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.internal.cache.wan.concurrent;
 
 @SuppressWarnings("serial")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
index 9b78a8f..216c76a 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
@@ -1,12 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-/**
- * 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.concurrent;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
index ccda683..be8c3ac 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java
@@ -1,12 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-/**
- * 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.concurrent;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
index 2105cef..3126c4e 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsDUnitTest.java
@@ -1,12 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-/**
- * 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.concurrent;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest.java
index 5d135d5..e24f593 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentSerialGatewaySenderOperationsOffHeapDUnitTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.internal.cache.wan.concurrent;
 
 @SuppressWarnings("serial")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java
index 447f5ea..7066fc5 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java
@@ -1,12 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-/**
- * 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.concurrent;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java
index 3f95552..1700664 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java
@@ -1,12 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-/**
- * 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.concurrent;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
index 057f89b..242dfbe 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.internal.cache.wan.disttx;
 
 import com.gemstone.gemfire.CancelException;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
index eea4f81..d2b6595 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java
@@ -1,12 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-/**
- * 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.misc;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderOffHeapDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderOffHeapDUnitTest.java
index fe21691..df7f08f 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderOffHeapDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderOffHeapDUnitTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.internal.cache.wan.misc;
 
 @SuppressWarnings("serial")

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
index 4cff68d..68be55b 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java
@@ -1,12 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
- */
-/**
- * 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.misc;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java
index cf78e24..b4d4f2f 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/PDXNewWanDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.misc;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
index e25f179..e9d9a2c 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.misc;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java
index 1c073f9..13fd228 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.misc;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
index 4e15ab7..03b1354 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/SenderWithTransportFilterDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.misc;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
index 211f726..53243eb 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.misc;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java
index 6566152..cb4907b 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANConfigurationJUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.misc;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
index 365559f..9f003b4 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.misc;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
index d242ab9..7f582f3 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.internal.cache.wan.misc;
 
 import com.gemstone.gemfire.cache.Region;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
index 82cfd62..848bf4f 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.misc;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
index 8995dae..af1b69d 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanValidationsDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.misc;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDUnitTest.java
index 8d0cd74..7143ca0 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderOperationsOffHeapDUnitTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.internal.cache.wan.offheap;
 
 import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelGatewaySenderOperationsDUnitTest;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderQueueOverflowOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderQueueOverflowOffHeapDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderQueueOverflowOffHeapDUnitTest.java
index b39357e..8da0d92 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderQueueOverflowOffHeapDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelGatewaySenderQueueOverflowOffHeapDUnitTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.internal.cache.wan.offheap;
 
 import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelGatewaySenderQueueOverflowDUnitTest;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANConflationOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANConflationOffHeapDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANConflationOffHeapDUnitTest.java
index cb47727..3b75b2b 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANConflationOffHeapDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANConflationOffHeapDUnitTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.internal.cache.wan.offheap;
 
 import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelWANConflationDUnitTest;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
index eab2949..55f5307 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.internal.cache.wan.offheap;
 
 import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelWANPersistenceEnabledGatewaySenderDUnitTest;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANPropogationConcurrentOpsOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANPropogationConcurrentOpsOffHeapDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANPropogationConcurrentOpsOffHeapDUnitTest.java
index 5ef5671..fa8d75d 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANPropogationConcurrentOpsOffHeapDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANPropogationConcurrentOpsOffHeapDUnitTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.internal.cache.wan.offheap;
 
 import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelWANPropagationConcurrentOpsDUnitTest;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANPropogationOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANPropogationOffHeapDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANPropogationOffHeapDUnitTest.java
index 71ef229..49afd57 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANPropogationOffHeapDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/ParallelWANPropogationOffHeapDUnitTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.internal.cache.wan.offheap;
 
 import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelWANPropagationDUnitTest;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialGatewaySenderQueueOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialGatewaySenderQueueOffHeapDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialGatewaySenderQueueOffHeapDUnitTest.java
index 13fbf03..aeed0aa 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialGatewaySenderQueueOffHeapDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialGatewaySenderQueueOffHeapDUnitTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.internal.cache.wan.offheap;
 
 import com.gemstone.gemfire.internal.cache.wan.serial.SerialGatewaySenderQueueDUnitTest;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
index cec3fa3..cb5c207 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPersistenceEnabledGatewaySenderOffHeapDUnitTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.internal.cache.wan.offheap;
 
 import com.gemstone.gemfire.internal.cache.wan.serial.SerialWANPersistenceEnabledGatewaySenderDUnitTest;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPropogationOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPropogationOffHeapDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPropogationOffHeapDUnitTest.java
index d61bed7..1bcb879 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPropogationOffHeapDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPropogationOffHeapDUnitTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.internal.cache.wan.offheap;
 
 import com.gemstone.gemfire.internal.cache.wan.serial.SerialWANPropogationDUnitTest;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPropogation_PartitionedRegionOffHeapDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPropogation_PartitionedRegionOffHeapDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPropogation_PartitionedRegionOffHeapDUnitTest.java
index 6dd805d..a689eef 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPropogation_PartitionedRegionOffHeapDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/offheap/SerialWANPropogation_PartitionedRegionOffHeapDUnitTest.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.gemstone.gemfire.internal.cache.wan.offheap;
 
 import com.gemstone.gemfire.internal.cache.wan.serial.SerialWANPropogation_PartitionedRegionDUnitTest;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
index cd25f16..871e6d1 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.parallel;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0979936e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
index ee8b5d6..8c8233a 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java
@@ -1,9 +1,18 @@
-/*=========================================================================
- * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
- * This product is protected by U.S. and international copyright
- * and intellectual property laws. Pivotal products are covered by
- * one or more patents listed at http://www.pivotal.io/patents.
- *=========================================================================
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.gemstone.gemfire.internal.cache.wan.parallel;
 


[40/70] [partial] incubator-geode git commit: WAN and CQ code drop under the Pivotal SGA

Posted by up...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
new file mode 100644
index 0000000..47a3fe7
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolDUnitTest.java
@@ -0,0 +1,444 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.query.cq.dunit;
+
+import java.util.Collection;
+
+import com.gemstone.gemfire.cache.CacheException;
+import com.gemstone.gemfire.cache.query.CqException;
+import com.gemstone.gemfire.cache.query.CqQuery;
+import com.gemstone.gemfire.cache.query.CqServiceStatistics;
+import com.gemstone.gemfire.cache.query.CqStatistics;
+import com.gemstone.gemfire.cache.query.QueryService;
+import com.gemstone.gemfire.cache.query.internal.CqQueryVsdStats;
+import com.gemstone.gemfire.cache.query.internal.CqStateImpl;
+import com.gemstone.gemfire.cache.query.internal.DefaultQueryService;
+import com.gemstone.gemfire.cache.query.internal.cq.CqQueryImpl;
+import com.gemstone.gemfire.cache.query.internal.cq.CqService;
+import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
+import com.gemstone.gemfire.cache.query.internal.cq.CqServiceVsdStats;
+import com.gemstone.gemfire.cache.query.internal.cq.InternalCqQuery;
+import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
+import com.gemstone.gemfire.cache30.CacheTestCase;
+
+import dunit.Host;
+import dunit.SerializableRunnable;
+import dunit.VM;
+
+/**
+ * This class tests the ContiunousQuery mechanism in GemFire.
+ * This includes the test with different data activities.
+ *
+ * @author Rao
+ */
+public class CqStatsUsingPoolDUnitTest extends CacheTestCase {
+
+  private CqQueryUsingPoolDUnitTest cqDUnitTest = new CqQueryUsingPoolDUnitTest("CqStatsUsingPoolDUnitTest");
+  
+  public CqStatsUsingPoolDUnitTest(String name) {
+    super(name);
+  }
+  
+  public void setUp() throws Exception {
+    super.setUp();
+    
+    // avoid IllegalStateException from HandShake by connecting all vms to
+    // system before creating pool
+    getSystem();
+    invokeInEveryVM(new SerializableRunnable("getSystem") {
+      public void run() {
+        getSystem();
+      }
+    });
+    
+  }
+  
+  private void validateCQStats(VM vm, final String cqName,
+      final int creates,
+      final int updates,
+      final int deletes,
+      final int totalEvents,
+      final int cqListenerInvocations) {
+    vm.invoke(new CacheSerializableRunnable("Validate CQs") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Validating CQ Stats. ### " + cqName);
+//      Get CQ Service.
+        QueryService qService = null;
+        try {          
+          qService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to get query service.");
+        }
+        
+        CqService cqService = null;
+        try {
+          cqService = ((DefaultQueryService)qService).getCqService();
+        }
+        catch (CqException e) {
+          // TODO Auto-generated catch block
+          e.printStackTrace();
+          fail("Failed to get CqService, CQ : " + cqName);
+        }
+        Collection<? extends InternalCqQuery> cqs = cqService.getAllCqs();
+        if (cqs.size() == 0) {
+          fail("Failed to get CqQuery for CQ : " + cqName);
+        }
+        CqQueryImpl cQuery = (CqQueryImpl) cqs.iterator().next();
+        
+        CqStatistics cqStats = cQuery.getStatistics();
+        CqQueryVsdStats cqVsdStats = ((CqQueryImpl)cQuery).getVsdStats();
+        if (cqStats == null || cqVsdStats == null) {
+          fail("Failed to get CqQuery Stats for CQ : " + cqName);
+        }
+        
+        getCache().getLogger().info("#### CQ stats for " + cQuery.getName() + ": " + 
+            " Events Total: " + cqStats.numEvents() +
+            " Events Created: " + cqStats.numInserts() +
+            " Events Updated: " + cqStats.numUpdates() +
+            " Events Deleted: " + cqStats.numDeletes() +
+            " CQ Listener invocations: " + cqVsdStats.getNumCqListenerInvocations() +
+            " Initial results time (nano sec): " + cqVsdStats.getCqInitialResultsTime());
+        
+        
+//      Check for totalEvents count.
+        if (totalEvents != CqQueryUsingPoolDUnitTest.noTest) {
+//        Result size validation.
+          assertEquals("Total Event Count mismatch", totalEvents, cqStats.numEvents());
+        }
+        
+//      Check for create count.
+        if (creates != CqQueryUsingPoolDUnitTest.noTest) {
+          assertEquals("Create Event mismatch", creates, cqStats.numInserts());
+        }
+        
+//      Check for update count.
+        if (updates != CqQueryUsingPoolDUnitTest.noTest) {
+          assertEquals("Update Event mismatch", updates, cqStats.numUpdates());
+        }
+        
+//      Check for delete count.
+        if (deletes != CqQueryUsingPoolDUnitTest.noTest) {
+          assertEquals("Delete Event mismatch", deletes, cqStats.numDeletes());
+        }
+        
+//      Check for CQ listener invocations.
+        if (cqListenerInvocations != CqQueryUsingPoolDUnitTest.noTest) {
+          assertEquals("CQ Listener invocations mismatch", cqListenerInvocations, cqVsdStats.getNumCqListenerInvocations());
+        }
+////      Check for initial results time.
+//        if (initialResultsTime != CqQueryUsingPoolDUnitTest.noTest && cqVsdStats.getCqInitialResultsTime() <= 0) {
+//          assertEquals("Initial results time mismatch", initialResultsTime, cqVsdStats.getCqInitialResultsTime());
+//        }
+      }
+    });
+  }
+  
+  private void validateCQServiceStats(VM vm,
+      final int created,
+      final int activated,
+      final int stopped,
+      final int closed,
+      final int cqsOnClient,
+      final int cqsOnRegion,
+      final int clientsWithCqs) {
+    vm.invoke(new CacheSerializableRunnable("Validate CQ Service Stats") {
+      public void run2() throws CacheException {
+        getLogWriter().info("### Validating CQ Service Stats. ### ");
+//      Get CQ Service.
+        QueryService qService = null;
+        try {          
+          qService = getCache().getQueryService();
+        } catch (Exception cqe) {
+          cqe.printStackTrace();
+          fail("Failed to getCQService.");
+        }
+        CqServiceStatistics cqServiceStats = null;        
+        cqServiceStats = qService.getCqStatistics();
+        CqServiceVsdStats cqServiceVsdStats = null;
+        try {
+          cqServiceVsdStats = ((CqServiceImpl) ((DefaultQueryService)qService).getCqService()).stats;
+        }
+        catch (CqException e) {
+          // TODO Auto-generated catch block
+          e.printStackTrace();
+        }
+        if (cqServiceStats == null) {
+          fail("Failed to get CQ Service Stats");
+        }
+        
+        getCache().getLogger().info("#### CQ Service stats: " + 
+            " CQs created: " + cqServiceStats.numCqsCreated() +
+            " CQs active: " + cqServiceStats.numCqsActive() +
+            " CQs stopped: " + cqServiceStats.numCqsStopped() +
+            " CQs closed: " + cqServiceStats.numCqsClosed() +
+            " CQs on Client: " + cqServiceStats.numCqsOnClient() +
+            " CQs on region /root/regionA : " + cqServiceVsdStats.numCqsOnRegion("/root/regionA") +
+            " Clients with CQs: " + cqServiceVsdStats.getNumClientsWithCqs());
+        
+        
+        //        Check for created count.
+        if (created != CqQueryUsingPoolDUnitTest.noTest) {
+          assertEquals("Number of CQs created mismatch", created, cqServiceStats.numCqsCreated());
+        }
+        
+        //        Check for activated count.
+        if (activated != CqQueryUsingPoolDUnitTest.noTest) {
+          assertEquals("Number of CQs activated mismatch", activated, cqServiceStats.numCqsActive());
+        }
+        
+        //        Check for stopped count.
+        if (stopped != CqQueryUsingPoolDUnitTest.noTest) {
+          assertEquals("Number of CQs stopped mismatch", stopped, cqServiceStats.numCqsStopped());
+        }
+        
+        //        Check for closed count.
+        if (closed != CqQueryUsingPoolDUnitTest.noTest) {
+          assertEquals("Number of CQs closed mismatch", closed, cqServiceStats.numCqsClosed());
+        }
+        
+        // Check for CQs on client count.
+        if (cqsOnClient != CqQueryUsingPoolDUnitTest.noTest) {
+          assertEquals("Number of CQs on client mismatch", cqsOnClient, cqServiceStats.numCqsOnClient());
+        }
+        
+        // Check for CQs on region.
+        if (cqsOnRegion != CqQueryUsingPoolDUnitTest.noTest) {
+          assertEquals("Number of CQs on region /root/regionA mismatch", 
+              cqsOnRegion, cqServiceVsdStats.numCqsOnRegion("/root/regionA"));
+        }
+        
+        // Check for clients with CQs count.
+        if (clientsWithCqs != CqQueryUsingPoolDUnitTest.noTest) {
+          assertEquals("Clints with CQs mismatch", 
+              clientsWithCqs, cqServiceVsdStats.getNumClientsWithCqs());
+        }
+      }
+    });
+  }
+  
+  private final static int PAUSE = 8 * 1000; // 5 * 1000
+  
+  /**
+   * Test for CQ and CQ Service Statistics
+   * @throws Exception
+   */
+  public void testCQStatistics() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client = host.getVM(1);
+    
+    /* Init Server and Client */
+    cqDUnitTest.createServer(server);
+    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    
+    String poolName = "testCQStatistics";
+    cqDUnitTest.createPool(client, poolName, host0, port);
+
+    //cqDUnitTest.createClient(client, port, host0);
+    
+    /* Create CQs. */
+    cqDUnitTest.createCQ(client, poolName, "testCQStatistics_0", cqDUnitTest.cqs[0]);
+    
+    /* Init values at server. */
+    int size = 100;
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], size);
+    
+    cqDUnitTest.executeCQ(client, "testCQStatistics_0", true, null);
+    
+    // Wait for CQ to be executed.
+    cqDUnitTest.waitForCqState(client, "testCQStatistics_0", CqStateImpl.RUNNING);    
+
+    // Test CQ stats
+    validateCQStats(client, "testCQStatistics_0", 0, 0, 0, 0, 0);
+    
+    // The stat would have not updated yet.
+    // Commenting out the following check; the check for resultset initialization 
+    // is anyway done in the next validation. 
+    // validateCQStats(server, "testCQStatistics_0", 0, 0, 0, 0, CqQueryUsingPoolDUnitTest.noTest, 1);
+    
+    /* Init values at server. */
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], 200);
+    // Wait for client to Synch.
+    cqDUnitTest.waitForCreated(client, "testCQStatistics_0", CqQueryUsingPoolDUnitTest.KEY+200);
+    pause(PAUSE);
+    size = 200;
+    
+    // validate CQs.
+    cqDUnitTest.validateCQ(client, "testCQStatistics_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ 100,
+        /* updates: */ 100,
+        /* deletes; */ 0,
+        /* queryInserts: */ 100,
+        /* queryUpdates: */ 100,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ 200);
+    
+    // Test CQ stats
+    validateCQStats(client, "testCQStatistics_0", 100, 100, 0, 200, 200);
+    //We don't have serverside CQ name
+    validateCQStats(server, "testCQStatistics_0", 100, 100, 0, 200, CqQueryUsingPoolDUnitTest.noTest);
+    
+    /* Delete values at server. */
+    cqDUnitTest.deleteValues(server, cqDUnitTest.regions[0], 100);
+    // Wait for client to Synch.
+    cqDUnitTest.waitForDestroyed(client, "testCQStatistics_0", CqQueryUsingPoolDUnitTest.KEY+100);
+    size = 10;
+    pause(PAUSE);
+    
+    cqDUnitTest.validateCQ(client, "testCQStatistics_0",
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */100,
+        /* updates: */ 100,
+        /* deletes; */ 100,
+        /* queryInserts: */ 100,
+        /* queryUpdates: */ 100,
+        /* queryDeletes: */ 100,
+        /* totalEvents: */ 300);
+    
+    // Test CQ stats
+    validateCQStats(client, "testCQStatistics_0", 100, 100, 100, 300, 300);
+    //We don't have serverside CQ name
+    validateCQStats(server, "testCQStatistics_0", 100, 100, 100, 300, CqQueryUsingPoolDUnitTest.noTest);
+    
+    // Test  CQ Close
+    cqDUnitTest.closeCQ(client, "testCQStatistics_0");
+    pause(PAUSE);
+    
+    // Close.
+    cqDUnitTest.closeClient(client);
+    cqDUnitTest.closeServer(server);
+  }
+  /**
+   * Test for CQ Service Statistics
+   * @throws Exception
+   */
+  public void testCQServiceStatistics() throws Exception {
+    
+    final Host host = Host.getHost(0);
+    VM server = host.getVM(0);
+    VM client1 = host.getVM(1);
+    VM client2 = host.getVM(2);
+    
+    
+    /* Init Server and Client */
+    cqDUnitTest.createServer(server);
+    final int port = server.invokeInt(CqQueryUsingPoolDUnitTest.class, "getCacheServerPort");
+    final String host0 = getServerHostName(server.getHost());
+    
+    String poolName1 = "testCQServiceStatistics1";
+    String poolName2 = "testCQServiceStatistics2";
+    
+    cqDUnitTest.createPool(client1, poolName1, host0, port);
+    cqDUnitTest.createPool(client2, poolName2, host0, port);
+
+    //cqDUnitTest.createClient(client1, port, host0);
+    //cqDUnitTest.createClient(client2, port, host0);
+    
+    /* Create CQs. */
+    String cqName = new String("testCQServiceStatistics_0");
+    String cqName10 = new String("testCQServiceStatistics_10");   
+    cqDUnitTest.createCQ(client1, poolName1, cqName, cqDUnitTest.cqs[0]);
+    cqDUnitTest.createCQ(client2, poolName2, cqName10, cqDUnitTest.cqs[2]); 
+    pause(PAUSE);
+    // Test CQ Service stats
+    getCache().getLogger().info("Validating CQ Service stats on clients: #1");
+    validateCQServiceStats(client1, 1, 0, 1, 0, 1, 1, CqQueryUsingPoolDUnitTest.noTest);
+    validateCQServiceStats(server, 0, 0, 0, 0, CqQueryUsingPoolDUnitTest.noTest, 0, 0);
+    
+    cqDUnitTest.executeCQ(client1, cqName, false, null);
+    cqDUnitTest.executeCQ(client2, cqName10, false, null);
+    pause(PAUSE);
+    
+    getCache().getLogger().info("Validating CQ Service stats on clients: #2");
+    validateCQServiceStats(client1, 1, 1, 0, 0, 1, 1, CqQueryUsingPoolDUnitTest.noTest);
+    validateCQServiceStats(client2, 1, 1, 0, 0, 1, CqQueryUsingPoolDUnitTest.noTest, CqQueryUsingPoolDUnitTest.noTest);
+    
+    getCache().getLogger().info("Validating CQ Service stats on server: #1");
+    validateCQServiceStats(server, 2, 2, 0, 0, CqQueryUsingPoolDUnitTest.noTest, 1, 2);
+    
+    /* Init values at server. */
+    int size = 10;
+    cqDUnitTest.createValues(server, cqDUnitTest.regions[0], size);
+    // Wait for client to Synch.
+    cqDUnitTest.waitForCreated(client1, "testCQServiceStatistics_0", CqQueryUsingPoolDUnitTest.KEY+size);
+    
+    // validate CQs.
+    cqDUnitTest.validateCQ(client1, cqName,
+        /* resultSize: */ CqQueryUsingPoolDUnitTest.noTest,
+        /* creates: */ size,
+        /* updates: */ 0,
+        /* deletes; */ 0,
+        /* queryInserts: */ size,
+        /* queryUpdates: */ 0,
+        /* queryDeletes: */ 0,
+        /* totalEvents: */ size);
+    pause(PAUSE);
+    
+    // Test CQ Service stats
+    getCache().getLogger().info("Validating CQ Service stats on clients: #3");
+    validateCQServiceStats(client1, 1, 1, 0, 0, 1, 1, CqQueryUsingPoolDUnitTest.noTest);
+    validateCQServiceStats(client2, 1, 1, 0, 0, 1, CqQueryUsingPoolDUnitTest.noTest, CqQueryUsingPoolDUnitTest.noTest);
+    
+    getCache().getLogger().info("Validating CQ Service stats on server: #1");
+    validateCQServiceStats(server, 2, 2, 0, 0, CqQueryUsingPoolDUnitTest.noTest, 1, 2);
+    
+    
+    //Create CQs with no name, execute, and close. 
+    cqDUnitTest.createAndExecCQNoName(client1, poolName1, cqDUnitTest.cqs[0]); 
+    pause(PAUSE);      
+    
+    // Test CQ Service stats
+    getCache().getLogger().info("Validating CQ Service stats on client: #4");
+    validateCQServiceStats(client1, 21, 1, 0, 20, 1, 1, CqQueryUsingPoolDUnitTest.noTest);
+    
+    getCache().getLogger().info("Validating CQ Service stats on server: #2");
+    validateCQServiceStats(server, 22, 2, 0, 20, CqQueryUsingPoolDUnitTest.noTest, 1, 2);
+    
+    // Test  CQ Close
+    cqDUnitTest.closeCQ(client1, cqName);
+    pause(PAUSE);      
+    
+    // Test CQ Service stats
+    getCache().getLogger().info("Validating CQ Service stats on client: #5");
+    validateCQServiceStats(client1, 21, 0, 0, 21, 0, 0, CqQueryUsingPoolDUnitTest.noTest);
+    
+    getCache().getLogger().info("Validating CQ Service stats on server: #3");
+    validateCQServiceStats(server, 22, 1, 0, 21, CqQueryUsingPoolDUnitTest.noTest, 0, 1);
+    
+    //Test stop CQ
+    cqDUnitTest.stopCQ(client2, cqName10);
+    pause(PAUSE);
+    
+    // Test CQ Service stats
+    getCache().getLogger().info("Validating CQ Service stats on client: #6");
+    validateCQServiceStats(client2, 1, 0, 1, 0, 1, CqQueryUsingPoolDUnitTest.noTest, CqQueryUsingPoolDUnitTest.noTest);
+    getCache().getLogger().info("Validating CQ Service stats on server: #4");
+    validateCQServiceStats(server, 22, 0, 1, 21, CqQueryUsingPoolDUnitTest.noTest, CqQueryUsingPoolDUnitTest.noTest, 1);
+    
+    // Test  CQ Close
+    cqDUnitTest.closeCQ(client2, cqName10);
+    pause(PAUSE);
+    
+    // Test CQ Service stats
+    getCache().getLogger().info("Validating CQ Service stats on client: #7");
+    validateCQServiceStats(client1, 21, 0, 0, 21, 0, 0, CqQueryUsingPoolDUnitTest.noTest);
+    validateCQServiceStats(client2, 1, 0, 0, 1, 0, 0, CqQueryUsingPoolDUnitTest.noTest);
+    getCache().getLogger().info("Validating CQ Service stats on server: #5");
+    validateCQServiceStats(server, 22, 0, 0, 22, CqQueryUsingPoolDUnitTest.noTest, 0, 0);
+    
+    // Close.
+    cqDUnitTest.closeClient(client1);
+    cqDUnitTest.closeClient(client2);
+    cqDUnitTest.closeServer(server);
+  }
+
+} 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
new file mode 100644
index 0000000..1a61233
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqStatsUsingPoolOptimizedExecuteDUnitTest.java
@@ -0,0 +1,43 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.query.cq.dunit;
+
+import com.gemstone.gemfire.cache.query.internal.cq.CqService;
+import com.gemstone.gemfire.cache.query.internal.cq.CqServiceImpl;
+
+import dunit.SerializableRunnable;
+
+/**
+ * Test class for testing {@link CqService#EXECUTE_QUERY_DURING_INIT} flag
+ *
+ */
+public class CqStatsUsingPoolOptimizedExecuteDUnitTest extends CqStatsUsingPoolDUnitTest{
+
+  public CqStatsUsingPoolOptimizedExecuteDUnitTest(String name) {
+    super(name);
+  }
+
+  public void setUp() throws Exception {
+    super.setUp();
+    invokeInEveryVM(new SerializableRunnable("getSystem") {
+      public void run() {
+        CqServiceImpl.EXECUTE_QUERY_DURING_INIT = false;
+      }
+    });
+  }
+  
+  @Override
+  public void tearDown2() throws Exception {
+    invokeInEveryVM(new SerializableRunnable("getSystem") {
+      public void run() {
+        CqServiceImpl.EXECUTE_QUERY_DURING_INIT = true;
+      }
+    });
+    super.tearDown2();
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6df75241/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqTimeTestListener.java
----------------------------------------------------------------------
diff --git a/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqTimeTestListener.java b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqTimeTestListener.java
new file mode 100644
index 0000000..4948fe9
--- /dev/null
+++ b/gemfire-cq/src/test/java/com/gemstone/gemfire/cache/query/cq/dunit/CqTimeTestListener.java
@@ -0,0 +1,258 @@
+/*=========================================================================
+ * Copyright (c) 2010-2014 Pivotal Software, Inc. All Rights Reserved.
+ * This product is protected by U.S. and international copyright
+ * and intellectual property laws. Pivotal products are covered by
+ * one or more patents listed at http://www.pivotal.io/patents.
+ *=========================================================================
+ */
+package com.gemstone.gemfire.cache.query.cq.dunit;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import com.gemstone.gemfire.LogWriter;
+import com.gemstone.gemfire.cache.Operation;
+import com.gemstone.gemfire.cache.query.CqEvent;
+import com.gemstone.gemfire.cache.query.CqListener;
+import com.gemstone.gemfire.cache.query.data.Portfolio;
+
+import dunit.DistributedTestCase;
+import dunit.DistributedTestCase.WaitCriterion;
+
+/**
+ * @author anil.
+ *
+ */
+public class CqTimeTestListener implements CqListener {
+  protected final LogWriter logger;
+  protected volatile int eventCreateCount = 0;
+  protected volatile int eventUpdateCount = 0;
+  protected volatile int eventDeleteCount = 0;
+  protected volatile int eventInvalidateCount = 0;
+  protected volatile int eventErrorCount = 0;
+
+  protected volatile int totalEventCount = 0;
+  protected volatile int eventQueryInsertCount = 0;
+  protected volatile int eventQueryUpdateCount = 0;
+  protected volatile int eventQueryDeleteCount = 0;
+  protected volatile int eventQueryInvalidateCount = 0;
+
+  protected volatile long eventQueryInsertTime = 0;
+  protected volatile long eventQueryUpdateTime = 0;
+
+  protected volatile boolean eventClose = false;
+
+  final public Set destroys = Collections.synchronizedSet(new HashSet());
+  final public Set creates = Collections.synchronizedSet(new HashSet());
+  final public Set invalidates = Collections.synchronizedSet(new HashSet());
+  final public Set updates = Collections.synchronizedSet(new HashSet());
+
+  static private final String WAIT_PROPERTY = "CQueryTestListener.maxWaitTime";
+
+  static private final int WAIT_DEFAULT = (20 * 1000);
+  
+  public static final long MAX_TIME = Integer.getInteger(WAIT_PROPERTY, 
+      WAIT_DEFAULT).intValue();;
+
+  public String cqName;
+  
+  public CqTimeTestListener(LogWriter logger) {
+    this.logger = logger;
+  }
+
+  public void onEvent(CqEvent cqEvent) {
+    this.totalEventCount++;
+    
+    long currentTime = System.currentTimeMillis();
+    
+    Operation baseOperation = cqEvent.getBaseOperation();
+    Operation queryOperation = cqEvent.getQueryOperation();
+    Object key = cqEvent.getKey();
+    logger.info("### Got CQ Event ###; baseOp=" + baseOperation
+                + ";queryOp=" + queryOperation);
+
+    logger.info("Number of events for the CQ: " +this.cqName  + " : " 
+                       + this.totalEventCount
+                       + " Key : " + key);
+    
+    if (baseOperation.isUpdate()) {
+      this.eventUpdateCount++;
+      this.updates.add(key);
+    }
+    else if (baseOperation.isCreate()) {
+      this.eventCreateCount++;
+      this.creates.add(key);
+    }
+    else if (baseOperation.isDestroy()) {
+      this.eventDeleteCount++;
+      this.destroys.add(key);
+    }
+    else if (baseOperation.isInvalidate()) {
+      this.eventDeleteCount++;
+      this.invalidates.add(key);
+    }
+
+    if (queryOperation.isUpdate()) {
+      this.eventQueryUpdateCount++;
+      long createTime = ((Portfolio)cqEvent.getNewValue()).getCreateTime();
+      this.eventQueryUpdateTime += (currentTime - createTime);
+    }
+    else if (queryOperation.isCreate()) {
+      this.eventQueryInsertCount++;
+      long createTime = ((Portfolio)cqEvent.getNewValue()).getCreateTime();
+      this.eventQueryInsertTime += (currentTime - createTime);
+    }
+    else if (queryOperation.isDestroy()) {
+      this.eventQueryDeleteCount++;
+    }
+    else if (queryOperation.isInvalidate()) {
+      this.eventQueryInvalidateCount++;
+    }
+
+  }
+
+  public void onError(CqEvent cqEvent) {
+    this.eventErrorCount++;
+  }
+  public int getErrorEventCount() {
+    return this.eventErrorCount;
+  }
+
+  public int getTotalEventCount() {
+    return this.totalEventCount;
+  }
+
+  public int getCreateEventCount() {
+    return this.eventCreateCount;
+  }
+
+  public int getUpdateEventCount() {
+    return this.eventUpdateCount;
+  }
+  
+  public int getDeleteEventCount() {
+    return this.eventDeleteCount;
+  }
+
+  public int getInvalidateEventCount() {
+    return this.eventInvalidateCount;
+  }
+
+  public int getQueryInsertEventCount() {
+    return this.eventQueryInsertCount;
+  }
+  
+  public int getQueryUpdateEventCount() {
+    return this.eventQueryUpdateCount;
+  }
+  
+  public int getQueryDeleteEventCount() {
+    return this.eventQueryDeleteCount;
+  }
+
+  public int getQueryInvalidateEventCount() {
+    return this.eventQueryInvalidateCount;
+  }
+
+  public long getTotalQueryUpdateTime() {
+    return this.eventQueryUpdateTime;
+  }
+
+  public long getTotalQueryCreateTime() {
+    return this.eventQueryInsertTime;
+  }
+
+  public void close() {
+    this.eventClose = true;
+  }
+
+  public void printInfo() {
+    logger.info("####" + this.cqName + ": " + 
+      " Events Total :" + this.getTotalEventCount() +
+      " Events Created :" + this.eventCreateCount +
+      " Events Updated :" + this.eventUpdateCount +
+      " Events Deleted :" + this.eventDeleteCount +
+      " Events Invalidated :" + this.eventInvalidateCount +
+      " Query Inserts :" + this.eventQueryInsertCount +
+      " Query Updates :" + this.eventQueryUpdateCount +
+      " Query Deletes :" + this.eventQueryDeleteCount +
+      " Query Invalidates :" + this.eventQueryInvalidateCount +
+      " Total Events :" + this.totalEventCount);
+  }
+
+  public boolean waitForCreated(final Object key) {
+    WaitCriterion ev = new WaitCriterion() {
+      public boolean done() {
+        return CqTimeTestListener.this.creates.contains(key);
+      }
+      public String description() {
+        return "never got create event for CQ " + CqTimeTestListener.this.cqName;
+      }
+    };
+    DistributedTestCase.waitForCriterion(ev, MAX_TIME, 200, true);
+    return true;
+  }
+  
+  public boolean waitForDestroyed(final Object key) {
+    WaitCriterion ev = new WaitCriterion() {
+      public boolean done() {
+        return CqTimeTestListener.this.destroys.contains(key);
+      }
+      public String description() {
+        return "never got destroy event for CQ " + CqTimeTestListener.this.cqName;
+      }
+    };
+    DistributedTestCase.waitForCriterion(ev, MAX_TIME, 200, true);
+    return true;
+  }
+  
+  public boolean waitForInvalidated(final Object key) {
+    WaitCriterion ev = new WaitCriterion() {
+      public boolean done() {
+        return CqTimeTestListener.this.invalidates.contains(key);
+      }
+      public String description() {
+        return "never got invalidate event for CQ " + CqTimeTestListener.this.cqName;
+      }
+    };
+    DistributedTestCase.waitForCriterion(ev, MAX_TIME, 200, true);
+    return true;
+  }
+  
+  public boolean waitForUpdated(final Object key) {
+    WaitCriterion ev = new WaitCriterion() {
+      public boolean done() {
+        return CqTimeTestListener.this.updates.contains(key);
+      }
+      public String description() {
+        return "never got update event for CQ " + CqTimeTestListener.this.cqName;
+      }
+    };
+    DistributedTestCase.waitForCriterion(ev, MAX_TIME, 200, true);
+    return true;
+  }
+
+  public boolean waitForClose() {
+    WaitCriterion ev = new WaitCriterion() {
+      public boolean done() {
+        return CqTimeTestListener.this.eventClose;
+      }
+      public String description() {
+        return "never got close event for CQ " + CqTimeTestListener.this.cqName;
+      }
+    };
+    DistributedTestCase.waitForCriterion(ev, MAX_TIME, 200, true);
+    return true;
+  }
+  
+
+  public void getEventHistory() {
+    destroys.clear();
+    creates.clear();
+    invalidates.clear();
+    updates.clear();
+    this.eventClose = false;
+  }
+
+}