You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ab...@apache.org on 2016/12/02 01:43:44 UTC

[01/31] incubator-geode git commit: GEODE-1955: make the tests more stable [Forced Update!]

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-2156 3e84342bd -> 13a046b41 (forced update)


GEODE-1955: make the tests more stable

* added the ignored tests back and mark them as flaky
* revert unwanted checkins


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

Branch: refs/heads/feature/GEODE-2156
Commit: b633f6791fd2a36c29817a8935a30e0847505687
Parents: f67554b
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Mon Nov 28 11:23:14 2016 -0800
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Wed Nov 30 10:23:54 2016 -0800

----------------------------------------------------------------------
 .../distributed/ConfigurationProperties.java    |  7 ++++++
 .../internal/DistributionConfig.java            | 24 +++++++++++--------
 .../internal/net/SSLConfigurationFactory.java   | 11 +++++----
 .../internal/cli/shell/JmxOperationInvoker.java |  3 ++-
 .../ConnectToLocatorSSLDUnitTest.java           | 25 +++++++++++++++-----
 5 files changed, 48 insertions(+), 22 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b633f679/geode-core/src/main/java/org/apache/geode/distributed/ConfigurationProperties.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/ConfigurationProperties.java b/geode-core/src/main/java/org/apache/geode/distributed/ConfigurationProperties.java
index c58a398..536e4b6 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/ConfigurationProperties.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/ConfigurationProperties.java
@@ -165,7 +165,10 @@ public interface ConfigurationProperties {
    * with other <i>cluster-ssl-*</i> properties property <a name="cluster-ssl"/a>
    * </p>
    * <U>Description</U>: The cluster-ssl property prefix
+   *
+   * @deprecated Since Geode1.0, use ssl-* properties and ssl-enabled-components
    */
+  @Deprecated
   String CLUSTER_SSL_PREFIX = "cluster-ssl";
 
   /**
@@ -827,8 +830,12 @@ public interface ConfigurationProperties {
    * </p>
    * <U>Default</U>: Optional
    * </p>
+   * 
+   * @deprecated Since Geode1.0, use ssl-* properties and ssl-enabled-components
    */
+  @Deprecated
   String JMX_MANAGER_SSL_PREFIX = "jmx-manager-ssl-";
+
   /**
    * The static String definition of the <i>"jmx-manager"</i> property <a name="jmx-manager"/a>
    * </p>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b633f679/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfig.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfig.java
index 3a2660c..5eb070d 100644
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfig.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/DistributionConfig.java
@@ -17,6 +17,16 @@ package org.apache.geode.distributed.internal;
 
 import static org.apache.geode.distributed.ConfigurationProperties.*;
 
+import org.apache.geode.distributed.ConfigurationProperties;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.internal.Config;
+import org.apache.geode.internal.ConfigSource;
+import org.apache.geode.internal.logging.InternalLogWriter;
+import org.apache.geode.internal.logging.LogConfig;
+import org.apache.geode.internal.security.SecurableCommunicationChannel;
+import org.apache.geode.internal.tcp.Connection;
+import org.apache.geode.memcached.GemFireMemcachedServer;
+
 import java.io.File;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -28,16 +38,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 
-import org.apache.geode.distributed.ConfigurationProperties;
-import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.internal.Config;
-import org.apache.geode.internal.ConfigSource;
-import org.apache.geode.internal.logging.InternalLogWriter;
-import org.apache.geode.internal.logging.LogConfig;
-import org.apache.geode.internal.security.SecurableCommunicationChannel;
-import org.apache.geode.internal.tcp.Connection;
-import org.apache.geode.memcached.GemFireMemcachedServer;
-
 /**
  * Provides accessor (and in some cases mutator) methods for the various GemFire distribution
  * configuration properties. The interface also provides constants for the names of properties and
@@ -53,6 +53,10 @@ import org.apache.geode.memcached.GemFireMemcachedServer;
 public interface DistributionConfig extends Config, LogConfig {
 
   //////////////////// Instance Methods ////////////////////
+  /**
+   * The static String definition of the prefix used to defined ssl-* properties
+   */
+  String SSL_PREFIX = "ssl-";
 
   /**
    * The prefix used for Gemfire properties set through java system properties

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b633f679/geode-core/src/main/java/org/apache/geode/internal/net/SSLConfigurationFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/net/SSLConfigurationFactory.java b/geode-core/src/main/java/org/apache/geode/internal/net/SSLConfigurationFactory.java
index 3731d4d..aa61ca3 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/net/SSLConfigurationFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/net/SSLConfigurationFactory.java
@@ -148,7 +148,7 @@ public class SSLConfigurationFactory {
   private SSLConfig createSSLConfig(final SecurableCommunicationChannel sslEnabledComponent) {
     SSLConfig sslConfig = new SSLConfig();
     sslConfig.setCiphers(getDistributionConfig().getSSLCiphers());
-    sslConfig.setEnabled(isSSLEnabledForComponent(getDistributionConfig(), sslEnabledComponent));
+    sslConfig.setEnabled(determineIfSSLEnabledForSSLComponent(sslEnabledComponent));
     sslConfig.setKeystore(getDistributionConfig().getSSLKeyStore());
     sslConfig.setKeystorePassword(getDistributionConfig().getSSLKeyStorePassword());
     sslConfig.setKeystoreType(getDistributionConfig().getSSLKeyStoreType());
@@ -160,17 +160,18 @@ public class SSLConfigurationFactory {
     return sslConfig;
   }
 
-  public static boolean isSSLEnabledForComponent(DistributionConfig dc,
+  private boolean determineIfSSLEnabledForSSLComponent(
       final SecurableCommunicationChannel sslEnabledComponent) {
-    if (ArrayUtils.contains(dc.getSecurableCommunicationChannels(),
+    if (ArrayUtils.contains(getDistributionConfig().getSecurableCommunicationChannels(),
         SecurableCommunicationChannel.NONE)) {
       return false;
     }
-    if (ArrayUtils.contains(dc.getSecurableCommunicationChannels(),
+    if (ArrayUtils.contains(getDistributionConfig().getSecurableCommunicationChannels(),
         SecurableCommunicationChannel.ALL)) {
       return true;
     }
-    return ArrayUtils.contains(dc.getSecurableCommunicationChannels(), sslEnabledComponent);
+    return ArrayUtils.contains(getDistributionConfig().getSecurableCommunicationChannels(),
+        sslEnabledComponent) ? true : false;
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b633f679/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JmxOperationInvoker.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JmxOperationInvoker.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JmxOperationInvoker.java
index 0fa47d4..e9d183e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JmxOperationInvoker.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/JmxOperationInvoker.java
@@ -17,6 +17,7 @@ package org.apache.geode.management.internal.cli.shell;
 import static org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_PREFIX;
 import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_PREFIX;
 
+import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.internal.lang.StringUtils;
 import org.apache.geode.internal.util.ArrayUtils;
 import org.apache.geode.internal.util.IOUtils;
@@ -240,7 +241,7 @@ public class JmxOperationInvoker implements OperationInvoker {
       returnKey = key;
     }
     if (key.startsWith(CLUSTER_SSL_PREFIX) || key.startsWith(JMX_MANAGER_SSL_PREFIX)
-        || key.startsWith("ssl-")) {
+        || key.startsWith(DistributionConfig.SSL_PREFIX)) {
       if (key.endsWith("keystore")) {
         returnKey = Gfsh.SSL_KEYSTORE;
       } else if (key.endsWith("keystore-password")) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b633f679/geode-core/src/test/java/org/apache/geode/management/ConnectToLocatorSSLDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/ConnectToLocatorSSLDUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/ConnectToLocatorSSLDUnitTest.java
index 0c16c1a..751425a 100644
--- a/geode-core/src/test/java/org/apache/geode/management/ConnectToLocatorSSLDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/ConnectToLocatorSSLDUnitTest.java
@@ -43,10 +43,10 @@ import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
 import org.apache.geode.test.dunit.rules.GfshShellConnectionRule;
 import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
 import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FlakyTest;
 import org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -91,14 +91,27 @@ public class ConnectToLocatorSSLDUnitTest extends JUnit4DistributedTestCase {
 
     GfshShellConnectionRule gfshConnector =
         new GfshShellConnectionRule(lsRule.getPort(0), GfshShellConnectionRule.PortType.locator);
-    gfshConnector.connect(CliStrings.CONNECT__SECURITY_PROPERTIES,
-        securityPropsFile.getCanonicalPath());
-    assertTrue(gfshConnector.isConnected());
 
+    // when we connect too soon, we would get "Failed to retrieve RMIServer stub:
+    // javax.naming.CommunicationException [Root exception is java.rmi.NoSuchObjectException: no
+    // such object in table]" Exception.
+    // Tried to wait on jmx connector server being ready, but it doesn't work.
+    // Add the retry logic here to try at most 10 times for connection.
+    for (int i = 0; i < 10; i++) {
+      gfshConnector.connect(CliStrings.CONNECT__SECURITY_PROPERTIES,
+          securityPropsFile.getCanonicalPath());
+      if (gfshConnector.isConnected()) {
+        break;
+      }
+      Thread.currentThread().sleep(3000);
+    }
+
+    assertTrue(gfshConnector.isConnected());
     gfshConnector.close();
   }
 
   @Test
+  @Category(FlakyTest.class) // GEODE-2099
   public void testConnectToLocatorWithSSLJMX() throws Exception {
     securityProps.setProperty(SSL_ENABLED_COMPONENTS, SecurableCommunicationChannels.JMX);
     securityProps.setProperty(SSL_KEYSTORE, jks.getCanonicalPath());
@@ -112,7 +125,7 @@ public class ConnectToLocatorSSLDUnitTest extends JUnit4DistributedTestCase {
   }
 
   @Test
-  @Ignore("GEODE-2099")
+  @Category(FlakyTest.class) // GEODE-2099
   public void testConnectToLocatorWithLegacyClusterSSL() throws Exception {
     securityProps.setProperty(CLUSTER_SSL_ENABLED, "true");
     securityProps.setProperty(CLUSTER_SSL_KEYSTORE, jks.getCanonicalPath());
@@ -125,7 +138,7 @@ public class ConnectToLocatorSSLDUnitTest extends JUnit4DistributedTestCase {
   }
 
   @Test
-  @Ignore("GEODE-2099")
+  @Category(FlakyTest.class) // GEODE-2099
   public void testConnectToLocatorWithLegacyJMXSSL() throws Exception {
     securityProps.setProperty(JMX_MANAGER_SSL_ENABLED, "true");
     securityProps.setProperty(JMX_MANAGER_SSL_KEYSTORE, jks.getCanonicalPath());


[21/31] incubator-geode git commit: GEODE-1931: Spotless

Posted by ab...@apache.org.
GEODE-1931: Spotless


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

Branch: refs/heads/feature/GEODE-2156
Commit: 1477c74ded0663e664671f7c9b0a2936a020fbc7
Parents: a5941da
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Thu Dec 1 14:11:35 2016 -0800
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Thu Dec 1 14:11:35 2016 -0800

----------------------------------------------------------------------
 .../geode/distributed/LocatorDUnitTest.java     | 55 ++++++++++----------
 1 file changed, 27 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1477c74d/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
index 350f183..b92ab25 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
@@ -97,6 +97,7 @@ import java.util.concurrent.TimeUnit;
 
 /**
  * Tests the ability of the {@link Locator} API to start and stop locators running in remote VMs.
+ * 
  * @since GemFire 4.0
  */
 @Category({DistributedTest.class, MembershipTest.class})
@@ -406,7 +407,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
   }
 
   private void startVerifyAndStopLocator(VM loc1, VM loc2, int port1, int port2,
-                                         Properties properties) {
+      Properties properties) {
     try {
       loc2.invoke("startLocator2", () -> startLocatorWithPortAndProperties(port2, properties));
       loc1.invoke("startLocator1", () -> startLocatorWithPortAndProperties(port1, properties));
@@ -632,7 +633,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
     try {
       DistributedSystem sys = locator.getDistributedSystem();
 
-      Object[] connectArgs = new Object[]{properties};
+      Object[] connectArgs = new Object[] {properties};
 
       assertTrue(MembershipManagerHelper.getLeadMember(sys) == null);
 
@@ -682,7 +683,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
   }
 
   private void assertLeadMember(final DistributedMember member, final DistributedSystem sys,
-                                long timeout) {
+      long timeout) {
     Awaitility.waitAtMost(timeout, TimeUnit.MILLISECONDS).pollInterval(200, TimeUnit.MILLISECONDS)
         .until(() -> {
           DistributedMember lead = MembershipManagerHelper.getLeadMember(sys);
@@ -755,7 +756,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
         }
       });
 
-      Object[] connectArgs = new Object[]{properties};
+      Object[] connectArgs = new Object[] {properties};
 
       SerializableRunnable crashLocator = new SerializableRunnable("Crash locator") {
         public void run() {
@@ -885,7 +886,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
         }
       });
 
-      Object[] connectArgs = new Object[]{properties};
+      Object[] connectArgs = new Object[] {properties};
 
       SerializableRunnable crashSystem = new SerializableRunnable("Crash system") {
         public void run() {
@@ -1031,7 +1032,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
         }
       });
 
-      Object[] connectArgs = new Object[]{properties};
+      Object[] connectArgs = new Object[] {properties};
 
       SerializableRunnable crashSystem = new SerializableRunnable("Crash system") {
         public void run() {
@@ -1167,7 +1168,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
       DistributedSystem sys = locator.getDistributedSystem();
       sys.getLogWriter().info(
           "<ExpectedException action=add>org.apache.geode.ForcedDisconnectException</ExpectedException>");
-      Object[] connectArgs = new Object[]{properties};
+      Object[] connectArgs = new Object[] {properties};
 
       assertTrue(MembershipManagerHelper.getLeadMember(sys) == null);
 
@@ -1616,9 +1617,9 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
     dsProps.setProperty(MCAST_PORT, "0");
 
     addDSProps(dsProps);
-    vm0.invoke(() -> startLocatorAsync(new Object[]{port1, dsProps}));
-    vm1.invoke(() -> startLocatorAsync(new Object[]{port2, dsProps}));
-    vm2.invoke(() -> startLocatorAsync(new Object[]{port3, dsProps}));
+    vm0.invoke(() -> startLocatorAsync(new Object[] {port1, dsProps}));
+    vm1.invoke(() -> startLocatorAsync(new Object[] {port2, dsProps}));
+    vm2.invoke(() -> startLocatorAsync(new Object[] {port3, dsProps}));
 
     try {
       try {
@@ -1670,11 +1671,11 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
         DistributedMember vm3ID = vm3.invoke(() -> GMSJoinLeaveTestHelper
             .getInternalDistributedSystem().getDM().getDistributionManagerId());
         assertTrue("View is " + system.getDM().getMembershipManager().getView()
-                + " and vm3's ID is " + vm3ID,
+            + " and vm3's ID is " + vm3ID,
             vm3.invoke(() -> GMSJoinLeaveTestHelper.isViewCreator()));
 
-        vm1.invoke(() -> startLocatorAsync(new Object[]{port2, dsProps}));
-        vm2.invoke(() -> startLocatorAsync(new Object[]{port3, dsProps}));
+        vm1.invoke(() -> startLocatorAsync(new Object[] {port2, dsProps}));
+        vm2.invoke(() -> startLocatorAsync(new Object[] {port3, dsProps}));
 
         Awaitility.waitAtMost(30000, TimeUnit.MILLISECONDS).pollInterval(200, TimeUnit.MILLISECONDS)
             .until(() -> {
@@ -1856,13 +1857,13 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
 
       Awaitility.waitAtMost(WAIT2_MS, TimeUnit.MILLISECONDS)
           .pollInterval(200, TimeUnit.MILLISECONDS).until(() -> {
-        try {
-          return system.getDM().getViewMembers().size() == 5;
-        } catch (Exception e) {
-          org.apache.geode.test.dunit.Assert.fail("unexpected exception", e);
-        }
-        return false; // NOTREACHED
-      });
+            try {
+              return system.getDM().getViewMembers().size() == 5;
+            } catch (Exception e) {
+              org.apache.geode.test.dunit.Assert.fail("unexpected exception", e);
+            }
+            return false; // NOTREACHED
+          });
       system.disconnect();
 
       vm1.invoke(() -> disconnectDistributedSystem());
@@ -1952,6 +1953,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
 
   /**
    * Tests starting, stopping, and restarting a locator. See bug 32856.
+   * 
    * @since GemFire 4.1
    */
   @Test
@@ -2088,8 +2090,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
     }
 
     @Override
-    public void afterMembershipFailure(String reason, Throwable cause) {
-    }
+    public void afterMembershipFailure(String reason, Throwable cause) {}
 
     public void reset() {
       unboundedWait = false;
@@ -2102,19 +2103,17 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
     boolean quorumLostInvoked;
     List<String> suspectReasons = new ArrayList<>(50);
 
-    public void memberJoined(InternalDistributedMember id) {
-    }
+    public void memberJoined(InternalDistributedMember id) {}
 
-    public void memberDeparted(InternalDistributedMember id, boolean crashed) {
-    }
+    public void memberDeparted(InternalDistributedMember id, boolean crashed) {}
 
     public void memberSuspect(InternalDistributedMember id, InternalDistributedMember whoSuspected,
-                              String reason) {
+        String reason) {
       suspectReasons.add(reason);
     }
 
     public void quorumLost(Set<InternalDistributedMember> failures,
-                           List<InternalDistributedMember> remaining) {
+        List<InternalDistributedMember> remaining) {
       quorumLostInvoked = true;
       org.apache.geode.test.dunit.LogWriterUtils.getLogWriter()
           .info("quorumLost invoked in test code");


[06/31] incubator-geode git commit: Removing unused ClientHelper test class

Posted by ab...@apache.org.
Removing unused ClientHelper test class


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

Branch: refs/heads/feature/GEODE-2156
Commit: ef7bb3216e700a9b0ddd9d0b8dc174ed6602564d
Parents: be1d5e3
Author: Dan Smith <up...@apache.org>
Authored: Thu Nov 17 10:55:16 2016 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Wed Nov 30 11:54:39 2016 -0800

----------------------------------------------------------------------
 .../org/apache/geode/cache/ClientHelper.java    | 68 --------------------
 1 file changed, 68 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ef7bb321/geode-core/src/test/java/org/apache/geode/cache/ClientHelper.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/ClientHelper.java b/geode-core/src/test/java/org/apache/geode/cache/ClientHelper.java
deleted file mode 100644
index 66ce495..0000000
--- a/geode-core/src/test/java/org/apache/geode/cache/ClientHelper.java
+++ /dev/null
@@ -1,68 +0,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.
- */
-package org.apache.geode.cache;
-
-import java.io.File;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.apache.geode.cache.DynamicRegionFactory.Config;
-import org.apache.geode.cache.client.internal.PoolImpl;
-import org.apache.geode.cache.client.internal.ServerProxy;
-import org.apache.geode.internal.cache.LocalRegion;
-
-/**
- * Provides methods for getting at the bridge client and connection proxies used by a region.
- * 
- *
- */
-public class ClientHelper {
-
-  public static PoolImpl getPool(Region region) {
-    ServerProxy proxy = ((LocalRegion) region).getServerProxy();
-    if (proxy == null) {
-      return null;
-    } else {
-      return (PoolImpl) proxy.getPool();
-    }
-  }
-
-  public static Set getActiveServers(Region region) {
-    return new HashSet(getPool(region).getCurrentServers());
-  }
-
-  // public static Set getDeadServers(Region region) {
-  // }
-
-  private ClientHelper() {
-
-  }
-
-  public static int getRetryInterval(Region region) {
-    return (int) (getPool(region).getPingInterval());
-  }
-
-  /**
-   * @param region
-   */
-  public static void release(Region region) {
-
-    PoolImpl pool = getPool(region);
-    if (pool != null) {
-      pool.releaseThreadLocalConnection();
-    }
-  }
-
-}


[08/31] incubator-geode git commit: GEODE-1594: Reduced iteration counts of actions and removed unnecessary CacheFactory invocation

Posted by ab...@apache.org.
GEODE-1594: Reduced iteration counts of actions and removed unnecessary CacheFactory invocation


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

Branch: refs/heads/feature/GEODE-2156
Commit: 890e6c784756e0076d9b1858c07d2a233ab95b27
Parents: f0e5159
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Wed Nov 30 15:46:30 2016 -0800
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Wed Nov 30 15:46:30 2016 -0800

----------------------------------------------------------------------
 .../web/controllers/RestAPITestBase.java        | 10 +++++-----
 ...APIsOnMembersFunctionExecutionDUnitTest.java | 21 ++++++--------------
 2 files changed, 11 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/890e6c78/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
index b1b490e..68555bc 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPITestBase.java
@@ -56,11 +56,11 @@ import org.apache.geode.test.junit.categories.DistributedTest;
 class RestAPITestBase extends JUnit4DistributedTestCase {
 
   protected Cache cache = null;
-  List<String> restURLs = new ArrayList<>();
-  VM vm0 = null;
-  VM vm1 = null;
-  VM vm2 = null;
-  VM vm3 = null;
+  protected List<String> restURLs = new ArrayList<>();
+  protected VM vm0 = null;
+  protected VM vm1 = null;
+  protected VM vm2 = null;
+  protected VM vm3 = null;
 
   @Override
   public final void postSetUp() throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/890e6c78/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
index 3907bfc..7528bff 100644
--- a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
+++ b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsOnMembersFunctionExecutionDUnitTest.java
@@ -59,15 +59,7 @@ public class RestAPIsOnMembersFunctionExecutionDUnitTest extends RestAPITestBase
     props.setProperty(HTTP_SERVICE_BIND_ADDRESS, hostName);
     props.setProperty(HTTP_SERVICE_PORT, String.valueOf(servicePort));
 
-    Cache c = null;
-    try {
-      c = CacheFactory
-          .getInstance(new RestAPIsOnMembersFunctionExecutionDUnitTest().getSystem(props));
-      c.close();
-    } catch (CacheClosedException ignore) {
-    }
-
-    c = CacheFactory.create(new RestAPIsOnMembersFunctionExecutionDUnitTest().getSystem(props));
+    CacheFactory.create(new RestAPIsOnMembersFunctionExecutionDUnitTest().getSystem(props));
     FunctionService.registerFunction(new OnMembersFunction());
 
     return "http://" + hostName + ":" + servicePort + urlContext + "/v1";
@@ -80,17 +72,16 @@ public class RestAPIsOnMembersFunctionExecutionDUnitTest extends RestAPITestBase
   }
 
   @Test
-  @Category(FlakyTest.class) // GEODE-1594 HTTP server fails to respond
   public void testFunctionExecutionOnAllMembers() {
     createCacheForVMs();
 
-    for (int i = 0; i < 10; i++) {
+    for (int i = 0; i < 5; i++) {
       CloseableHttpResponse response =
           executeFunctionThroughRestCall("OnMembersFunction", null, null, null, null, null);
       assertHttpResponse(response, 200, 4);
     }
 
-    assertCorrectInvocationCount(40, vm0, vm1, vm2, vm3);
+    assertCorrectInvocationCount(20, vm0, vm1, vm2, vm3);
 
     restURLs.clear();
   }
@@ -110,13 +101,13 @@ public class RestAPIsOnMembersFunctionExecutionDUnitTest extends RestAPITestBase
   public void testFunctionExecutionEOnSelectedMembers() {
     createCacheForVMs();
 
-    for (int i = 0; i < 10; i++) {
+    for (int i = 0; i < 5; i++) {
       CloseableHttpResponse response =
           executeFunctionThroughRestCall("OnMembersFunction", null, null, null, null, "m1,m2,m3");
       assertHttpResponse(response, 200, 3);
     }
 
-    assertCorrectInvocationCount(30, vm0, vm1, vm2, vm3);
+    assertCorrectInvocationCount(15, vm0, vm1, vm2, vm3);
 
     restURLs.clear();
   }
@@ -125,7 +116,7 @@ public class RestAPIsOnMembersFunctionExecutionDUnitTest extends RestAPITestBase
   public void testFunctionExecutionOnMembersWithFilter() {
     createCacheForVMs();
 
-    for (int i = 0; i < 10; i++) {
+    for (int i = 0; i < 5; i++) {
       CloseableHttpResponse response =
           executeFunctionThroughRestCall("OnMembersFunction", null, "key2", null, null, "m1,m2,m3");
       assertHttpResponse(response, 500, 0);


[10/31] incubator-geode git commit: GEODE-2157: Fixing sanctionedSerializables for PutAllPartialResultEx

Posted by ab...@apache.org.
GEODE-2157: Fixing sanctionedSerializables for PutAllPartialResultEx


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

Branch: refs/heads/feature/GEODE-2156
Commit: 423e04f9d86962cb183b38612b8eb21afe91e1cd
Parents: 890e6c7
Author: Dan Smith <up...@apache.org>
Authored: Wed Nov 30 16:46:23 2016 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Wed Nov 30 16:47:29 2016 -0800

----------------------------------------------------------------------
 .../org/apache/geode/codeAnalysis/sanctionedSerializables.txt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/423e04f9/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt
index 8167ed3..7ab7c4e 100644
--- a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt
+++ b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt
@@ -292,7 +292,7 @@ org/apache/geode/internal/cache/PartitionedRegionException,true,5113786059279106
 org/apache/geode/internal/cache/PartitionedRegionQueryEvaluator$MemberResultsList,false,isLastChunkReceived:boolean
 org/apache/geode/internal/cache/PartitionedRegionStatus,true,-6755318987122602065,numberOfLocalEntries:int
 org/apache/geode/internal/cache/PrimaryBucketException,true,1
-org/apache/geode/internal/cache/PutAllPartialResultException,false,result:org/apache/geode/internal/cache/PutAllPartialResultException$PutAllPartialResult
+org/apache/geode/internal/cache/PutAllPartialResultException,true,2411654400733621071,result:org/apache/geode/internal/cache/PutAllPartialResultException$PutAllPartialResult
 org/apache/geode/internal/cache/PutAllPartialResultException$PutAllPartialResult,false,firstCauseOfFailure:java/lang/Exception,firstFailedKey:java/lang/Object,succeededKeys:org/apache/geode/internal/cache/tier/sockets/VersionedObjectList,totalMapSize:int
 org/apache/geode/internal/cache/RegionClearedException,true,1266503771775907997
 org/apache/geode/internal/cache/RegionQueueException,true,4159307586325821105


[18/31] incubator-geode git commit: GEODE-1740: Correct potential region inconsistencies with concurrent clear and transaction commit

Posted by ab...@apache.org.
GEODE-1740: Correct potential region inconsistencies with concurrent clear and transaction commit


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

Branch: refs/heads/feature/GEODE-2156
Commit: 7fa2c08cf403139afa7a60a81392ca13034e490b
Parents: f0cdb66
Author: Scott Jewell <sj...@pivotal.io>
Authored: Wed Nov 2 15:59:35 2016 -0700
Committer: Kenneth Howe <kh...@apache.org>
Committed: Thu Dec 1 11:03:47 2016 -0800

----------------------------------------------------------------------
 .../geode/internal/cache/AbstractRegionMap.java |  43 +-
 .../apache/geode/internal/cache/RegionMap.java  |   4 +
 .../apache/geode/internal/cache/TXState.java    |  79 +++-
 .../internal/cache/ClearTXLockingDUnitTest.java | 431 +++++++++++++++++++
 4 files changed, 505 insertions(+), 52 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7fa2c08c/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
index 96936eef..e3e87ea 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
@@ -1551,7 +1551,6 @@ public abstract class AbstractRegionMap implements RegionMap {
     final boolean isRegionReady = !inTokenMode;
     final boolean hasRemoteOrigin = !((TXId) txId).getMemberId().equals(owner.getMyId());
     boolean cbEventInPending = false;
-    lockForTXCacheModification(owner, versionTag);
     IndexManager oqlIndexManager = owner.getIndexManager();
     try {
       RegionEntry re = getEntry(key);
@@ -1818,8 +1817,6 @@ public abstract class AbstractRegionMap implements RegionMap {
     } catch (DiskAccessException dae) {
       owner.handleDiskAccessException(dae);
       throw dae;
-    } finally {
-      releaseTXCacheModificationLock(owner, versionTag);
     }
   }
 
@@ -2353,7 +2350,6 @@ public abstract class AbstractRegionMap implements RegionMap {
     if (oqlIndexManager != null) {
       oqlIndexManager.waitForIndexInit();
     }
-    lockForTXCacheModification(owner, versionTag);
     try {
       if (forceNewEntry) {
         boolean opCompleted = false;
@@ -2582,7 +2578,6 @@ public abstract class AbstractRegionMap implements RegionMap {
       owner.handleDiskAccessException(dae);
       throw dae;
     } finally {
-      releaseTXCacheModificationLock(owner, versionTag);
       if (oqlIndexManager != null) {
         oqlIndexManager.countDownIndexUpdaters();
       }
@@ -3115,7 +3110,6 @@ public abstract class AbstractRegionMap implements RegionMap {
       if (oqlIndexManager != null) {
         oqlIndexManager.waitForIndexInit();
       }
-      lockForTXCacheModification(owner, versionTag);
       try {
         if (hasRemoteOrigin && !isTXHost && !isClientTXOriginator) {
           // If we are not a mirror then only apply the update to existing
@@ -3384,7 +3378,6 @@ public abstract class AbstractRegionMap implements RegionMap {
         owner.handleDiskAccessException(dae);
         throw dae;
       } finally {
-        releaseTXCacheModificationLock(owner, versionTag);
         if (oqlIndexManager != null) {
           oqlIndexManager.countDownIndexUpdaters();
         }
@@ -3693,40 +3686,32 @@ public abstract class AbstractRegionMap implements RegionMap {
 
   }
 
-  /** get version-generation permission from the region's version vector */
-  private void lockForTXCacheModification(LocalRegion owner, VersionTag tag) {
-
+  @Override
+  public void lockRegionForAtomicTX(LocalRegion r) {
     if (armLockTestHook != null)
-      armLockTestHook.beforeLock(owner, null);
+      armLockTestHook.beforeLock(r, null);
 
-    if (!(tag != null && tag.isFromOtherMember())) {
-      RegionVersionVector vector = owner.getVersionVector();
-      if (vector != null && !owner.hasServerProxy()) {
-        vector.lockForCacheModification();
-      }
+    RegionVersionVector vector = r.getVersionVector();
+    if (vector != null) {
+      vector.lockForCacheModification();
     }
 
     if (armLockTestHook != null)
-      armLockTestHook.afterLock(owner, null);
-
+      armLockTestHook.afterLock(r, null);
   }
 
-  /** release version-generation permission from the region's version vector */
-  private void releaseTXCacheModificationLock(LocalRegion owner, VersionTag tag) {
-
+  @Override
+  public void unlockRegionForAtomicTX(LocalRegion r) {
     if (armLockTestHook != null)
-      armLockTestHook.beforeRelease(owner, null);
+      armLockTestHook.beforeRelease(r, null);
 
-    if (!(tag != null && tag.isFromOtherMember())) {
-      RegionVersionVector vector = owner.getVersionVector();
-      if (vector != null && !owner.hasServerProxy()) {
-        vector.releaseCacheModificationLock();
-      }
+    RegionVersionVector vector = r.getVersionVector();
+    if (vector != null) {
+      vector.releaseCacheModificationLock();
     }
 
     if (armLockTestHook != null)
-      armLockTestHook.afterRelease(owner, null);
-
+      armLockTestHook.afterRelease(r, null);
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7fa2c08c/geode-core/src/main/java/org/apache/geode/internal/cache/RegionMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionMap.java b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionMap.java
index ee8a84e..7ecabd7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/RegionMap.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/RegionMap.java
@@ -372,6 +372,10 @@ public interface RegionMap extends LRUMapCallbacks {
 
   public void close();
 
+  default void lockRegionForAtomicTX(LocalRegion r) {}
+
+  default void unlockRegionForAtomicTX(LocalRegion r) {}
+
   public ARMLockTestHook getARMLockTestHook();
 
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7fa2c08c/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java b/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java
index 99a3b83..d577f39 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/TXState.java
@@ -103,6 +103,7 @@ public class TXState implements TXStateInterface {
   // Internal testing hooks
   private Runnable internalAfterReservation;
   protected Runnable internalAfterConflictCheck;
+  protected Runnable internalDuringApplyChanges;
   protected Runnable internalAfterApplyChanges;
   protected Runnable internalAfterReleaseLocalLocks;
   Runnable internalDuringIndividualSend; // package scope allows TXCommitMessage use
@@ -460,34 +461,38 @@ public class TXState implements TXStateInterface {
 
         attachFilterProfileInformation(entries);
 
-        // apply changes to the cache
-        applyChanges(entries);
-        // For internal testing
-        if (this.internalAfterApplyChanges != null) {
-          this.internalAfterApplyChanges.run();
-        }
+        lockTXRegions(regions);
 
-        // build and send the message
-        msg = buildMessage();
-        this.commitMessage = msg;
-        if (this.internalBeforeSend != null) {
-          this.internalBeforeSend.run();
-        }
+        try {
+          // apply changes to the cache
+          applyChanges(entries);
+          // For internal testing
+          if (this.internalAfterApplyChanges != null) {
+            this.internalAfterApplyChanges.run();
+          }
 
+          // build and send the message
+          msg = buildMessage();
+          this.commitMessage = msg;
+          if (this.internalBeforeSend != null) {
+            this.internalBeforeSend.run();
+          }
 
+          msg.send(this.locks.getDistributedLockId());
+          // For internal testing
+          if (this.internalAfterSend != null) {
+            this.internalAfterSend.run();
+          }
 
-        msg.send(this.locks.getDistributedLockId());
-        // For internal testing
-        if (this.internalAfterSend != null) {
-          this.internalAfterSend.run();
+          firePendingCallbacks();
+          /*
+           * This is to prepare the commit message for the caller, make sure all events are in
+           * there.
+           */
+          this.commitMessage = buildCompleteMessage();
+        } finally {
+          unlockTXRegions(regions);
         }
-
-        firePendingCallbacks();
-        /*
-         * This is to prepare the commit message for the caller, make sure all events are in there.
-         */
-        this.commitMessage = buildCompleteMessage();
-
       } finally {
         if (msg != null) {
           msg.releaseViewVersions();
@@ -503,6 +508,24 @@ public class TXState implements TXStateInterface {
     }
   }
 
+  private void lockTXRegions(IdentityHashMap<LocalRegion, TXRegionState> regions) {
+    Iterator<Map.Entry<LocalRegion, TXRegionState>> it = regions.entrySet().iterator();
+    while (it.hasNext()) {
+      Map.Entry<LocalRegion, TXRegionState> me = it.next();
+      LocalRegion r = me.getKey();
+      r.getRegionMap().lockRegionForAtomicTX(r);
+    }
+  }
+
+  private void unlockTXRegions(IdentityHashMap<LocalRegion, TXRegionState> regions) {
+    Iterator<Map.Entry<LocalRegion, TXRegionState>> it = regions.entrySet().iterator();
+    while (it.hasNext()) {
+      Map.Entry<LocalRegion, TXRegionState> me = it.next();
+      LocalRegion r = me.getKey();
+      r.getRegionMap().unlockRegionForAtomicTX(r);
+    }
+  }
+
   protected void attachFilterProfileInformation(List entries) {
     {
       Iterator/* <TXEntryStateWithRegionAndKey> */ it = entries.iterator();
@@ -769,6 +792,9 @@ public class TXState implements TXStateInterface {
       Iterator/* <TXEntryStateWithRegionAndKey> */ it = entries.iterator();
       while (it.hasNext()) {
         TXEntryStateWithRegionAndKey o = (TXEntryStateWithRegionAndKey) it.next();
+        if (this.internalDuringApplyChanges != null) {
+          this.internalDuringApplyChanges.run();
+        }
         try {
           o.es.applyChanges(o.r, o.key, this);
         } catch (RegionDestroyedException ex) {
@@ -1073,6 +1099,13 @@ public class TXState implements TXStateInterface {
   }
 
   /**
+   * Add an internal callback which is run as each transaction change is applied.
+   */
+  public void setDuringApplyChanges(Runnable duringApplyChanges) {
+    this.internalDuringApplyChanges = duringApplyChanges;
+  }
+
+  /**
    * Add an internal callback which is run after the transaction changes have been applied to
    * committed state (locally) but before local locks are released (occurs for regions of Local and
    * Distributed No Ack scope).

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7fa2c08c/geode-core/src/test/java/org/apache/geode/internal/cache/ClearTXLockingDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClearTXLockingDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ClearTXLockingDUnitTest.java
new file mode 100644
index 0000000..b620383
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ClearTXLockingDUnitTest.java
@@ -0,0 +1,431 @@
+/*
+ * 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.
+ */
+/*
+ * ClearRvvLockingDUnitTest.java
+ *
+ * Created on September 6, 2005, 2:57 PM
+ */
+package org.apache.geode.internal.cache;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheEvent;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.CacheTransactionManager;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionFactory;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.Scope;
+import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.internal.logging.LogService;
+import org.apache.geode.test.dunit.Host;
+import org.apache.geode.test.dunit.SerializableCallable;
+import org.apache.geode.test.dunit.SerializableRunnable;
+import org.apache.geode.test.dunit.SerializableRunnableIF;
+import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.logging.log4j.Logger;
+import org.assertj.core.api.JUnitSoftAssertions;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+/**
+ * Test class to verify proper locking interaction between transactions and the CLEAR region
+ * operation.
+ * 
+ * GEODE-1740: It was observed that operations performed within a transaction were not holding
+ * region modification locks for the duration of commit processing. This lock is used to ensure region
+ * consistency during CLEAR processing.  By not holding the lock for the duration of commit processing,
+ * a window was opened that allowed region operations such as clear to occur in mid-commit.
+ * 
+ * The fix for GEODE-1740 was to acquire and hold read locks for any region involved in the commit.
+ * This forces CLEAR to wait until commit processing is complete.
+ */
+@SuppressWarnings("serial")
+@Category(DistributedTest.class)
+public class ClearTXLockingDUnitTest extends JUnit4CacheTestCase {
+
+  @Rule
+  public transient JUnitSoftAssertions softly = new JUnitSoftAssertions();
+  /*
+   * This test performs operations within a transaction and during commit processing
+   * schedules a clear to be performed on the relevant region. The scheduled clear should wait until
+   * commit processing is complete before clearing the region. Failure to do so, would result in
+   * region inconsistencies.
+   */
+  VM vm0, vm1, opsVM, regionVM;
+
+  static Cache cache;
+  
+  ArmLockHook theArmHook;
+
+  DistributedMember vm0ID, vm1ID;
+
+  static CacheTransactionManager txmgr;
+
+  static final String THE_KEY = "theKey";
+  static final String THE_VALUE = "theValue";
+  static final int NUMBER_OF_PUTS = 2;
+
+  static final String REGION_NAME1 = "testRegion1";
+  static final String REGION_NAME2 = "testRegion2";
+
+  static CountDownLatch opsLatch;
+  static CountDownLatch regionLatch;
+  static CountDownLatch verifyLatch;
+
+  private static final Logger logger = LogService.getLogger();
+
+  // test methods
+
+  @Test
+  public void testPutWithClearSameVM() throws InterruptedException {
+    getVMs();
+    setupRegions(vm0, vm0);
+    setClearHook(REGION_NAME1, opsVM, regionVM);
+    performTestAndCheckResults(putOperationsTest);
+  }
+
+  @Test
+  public void testPutWithClearDifferentVM() throws InterruptedException {
+    getVMs();
+    setupRegions(vm0, vm1);
+    setClearHook(REGION_NAME1, opsVM, regionVM);
+    performTestAndCheckResults(putOperationsTest);
+  }
+  
+  /*
+   * The CLOSE tests are ignored until the close operation has been
+   * updated to acquire a write lock during processing.
+   */
+  @Ignore
+  @Test
+  public void testPutWithCloseSameVM() throws InterruptedException {
+    getVMs();
+    setupRegions(vm0, vm0);
+    setCloseHook(REGION_NAME1, opsVM, regionVM);
+    performTestAndCheckResults(putOperationsTest);
+  }
+
+  @Ignore
+  @Test
+  public void testPutWithCloseDifferentVM() throws InterruptedException {
+    getVMs();
+    setupRegions(vm0, vm1);
+    setCloseHook(REGION_NAME1, opsVM, regionVM);
+    performTestAndCheckResults(putOperationsTest);
+  }
+      
+  /*
+   * The DESTROY_REGION tests are ignored until the destroy operation has been
+   * updated to acquire a write lock during processing.
+   */
+  @Ignore
+  @Test
+  public void testPutWithDestroyRegionSameVM() throws InterruptedException {
+    getVMs();
+    setupRegions(vm0, vm0);
+    setDestroyRegionHook(REGION_NAME1, opsVM, regionVM);
+    performTestAndCheckResults(putOperationsTest);
+  }
+
+  @Ignore
+  @Test
+  public void testPutWithDestroyRegionDifferentVM() throws InterruptedException {
+    getVMs();
+    setupRegions(vm0, vm1);
+    setDestroyRegionHook(REGION_NAME1, opsVM, regionVM);
+    performTestAndCheckResults(putOperationsTest);
+  }
+      
+  // Local methods
+
+  /*
+   * This method executes a runnable test and then checks for region consistency
+   */
+  private void performTestAndCheckResults(SerializableRunnable operationsTest) throws InterruptedException {
+    try {
+      runLockingTest(opsVM, operationsTest);
+      checkForConsistencyErrors(REGION_NAME1);
+      checkForConsistencyErrors(REGION_NAME2);
+    } finally {
+      opsVM.invoke(() -> resetArmHook(REGION_NAME1));
+    }
+  }
+
+  /*
+   * We will be using 2 vms.  One for the transaction and one for the clear
+   */
+  private void getVMs() {
+    Host host = Host.getHost(0);
+    vm0 = host.getVM(0);
+    vm1 = host.getVM(1);
+  }
+  
+  /*
+   * Set which vm will perform the transaction and which will perform the region operation
+   * and create the regions on the vms
+   */
+  private void setupRegions(VM opsTarget, VM regionTarget) {
+    opsVM = opsTarget;
+    regionVM = regionTarget;
+    vm0ID = createCache(vm0);
+    vm1ID = createCache(vm1);
+    vm0.invoke(() -> createRegion(REGION_NAME1));
+    vm0.invoke(() -> createRegion(REGION_NAME2));
+    vm1.invoke(() -> createRegion(REGION_NAME1));
+    vm1.invoke(() -> createRegion(REGION_NAME2));
+  }
+
+  /*
+   * Invoke a runnable on the operations vm
+   */
+  private void runLockingTest(VM vm, SerializableRunnableIF theTest) {
+    vm.invoke(theTest);
+  }
+
+  /*
+   * Runnable used to invoke the actual test 
+   */
+  SerializableRunnable putOperationsTest = new SerializableRunnable("perform PUT") {
+    @Override
+    public void run() {
+      opsVM.invoke(() -> doPuts(getCache(), regionVM));
+    }
+  };
+
+  /*
+   * Set arm hook to detect when region operation is attempting to acquire write lock
+   * and stage the clear that will be released half way through commit processing.
+   */
+  public void setClearHook(String rname, VM whereOps, VM whereClear) {
+    whereOps.invoke(() -> setArmHook(rname));
+    whereClear.invokeAsync(() -> stageClear(rname, whereOps));
+  }
+
+  // remote test methods
+
+  /*
+   * Wait to be notified and then execute the clear.
+   * Once the clear completes, notify waiter to perform region verification. 
+   */
+  private static void stageClear(String rname, VM whereOps) throws InterruptedException {
+    regionOperationWait();
+    LocalRegion r = (LocalRegion) cache.getRegion(rname);
+    r.clear();
+    whereOps.invoke(() -> releaseVerify());
+  }
+
+  /*
+   * Set and stage method for close and destroy are the same as clear
+   */
+  public void setCloseHook(String rname, VM whereOps, VM whereClear) {
+    whereOps.invoke(() -> setArmHook(rname));
+    whereClear.invokeAsync(() -> stageClose(rname, whereOps));
+  }
+
+  private static void stageClose(String rname, VM whereOps) throws InterruptedException {
+    regionOperationWait();
+    LocalRegion r = (LocalRegion) cache.getRegion(rname);
+    r.close();
+    whereOps.invoke(() -> releaseVerify());
+  }
+
+  public void setDestroyRegionHook(String rname, VM whereOps, VM whereClear) {
+    whereOps.invoke(() -> setArmHook(rname));
+    whereClear.invokeAsync(() -> stageDestroyRegion(rname, whereOps));
+  }
+
+  private static void stageDestroyRegion(String rname, VM whereOps) throws InterruptedException {
+    regionOperationWait();
+    LocalRegion r = (LocalRegion) cache.getRegion(rname);
+    r.destroyRegion();
+    whereOps.invoke(() -> releaseVerify());
+  }
+
+  /*
+   * Set the abstract region map lock hook to detect 
+   * attempt to acquire write lock by region operation.
+   */
+  public void setArmHook(String rname) {
+    LocalRegion r = (LocalRegion) cache.getRegion(rname);
+    theArmHook = new ArmLockHook();
+    ((AbstractRegionMap) r.entries).setARMLockTestHook(theArmHook);
+  }
+
+  /*
+   * Cleanup arm lock hook by setting it null
+   */
+  public void resetArmHook(String rname) {
+    LocalRegion r = (LocalRegion) cache.getRegion(rname);
+    ((AbstractRegionMap) r.entries).setARMLockTestHook(null);
+  }
+
+  /*
+   * Wait to be notified it is time to perform region operation (i.e. CLEAR)
+   */
+  private static void regionOperationWait() throws InterruptedException {
+    regionLatch = new CountDownLatch(1);
+    regionLatch.await();
+  }
+  
+  /*
+   * A simple transaction that will have a region operation execute during commit.
+   * opsLatch is used to wait until region operation has been scheduled during commit
+   * and verifyLatch is used to ensure commit and clear processing have both completed.
+   */
+  private static void doPuts(Cache cache, VM whereRegion) throws InterruptedException {
+    TXManagerImpl txManager = (TXManagerImpl) cache.getCacheTransactionManager();
+
+    opsLatch = new CountDownLatch(1);
+    verifyLatch = new CountDownLatch(1);
+
+    txManager.begin();
+    TXStateInterface txState = ((TXStateProxyImpl)txManager.getTXState()).getRealDeal(null,null);
+    ((TXState)txState).setDuringApplyChanges(new CommitTestCallback(whereRegion));
+
+    Region region1 = cache.getRegion(REGION_NAME1);
+    Region region2 = cache.getRegion(REGION_NAME2);
+    for (int i = 0; i < NUMBER_OF_PUTS; i++) {
+      region1.put(REGION_NAME1 + THE_KEY + i, THE_VALUE + i);
+      region2.put(REGION_NAME2 + THE_KEY + i, THE_VALUE + i);
+    }
+
+    txManager.commit();
+    verifyLatch.await();
+  }
+
+  /*
+   * Release the region operation that has been previously staged
+   */
+  private static void releaseRegionOperation(VM whereRegion) {
+    whereRegion.invoke(() -> regionLatch.countDown());
+  }
+
+  /*
+   * Region operation has been scheduled, now resume commit processing
+   */
+  private static void releaseOps() {
+    opsLatch.countDown();
+  }
+
+  /*
+   * Notify waiter it is time to verify region contents
+   */
+  private static void releaseVerify() {
+    verifyLatch.countDown();
+  }
+
+  private InternalDistributedMember createCache(VM vm) {
+    return (InternalDistributedMember) vm.invoke(new SerializableCallable<Object>() {
+      public Object call() {
+        cache = getCache(new CacheFactory().set("conserve-sockets", "true"));
+        return getSystem().getDistributedMember();
+      }
+    });
+  }
+
+  private static void createRegion(String rgnName) {
+    RegionFactory<Object, Object> rf = cache.createRegionFactory(RegionShortcut.REPLICATE);
+    rf.setConcurrencyChecksEnabled(true);
+    rf.setScope(Scope.DISTRIBUTED_ACK);
+    rf.create(rgnName);
+  }
+
+  /*
+   * Get region contents from each member and verify they are consistent
+   */
+  private void checkForConsistencyErrors(String rname) {
+    Map<Object, Object> r0Contents =
+        (Map<Object, Object>) vm0.invoke(() -> getRegionContents(rname));
+    Map<Object, Object> r1Contents =
+        (Map<Object, Object>) vm1.invoke(() -> getRegionContents(rname));
+
+    for (int i = 0; i < NUMBER_OF_PUTS; i++) {
+      String theKey = rname + THE_KEY + i;
+      if (r0Contents.containsKey(theKey)) {
+        softly.assertThat(r1Contents.get(theKey))
+            .as("region contents are not consistent for key %s", theKey)
+            .isEqualTo(r0Contents.get(theKey));
+      } else {
+        softly.assertThat(r1Contents).as("expected containsKey for %s to return false", theKey)
+            .doesNotContainKey(theKey);
+      }
+    }
+  }
+
+  @SuppressWarnings("rawtypes")
+  private static Map<Object, Object> getRegionContents(String rname) {
+    LocalRegion r = (LocalRegion) cache.getRegion(rname);
+    Map<Object, Object> result = new HashMap<>();
+    for (Iterator i = r.entrySet().iterator(); i.hasNext();) {
+      Region.Entry e = (Region.Entry) i.next();
+      result.put(e.getKey(), e.getValue());
+    }
+    return result;
+  }
+  
+  /*
+   * Test callback called for each operation during commit processing.
+   * Half way through commit processing, release the region operation.
+   */
+  static class CommitTestCallback implements Runnable {
+    VM whereRegionOperation;
+    static int callCount;
+    /* entered twice for each put lap since there are 2 regions */
+    static int releasePoint = NUMBER_OF_PUTS;
+    
+    public CommitTestCallback(VM whereRegion) {
+      whereRegionOperation = whereRegion;
+      callCount = 0;
+    }
+    
+    public void run() {
+      callCount++;
+      if(callCount==releasePoint) {
+        releaseRegionOperation(whereRegionOperation);
+        try {opsLatch.await();} catch (InterruptedException e) {}
+      }
+    }
+  }
+  
+  /*
+   * The region operations attempt to acquire the write lock will hang while
+   * commit processing is occurring.  Before this occurs, resume commit processing.
+   */
+  public class ArmLockHook extends ARMLockTestHookAdapter {
+    int txCalls = 0;
+    int releasePoint = NUMBER_OF_PUTS / 2;
+    CountDownLatch putLatch = new CountDownLatch(1);
+
+    @Override
+    public void beforeLock(LocalRegion owner, CacheEvent event) {
+      if(event!=null) {
+        if (event.getOperation().isClear() || event.getOperation().isRegionDestroy() || event.getOperation().isClose()) {
+          releaseOps();
+        }
+      }
+    }
+  }
+
+}


[16/31] incubator-geode git commit: GEODE-2159 add serialVersionUIDs to exception classes not having them

Posted by ab...@apache.org.
GEODE-2159 add serialVersionUIDs to exception classes not having them

added serialVersionUIDs generated with JDK 1.8 serialver


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

Branch: refs/heads/feature/GEODE-2156
Commit: f0cdb66ae9efdc8c994a473e8ca4b74bd2b0d970
Parents: 4f67348
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Thu Dec 1 10:31:56 2016 -0800
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Thu Dec 1 10:42:52 2016 -0800

----------------------------------------------------------------------
 .../geode/DeltaSerializationException.java      |    1 +
 .../apache/geode/GemFireCheckedException.java   |    1 +
 .../org/apache/geode/InvalidDeltaException.java |    1 +
 .../cache/GatewayConfigurationException.java    |    1 +
 .../apache/geode/cache/RegionRoleException.java |    1 +
 .../apache/geode/cache/ResourceException.java   |    2 +
 ...upportedOperationInTransactionException.java |    1 +
 .../apache/geode/cache/VersionException.java    |    1 +
 .../query/QueryExecutionLowMemoryException.java |    1 +
 .../query/QueryExecutionTimeoutException.java   |    1 +
 .../QueryExecutionCanceledException.java        |    1 +
 .../internal/cache/BucketNotFoundException.java |    1 +
 .../internal/cache/DataLocationException.java   |    2 +
 .../geode/internal/cache/LocalRegion.java       |    2 +-
 .../cache/PutAllPartialResultException.java     |    3 +
 .../execute/InternalFunctionException.java      |    1 +
 ...ternalFunctionInvocationTargetException.java |    1 +
 .../RedundancyAlreadyMetException.java          |    1 +
 .../ConcurrentCacheModificationException.java   |    2 +
 .../internal/cache/versions/RVVException.java   |    2 +
 .../BucketRegionQueueUnavailableException.java  |    1 +
 .../internal/tcp/ReenteredConnectException.java |    1 +
 .../internal/util/SunAPINotFoundException.java  |    1 +
 .../geode/lang/AttachAPINotFoundException.java  |    1 +
 .../cli/exceptions/CliCommandException.java     |    1 +
 .../exceptions/CliCommandInvalidException.java  |    1 +
 .../CliCommandMultiModeOptionException.java     |    1 +
 .../CliCommandNotAvailableException.java        |    1 +
 .../exceptions/CliCommandOptionException.java   |    1 +
 .../CliCommandOptionInvalidException.java       |    1 +
 .../CliCommandOptionMissingException.java       |    1 +
 .../CliCommandOptionNotApplicableException.java |    1 +
 ...liCommandOptionValueConversionException.java |    1 +
 .../CliCommandOptionValueException.java         |    1 +
 .../CliCommandOptionValueMissingException.java  |    1 +
 .../internal/cli/exceptions/CliException.java   |    1 +
 .../cli/util/DiskStoreNotFoundException.java    |    1 +
 .../cli/util/JConsoleNotFoundException.java     |    1 +
 .../cli/util/MemberNotFoundException.java       |    1 +
 .../cli/util/VisualVmNotFoundException.java     |    1 +
 .../web/shell/MBeanAccessException.java         |    1 +
 .../RestApiCallForCommandNotFoundException.java |    1 +
 .../codeAnalysis/sanctionedSerializables.txt    | 1686 +++++++++---------
 43 files changed, 891 insertions(+), 844 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/DeltaSerializationException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/DeltaSerializationException.java b/geode-core/src/main/java/org/apache/geode/DeltaSerializationException.java
index 5e55a6c..db87e35 100644
--- a/geode-core/src/main/java/org/apache/geode/DeltaSerializationException.java
+++ b/geode-core/src/main/java/org/apache/geode/DeltaSerializationException.java
@@ -25,6 +25,7 @@ package org.apache.geode;
  * @since GemFire 6.5
  */
 public class DeltaSerializationException extends RuntimeException {
+  private static final long serialVersionUID = -2630435945840206466L;
 
   /**
    * Default constructor

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/GemFireCheckedException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/GemFireCheckedException.java b/geode-core/src/main/java/org/apache/geode/GemFireCheckedException.java
index 8d6f702..c47d9e1 100644
--- a/geode-core/src/main/java/org/apache/geode/GemFireCheckedException.java
+++ b/geode-core/src/main/java/org/apache/geode/GemFireCheckedException.java
@@ -25,6 +25,7 @@ package org.apache.geode;
  * @since GemFire 5.1
  */
 public abstract class GemFireCheckedException extends Exception {
+  private static final long serialVersionUID = -8659184576090173188L;
 
   ////////////////////// Constructors //////////////////////
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/InvalidDeltaException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/InvalidDeltaException.java b/geode-core/src/main/java/org/apache/geode/InvalidDeltaException.java
index bb75455..edbf038 100755
--- a/geode-core/src/main/java/org/apache/geode/InvalidDeltaException.java
+++ b/geode-core/src/main/java/org/apache/geode/InvalidDeltaException.java
@@ -25,6 +25,7 @@ import java.io.DataInput;
  * @since GemFire 6.1
  */
 public class InvalidDeltaException extends GemFireException {
+  private static final long serialVersionUID = 7846464807353214091L;
 
   /**
    * Creates a new <code>InvalidDeltaException</code>.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/cache/GatewayConfigurationException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/GatewayConfigurationException.java b/geode-core/src/main/java/org/apache/geode/cache/GatewayConfigurationException.java
index f930677..2d20afe 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/GatewayConfigurationException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/GatewayConfigurationException.java
@@ -22,6 +22,7 @@ package org.apache.geode.cache;
  * @since GemFire 6.6
  */
 public class GatewayConfigurationException extends GatewayException {
+  private static final long serialVersionUID = 3112317608711263007L;
 
   public GatewayConfigurationException() {
     super();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/cache/RegionRoleException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/RegionRoleException.java b/geode-core/src/main/java/org/apache/geode/cache/RegionRoleException.java
index 9b77562..adf4685 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/RegionRoleException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/RegionRoleException.java
@@ -21,6 +21,7 @@ package org.apache.geode.cache;
  * @deprecated this feature is scheduled to be removed
  */
 public abstract class RegionRoleException extends RoleException {
+  private static final long serialVersionUID = 202660222740132890L;
 
   /** The full path of the region affected by the reliability failure */
   private String regionFullPath;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/cache/ResourceException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/ResourceException.java b/geode-core/src/main/java/org/apache/geode/cache/ResourceException.java
index d044bb0..0b4593b 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/ResourceException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/ResourceException.java
@@ -22,6 +22,8 @@ package org.apache.geode.cache;
  * @since GemFire 6.0
  */
 public abstract class ResourceException extends CacheRuntimeException {
+  private static final long serialVersionUID = -5559328592343363268L;
+
   /**
    * Creates a new instance of <code>ResourceException</code> without detail message.
    */

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/cache/UnsupportedOperationInTransactionException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/UnsupportedOperationInTransactionException.java b/geode-core/src/main/java/org/apache/geode/cache/UnsupportedOperationInTransactionException.java
index f21ebc2..03b26e1 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/UnsupportedOperationInTransactionException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/UnsupportedOperationInTransactionException.java
@@ -20,6 +20,7 @@ package org.apache.geode.cache;
  * @since GemFire 6.5
  */
 public class UnsupportedOperationInTransactionException extends UnsupportedOperationException {
+  private static final long serialVersionUID = 7150156075377908268L;
 
   public UnsupportedOperationInTransactionException(String s) {
     super(s);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/cache/VersionException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/VersionException.java b/geode-core/src/main/java/org/apache/geode/cache/VersionException.java
index 296491c..5bda005 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/VersionException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/VersionException.java
@@ -23,6 +23,7 @@ import org.apache.geode.GemFireCheckedException;
  * @since GemFire 5.7
  */
 public abstract class VersionException extends GemFireCheckedException {
+  private static final long serialVersionUID = 5530501399086757174L;
 
   /** Constructs a new <code>VersionException</code>. */
   public VersionException() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/cache/query/QueryExecutionLowMemoryException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/QueryExecutionLowMemoryException.java b/geode-core/src/main/java/org/apache/geode/cache/query/QueryExecutionLowMemoryException.java
index 75c69ac..de8a3ab 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/query/QueryExecutionLowMemoryException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/QueryExecutionLowMemoryException.java
@@ -30,6 +30,7 @@ import org.apache.geode.cache.control.ResourceManager;
  * @since GemFire 7.0
  */
 public class QueryExecutionLowMemoryException extends CacheRuntimeException {
+  private static final long serialVersionUID = -8070816454346497899L;
 
   /**
    * Creates a new instance of <code>QueryExecutionLowMemoryException</code> without detail message.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/cache/query/QueryExecutionTimeoutException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/QueryExecutionTimeoutException.java b/geode-core/src/main/java/org/apache/geode/cache/query/QueryExecutionTimeoutException.java
index ada4e56..59a7235 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/query/QueryExecutionTimeoutException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/QueryExecutionTimeoutException.java
@@ -24,6 +24,7 @@ import org.apache.geode.cache.CacheRuntimeException;
  * @since GemFire 6.0
  */
 public class QueryExecutionTimeoutException extends CacheRuntimeException {
+  private static final long serialVersionUID = 3153027985663954674L;
 
   /**
    * Creates a new instance of <code>QueryExecutionTimeoutException</code> without detail message.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryExecutionCanceledException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryExecutionCanceledException.java b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryExecutionCanceledException.java
index c1beff3..63703ea 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryExecutionCanceledException.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/internal/QueryExecutionCanceledException.java
@@ -27,6 +27,7 @@ import org.apache.geode.cache.control.ResourceManager;
  * @since GemFire 7.0
  */
 public class QueryExecutionCanceledException extends CacheRuntimeException {
+  private static final long serialVersionUID = -2699578956684551688L;
 
   /**
    * Creates a new instance of <code>QueryExecutionCanceledException</code> without detail message.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketNotFoundException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketNotFoundException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketNotFoundException.java
index 6a4cee2..f77791e 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketNotFoundException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketNotFoundException.java
@@ -23,6 +23,7 @@ package org.apache.geode.internal.cache;
  *
  */
 public class BucketNotFoundException extends ForceReattemptException {
+  private static final long serialVersionUID = 2898657229184289911L;
 
   /**
    * @param message

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/internal/cache/DataLocationException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/DataLocationException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/DataLocationException.java
index 4b62e9c..b0f063e 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/DataLocationException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/DataLocationException.java
@@ -24,6 +24,8 @@ import org.apache.geode.GemFireCheckedException;
  * @see PrimaryBucketException
  */
 public abstract class DataLocationException extends GemFireCheckedException {
+  private static final long serialVersionUID = -7385193860335007389L;
+
   public DataLocationException() {}
 
   public DataLocationException(String msg) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
index 80fc5da..4349359 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/LocalRegion.java
@@ -6101,7 +6101,7 @@ public class LocalRegion extends AbstractRegion implements LoaderHelperFactory,
         boolean eventHasDelta = (getSystem().getConfig().getDeltaPropagation()
             && !this.scope.isDistributedNoAck() && entryEvent.getDeltaBytes() != null);
         VersionTag v = entry.generateVersionTag(null, eventHasDelta, this, entryEvent);
-        if (logger.isDebugEnabled()) {
+        if (logger.isDebugEnabled() && v != null) {
           logger.debug("generated version tag {} for {}", v, entryEvent.getKey());
         }
       }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/internal/cache/PutAllPartialResultException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PutAllPartialResultException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PutAllPartialResultException.java
index 883b34b..4f2130a 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PutAllPartialResultException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PutAllPartialResultException.java
@@ -32,6 +32,7 @@ import java.util.*;
 public class PutAllPartialResultException extends GemFireException {
 
   private static final long serialVersionUID = 2411654400733621071L;
+
   private PutAllPartialResult result;
 
   //////////////////// Constructors ////////////////////
@@ -93,6 +94,8 @@ public class PutAllPartialResultException extends GemFireException {
   }
 
   public static class PutAllPartialResult implements Serializable {
+    private static final long serialVersionUID = -2168767259323206954L;
+
     private VersionedObjectList succeededKeys;
     private Object firstFailedKey;
     private Exception firstCauseOfFailure;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionException.java
index 5103351..c38718d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionException.java
@@ -34,6 +34,7 @@ import org.apache.geode.cache.execute.FunctionService;
  */
 
 public class InternalFunctionException extends FunctionException {
+  private static final long serialVersionUID = 3532698050312820319L;
 
   /**
    * Creates new internal function exception with given error message.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionInvocationTargetException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionInvocationTargetException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionInvocationTargetException.java
index 0b6b5d6..1cd577b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionInvocationTargetException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/InternalFunctionInvocationTargetException.java
@@ -21,6 +21,7 @@ import org.apache.geode.cache.execute.FunctionInvocationTargetException;
 import org.apache.geode.distributed.DistributedMember;
 
 public class InternalFunctionInvocationTargetException extends FunctionInvocationTargetException {
+  private static final long serialVersionUID = -6063507496829271815L;
 
   private final Set<String> failedIds = new HashSet<String>();
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RedundancyAlreadyMetException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RedundancyAlreadyMetException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RedundancyAlreadyMetException.java
index dbd31a6..d1e43b7 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RedundancyAlreadyMetException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/partitioned/RedundancyAlreadyMetException.java
@@ -20,6 +20,7 @@ import org.apache.geode.GemFireException;
  *
  */
 public class RedundancyAlreadyMetException extends GemFireException {
+  private static final long serialVersionUID = -1876426827930995062L;
 
   public RedundancyAlreadyMetException() {
     super();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/ConcurrentCacheModificationException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/ConcurrentCacheModificationException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/ConcurrentCacheModificationException.java
index 13997b9..c970486 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/ConcurrentCacheModificationException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/ConcurrentCacheModificationException.java
@@ -26,6 +26,8 @@ import java.util.ConcurrentModificationException;
  * @since GemFire 7.0
  */
 public class ConcurrentCacheModificationException extends ConcurrentModificationException {
+  private static final long serialVersionUID = 2316928221010347462L;
+
   public ConcurrentCacheModificationException() {}
 
   public ConcurrentCacheModificationException(String message) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RVVException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RVVException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RVVException.java
index c3c82e3..81dcd50 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RVVException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/RVVException.java
@@ -53,6 +53,8 @@ import org.apache.geode.internal.VersionedDataSerializable;
  */
 abstract class RVVException
     implements Comparable<RVVException>, Cloneable, VersionedDataSerializable {
+  private static final long serialVersionUID = 2021977010704105114L;
+
   protected static boolean UseTreeSetsForTesting = false;
 
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/BucketRegionQueueUnavailableException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/BucketRegionQueueUnavailableException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/BucketRegionQueueUnavailableException.java
index 9450050..bca88da 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/BucketRegionQueueUnavailableException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/parallel/BucketRegionQueueUnavailableException.java
@@ -22,6 +22,7 @@ import org.apache.geode.GemFireException;
  * cleaned up.
  */
 public class BucketRegionQueueUnavailableException extends GemFireException {
+  private static final long serialVersionUID = -1860388334938028312L;
 
   public BucketRegionQueueUnavailableException() {}
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/internal/tcp/ReenteredConnectException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/tcp/ReenteredConnectException.java b/geode-core/src/main/java/org/apache/geode/internal/tcp/ReenteredConnectException.java
index 0d95312..39554cb 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/tcp/ReenteredConnectException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/tcp/ReenteredConnectException.java
@@ -25,6 +25,7 @@ import org.apache.geode.GemFireException;
  *
  */
 public class ReenteredConnectException extends GemFireException {
+  private static final long serialVersionUID = 2878977454669428469L;
 
   public ReenteredConnectException() {
     super();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/internal/util/SunAPINotFoundException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/util/SunAPINotFoundException.java b/geode-core/src/main/java/org/apache/geode/internal/util/SunAPINotFoundException.java
index a835e27..febf98d 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/util/SunAPINotFoundException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/util/SunAPINotFoundException.java
@@ -26,6 +26,7 @@ package org.apache.geode.internal.util;
  */
 @SuppressWarnings("unused")
 public class SunAPINotFoundException extends RuntimeException {
+  private static final long serialVersionUID = 75895915344106684L;
 
   public SunAPINotFoundException() {}
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/lang/AttachAPINotFoundException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/lang/AttachAPINotFoundException.java b/geode-core/src/main/java/org/apache/geode/lang/AttachAPINotFoundException.java
index ed57796..576c19e 100644
--- a/geode-core/src/main/java/org/apache/geode/lang/AttachAPINotFoundException.java
+++ b/geode-core/src/main/java/org/apache/geode/lang/AttachAPINotFoundException.java
@@ -25,6 +25,7 @@ package org.apache.geode.lang;
  */
 @SuppressWarnings("unused")
 public class AttachAPINotFoundException extends RuntimeException {
+  private static final long serialVersionUID = -5953162090462085551L;
 
   /**
    * Constructs an instance of the AttachAPINotFoundException class.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandException.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandException.java
index 623e558..7e5cba0 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandException.java
@@ -18,6 +18,7 @@ import org.apache.geode.management.internal.cli.parser.CommandTarget;
 import org.apache.geode.management.internal.cli.parser.OptionSet;
 
 public class CliCommandException extends CliException {
+  private static final long serialVersionUID = 968411094429216130L;
 
   private CommandTarget commandTarget;
   private OptionSet optionSet;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandInvalidException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandInvalidException.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandInvalidException.java
index 05c440b..a140059 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandInvalidException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandInvalidException.java
@@ -18,6 +18,7 @@ import org.apache.geode.management.internal.cli.parser.CommandTarget;
 import org.apache.geode.management.internal.cli.parser.OptionSet;
 
 public class CliCommandInvalidException extends CliCommandException {
+  private static final long serialVersionUID = -2195809850441234116L;
 
   public CliCommandInvalidException(final CommandTarget commandTarget) {
     this(commandTarget, null, null);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandMultiModeOptionException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandMultiModeOptionException.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandMultiModeOptionException.java
index 19a907f..acbc496 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandMultiModeOptionException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandMultiModeOptionException.java
@@ -19,6 +19,7 @@ import org.apache.geode.management.internal.cli.parser.Option;
 import org.apache.geode.management.internal.cli.parser.OptionSet;
 
 public class CliCommandMultiModeOptionException extends CliCommandOptionException {
+  private static final long serialVersionUID = -5658813370141696448L;
 
   public static final int MULTIPLE_LEAD_OPTIONS = 1; // TODO: move or delete
   public static final int OPTIONS_FROM_MULTIPLE_MODES = 2; // TODO: move or delete

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandNotAvailableException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandNotAvailableException.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandNotAvailableException.java
index ad5cc99..c471df2 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandNotAvailableException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandNotAvailableException.java
@@ -18,6 +18,7 @@ import org.apache.geode.management.internal.cli.parser.CommandTarget;
 import org.apache.geode.management.internal.cli.parser.OptionSet;
 
 public class CliCommandNotAvailableException extends CliCommandException {
+  private static final long serialVersionUID = -631339463163773007L;
 
   public CliCommandNotAvailableException(final CommandTarget commandTarget) {
     this(commandTarget, null, null);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionException.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionException.java
index 2663993..a7e56be 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionException.java
@@ -19,6 +19,7 @@ import org.apache.geode.management.internal.cli.parser.Option;
 import org.apache.geode.management.internal.cli.parser.OptionSet;
 
 public class CliCommandOptionException extends CliCommandException {
+  private static final long serialVersionUID = -5443638512704442487L;
 
   private Option option;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionInvalidException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionInvalidException.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionInvalidException.java
index 80f2000..1db8906 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionInvalidException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionInvalidException.java
@@ -19,6 +19,7 @@ import org.apache.geode.management.internal.cli.parser.Option;
 import org.apache.geode.management.internal.cli.parser.OptionSet;
 
 public class CliCommandOptionInvalidException extends CliCommandOptionException {
+  private static final long serialVersionUID = 8773148664471110429L;
 
   public CliCommandOptionInvalidException(final CommandTarget commandTarget, final Option option) {
     this(commandTarget, option, null, null);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionMissingException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionMissingException.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionMissingException.java
index 16c47b0..f263dce 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionMissingException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionMissingException.java
@@ -19,6 +19,7 @@ import org.apache.geode.management.internal.cli.parser.Option;
 import org.apache.geode.management.internal.cli.parser.OptionSet;
 
 public class CliCommandOptionMissingException extends CliCommandOptionException {
+  private static final long serialVersionUID = 7152881150151676813L;
 
   public CliCommandOptionMissingException(final CommandTarget commandTarget, final Option option) {
     this(commandTarget, option, null, null);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionNotApplicableException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionNotApplicableException.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionNotApplicableException.java
index 7044071..9814778 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionNotApplicableException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionNotApplicableException.java
@@ -19,6 +19,7 @@ import org.apache.geode.management.internal.cli.parser.Option;
 import org.apache.geode.management.internal.cli.parser.OptionSet;
 
 public class CliCommandOptionNotApplicableException extends CliCommandOptionException {
+  private static final long serialVersionUID = 4190478428338602501L;
 
   public CliCommandOptionNotApplicableException(final CommandTarget commandTarget,
       final Option option) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionValueConversionException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionValueConversionException.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionValueConversionException.java
index 0f21189..7dbf869 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionValueConversionException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionValueConversionException.java
@@ -19,6 +19,7 @@ import org.apache.geode.management.internal.cli.parser.Option;
 import org.apache.geode.management.internal.cli.parser.OptionSet;
 
 public class CliCommandOptionValueConversionException extends CliCommandOptionValueException {
+  private static final long serialVersionUID = 5144720637801591L;
 
   public CliCommandOptionValueConversionException(final CommandTarget commandTarget,
       final Option option, final String value) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionValueException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionValueException.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionValueException.java
index b3ae0bf..ee02df8 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionValueException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionValueException.java
@@ -19,6 +19,7 @@ import org.apache.geode.management.internal.cli.parser.Option;
 import org.apache.geode.management.internal.cli.parser.OptionSet;
 
 public class CliCommandOptionValueException extends CliCommandOptionException {
+  private static final long serialVersionUID = -7339487978861146474L;
 
   private final String value;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionValueMissingException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionValueMissingException.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionValueMissingException.java
index 714b9fc..023a878 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionValueMissingException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliCommandOptionValueMissingException.java
@@ -19,6 +19,7 @@ import org.apache.geode.management.internal.cli.parser.Option;
 import org.apache.geode.management.internal.cli.parser.OptionSet;
 
 public class CliCommandOptionValueMissingException extends CliCommandOptionValueException {
+  private static final long serialVersionUID = 7842061609469545533L;
 
   public CliCommandOptionValueMissingException(final CommandTarget commandTarget,
       final Option option, final String value) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliException.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliException.java
index 4bb6275..97ea785 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/exceptions/CliException.java
@@ -15,6 +15,7 @@
 package org.apache.geode.management.internal.cli.exceptions;
 
 public abstract class CliException extends Exception {
+  private static final long serialVersionUID = -7603040667204839200L;
 
   public CliException() {
     this(null, null);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/DiskStoreNotFoundException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/DiskStoreNotFoundException.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/DiskStoreNotFoundException.java
index d45d5cf..e0000b6 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/DiskStoreNotFoundException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/DiskStoreNotFoundException.java
@@ -28,6 +28,7 @@ import org.apache.geode.GemFireException;
 // TODO this GemFireException should be moved to a more appropriate package!
 @SuppressWarnings("unused")
 public class DiskStoreNotFoundException extends GemFireException {
+  private static final long serialVersionUID = -5184836041554948093L;
 
   public DiskStoreNotFoundException() {}
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/JConsoleNotFoundException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/JConsoleNotFoundException.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/JConsoleNotFoundException.java
index 2cb57c5..bf0bb5e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/JConsoleNotFoundException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/JConsoleNotFoundException.java
@@ -27,6 +27,7 @@ import org.apache.geode.GemFireException;
  */
 @SuppressWarnings("unused")
 public class JConsoleNotFoundException extends GemFireException {
+  private static final long serialVersionUID = -1485615321440327206L;
 
   public JConsoleNotFoundException() {}
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/MemberNotFoundException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/MemberNotFoundException.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/MemberNotFoundException.java
index 5acba16..78f68ae 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/MemberNotFoundException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/MemberNotFoundException.java
@@ -28,6 +28,7 @@ import org.apache.geode.GemFireException;
 // TODO this GemFireException should be moved to a more appropriate package!
 @SuppressWarnings("unused")
 public class MemberNotFoundException extends GemFireException {
+  private static final long serialVersionUID = 5686788909239181174L;
 
   public MemberNotFoundException() {}
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/VisualVmNotFoundException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/VisualVmNotFoundException.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/VisualVmNotFoundException.java
index b03072b..7f4ef96 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/VisualVmNotFoundException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/util/VisualVmNotFoundException.java
@@ -27,6 +27,7 @@ import org.apache.geode.GemFireException;
  */
 @SuppressWarnings("unused")
 public class VisualVmNotFoundException extends GemFireException {
+  private static final long serialVersionUID = -8491645604829510102L;
 
   public VisualVmNotFoundException() {}
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/MBeanAccessException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/MBeanAccessException.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/MBeanAccessException.java
index 86e7541..35fa8cb 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/MBeanAccessException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/MBeanAccessException.java
@@ -24,6 +24,7 @@ package org.apache.geode.management.internal.web.shell;
  */
 @SuppressWarnings("unused")
 public class MBeanAccessException extends RuntimeException {
+  private static final long serialVersionUID = 813768898269516238L;
 
   public MBeanAccessException() {}
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/RestApiCallForCommandNotFoundException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/RestApiCallForCommandNotFoundException.java b/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/RestApiCallForCommandNotFoundException.java
index 9da810b..7d4b97a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/RestApiCallForCommandNotFoundException.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/web/shell/RestApiCallForCommandNotFoundException.java
@@ -23,6 +23,7 @@ package org.apache.geode.management.internal.web.shell;
  */
 @SuppressWarnings("unused")
 public class RestApiCallForCommandNotFoundException extends RuntimeException {
+  private static final long serialVersionUID = 6686566370779394304L;
 
   public RestApiCallForCommandNotFoundException() {}
 



[17/31] incubator-geode git commit: GEODE-1740: Apply spotless check

Posted by ab...@apache.org.
GEODE-1740: Apply spotless check


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

Branch: refs/heads/feature/GEODE-2156
Commit: 70479204eb06f270906b07d82fdeb369de5a40b5
Parents: 7fa2c08
Author: Scott Jewell <sj...@pivotal.io>
Authored: Fri Nov 11 16:21:38 2016 -0800
Committer: Kenneth Howe <kh...@apache.org>
Committed: Thu Dec 1 11:03:47 2016 -0800

----------------------------------------------------------------------
 .../internal/cache/ClearTXLockingDUnitTest.java | 96 +++++++++++---------
 1 file changed, 51 insertions(+), 45 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70479204/geode-core/src/test/java/org/apache/geode/internal/cache/ClearTXLockingDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/ClearTXLockingDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/ClearTXLockingDUnitTest.java
index b620383..615ed97 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/ClearTXLockingDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/ClearTXLockingDUnitTest.java
@@ -54,9 +54,10 @@ import org.junit.experimental.categories.Category;
  * operation.
  * 
  * GEODE-1740: It was observed that operations performed within a transaction were not holding
- * region modification locks for the duration of commit processing. This lock is used to ensure region
- * consistency during CLEAR processing.  By not holding the lock for the duration of commit processing,
- * a window was opened that allowed region operations such as clear to occur in mid-commit.
+ * region modification locks for the duration of commit processing. This lock is used to ensure
+ * region consistency during CLEAR processing. By not holding the lock for the duration of commit
+ * processing, a window was opened that allowed region operations such as clear to occur in
+ * mid-commit.
  * 
  * The fix for GEODE-1740 was to acquire and hold read locks for any region involved in the commit.
  * This forces CLEAR to wait until commit processing is complete.
@@ -68,15 +69,15 @@ public class ClearTXLockingDUnitTest extends JUnit4CacheTestCase {
   @Rule
   public transient JUnitSoftAssertions softly = new JUnitSoftAssertions();
   /*
-   * This test performs operations within a transaction and during commit processing
-   * schedules a clear to be performed on the relevant region. The scheduled clear should wait until
-   * commit processing is complete before clearing the region. Failure to do so, would result in
-   * region inconsistencies.
+   * This test performs operations within a transaction and during commit processing schedules a
+   * clear to be performed on the relevant region. The scheduled clear should wait until commit
+   * processing is complete before clearing the region. Failure to do so, would result in region
+   * inconsistencies.
    */
   VM vm0, vm1, opsVM, regionVM;
 
   static Cache cache;
-  
+
   ArmLockHook theArmHook;
 
   DistributedMember vm0ID, vm1ID;
@@ -113,10 +114,10 @@ public class ClearTXLockingDUnitTest extends JUnit4CacheTestCase {
     setClearHook(REGION_NAME1, opsVM, regionVM);
     performTestAndCheckResults(putOperationsTest);
   }
-  
+
   /*
-   * The CLOSE tests are ignored until the close operation has been
-   * updated to acquire a write lock during processing.
+   * The CLOSE tests are ignored until the close operation has been updated to acquire a write lock
+   * during processing.
    */
   @Ignore
   @Test
@@ -135,10 +136,10 @@ public class ClearTXLockingDUnitTest extends JUnit4CacheTestCase {
     setCloseHook(REGION_NAME1, opsVM, regionVM);
     performTestAndCheckResults(putOperationsTest);
   }
-      
+
   /*
-   * The DESTROY_REGION tests are ignored until the destroy operation has been
-   * updated to acquire a write lock during processing.
+   * The DESTROY_REGION tests are ignored until the destroy operation has been updated to acquire a
+   * write lock during processing.
    */
   @Ignore
   @Test
@@ -157,13 +158,14 @@ public class ClearTXLockingDUnitTest extends JUnit4CacheTestCase {
     setDestroyRegionHook(REGION_NAME1, opsVM, regionVM);
     performTestAndCheckResults(putOperationsTest);
   }
-      
+
   // Local methods
 
   /*
    * This method executes a runnable test and then checks for region consistency
    */
-  private void performTestAndCheckResults(SerializableRunnable operationsTest) throws InterruptedException {
+  private void performTestAndCheckResults(SerializableRunnable operationsTest)
+      throws InterruptedException {
     try {
       runLockingTest(opsVM, operationsTest);
       checkForConsistencyErrors(REGION_NAME1);
@@ -174,17 +176,17 @@ public class ClearTXLockingDUnitTest extends JUnit4CacheTestCase {
   }
 
   /*
-   * We will be using 2 vms.  One for the transaction and one for the clear
+   * We will be using 2 vms. One for the transaction and one for the clear
    */
   private void getVMs() {
     Host host = Host.getHost(0);
     vm0 = host.getVM(0);
     vm1 = host.getVM(1);
   }
-  
+
   /*
-   * Set which vm will perform the transaction and which will perform the region operation
-   * and create the regions on the vms
+   * Set which vm will perform the transaction and which will perform the region operation and
+   * create the regions on the vms
    */
   private void setupRegions(VM opsTarget, VM regionTarget) {
     opsVM = opsTarget;
@@ -205,7 +207,7 @@ public class ClearTXLockingDUnitTest extends JUnit4CacheTestCase {
   }
 
   /*
-   * Runnable used to invoke the actual test 
+   * Runnable used to invoke the actual test
    */
   SerializableRunnable putOperationsTest = new SerializableRunnable("perform PUT") {
     @Override
@@ -215,8 +217,8 @@ public class ClearTXLockingDUnitTest extends JUnit4CacheTestCase {
   };
 
   /*
-   * Set arm hook to detect when region operation is attempting to acquire write lock
-   * and stage the clear that will be released half way through commit processing.
+   * Set arm hook to detect when region operation is attempting to acquire write lock and stage the
+   * clear that will be released half way through commit processing.
    */
   public void setClearHook(String rname, VM whereOps, VM whereClear) {
     whereOps.invoke(() -> setArmHook(rname));
@@ -226,8 +228,8 @@ public class ClearTXLockingDUnitTest extends JUnit4CacheTestCase {
   // remote test methods
 
   /*
-   * Wait to be notified and then execute the clear.
-   * Once the clear completes, notify waiter to perform region verification. 
+   * Wait to be notified and then execute the clear. Once the clear completes, notify waiter to
+   * perform region verification.
    */
   private static void stageClear(String rname, VM whereOps) throws InterruptedException {
     regionOperationWait();
@@ -264,8 +266,8 @@ public class ClearTXLockingDUnitTest extends JUnit4CacheTestCase {
   }
 
   /*
-   * Set the abstract region map lock hook to detect 
-   * attempt to acquire write lock by region operation.
+   * Set the abstract region map lock hook to detect attempt to acquire write lock by region
+   * operation.
    */
   public void setArmHook(String rname) {
     LocalRegion r = (LocalRegion) cache.getRegion(rname);
@@ -288,11 +290,11 @@ public class ClearTXLockingDUnitTest extends JUnit4CacheTestCase {
     regionLatch = new CountDownLatch(1);
     regionLatch.await();
   }
-  
+
   /*
-   * A simple transaction that will have a region operation execute during commit.
-   * opsLatch is used to wait until region operation has been scheduled during commit
-   * and verifyLatch is used to ensure commit and clear processing have both completed.
+   * A simple transaction that will have a region operation execute during commit. opsLatch is used
+   * to wait until region operation has been scheduled during commit and verifyLatch is used to
+   * ensure commit and clear processing have both completed.
    */
   private static void doPuts(Cache cache, VM whereRegion) throws InterruptedException {
     TXManagerImpl txManager = (TXManagerImpl) cache.getCacheTransactionManager();
@@ -301,8 +303,8 @@ public class ClearTXLockingDUnitTest extends JUnit4CacheTestCase {
     verifyLatch = new CountDownLatch(1);
 
     txManager.begin();
-    TXStateInterface txState = ((TXStateProxyImpl)txManager.getTXState()).getRealDeal(null,null);
-    ((TXState)txState).setDuringApplyChanges(new CommitTestCallback(whereRegion));
+    TXStateInterface txState = ((TXStateProxyImpl) txManager.getTXState()).getRealDeal(null, null);
+    ((TXState) txState).setDuringApplyChanges(new CommitTestCallback(whereRegion));
 
     Region region1 = cache.getRegion(REGION_NAME1);
     Region region2 = cache.getRegion(REGION_NAME2);
@@ -384,34 +386,37 @@ public class ClearTXLockingDUnitTest extends JUnit4CacheTestCase {
     }
     return result;
   }
-  
+
   /*
-   * Test callback called for each operation during commit processing.
-   * Half way through commit processing, release the region operation.
+   * Test callback called for each operation during commit processing. Half way through commit
+   * processing, release the region operation.
    */
   static class CommitTestCallback implements Runnable {
     VM whereRegionOperation;
     static int callCount;
     /* entered twice for each put lap since there are 2 regions */
     static int releasePoint = NUMBER_OF_PUTS;
-    
+
     public CommitTestCallback(VM whereRegion) {
       whereRegionOperation = whereRegion;
       callCount = 0;
     }
-    
+
     public void run() {
       callCount++;
-      if(callCount==releasePoint) {
+      if (callCount == releasePoint) {
         releaseRegionOperation(whereRegionOperation);
-        try {opsLatch.await();} catch (InterruptedException e) {}
+        try {
+          opsLatch.await();
+        } catch (InterruptedException e) {
+        }
       }
     }
   }
-  
+
   /*
-   * The region operations attempt to acquire the write lock will hang while
-   * commit processing is occurring.  Before this occurs, resume commit processing.
+   * The region operations attempt to acquire the write lock will hang while commit processing is
+   * occurring. Before this occurs, resume commit processing.
    */
   public class ArmLockHook extends ARMLockTestHookAdapter {
     int txCalls = 0;
@@ -420,8 +425,9 @@ public class ClearTXLockingDUnitTest extends JUnit4CacheTestCase {
 
     @Override
     public void beforeLock(LocalRegion owner, CacheEvent event) {
-      if(event!=null) {
-        if (event.getOperation().isClear() || event.getOperation().isRegionDestroy() || event.getOperation().isClose()) {
+      if (event != null) {
+        if (event.getOperation().isClear() || event.getOperation().isRegionDestroy()
+            || event.getOperation().isClose()) {
           releaseOps();
         }
       }


[12/31] incubator-geode git commit: GEODE-2158: Include correct NOTICE file in jar artifacts

Posted by ab...@apache.org.
GEODE-2158: Include correct NOTICE file in jar artifacts


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

Branch: refs/heads/feature/GEODE-2156
Commit: f4439fc97189e0423f965f61e41db6a64471005e
Parents: 5928459
Author: Anthony Baker <ab...@apache.org>
Authored: Wed Nov 30 15:09:47 2016 -0800
Committer: Anthony Baker <ab...@apache.org>
Committed: Wed Nov 30 17:08:06 2016 -0800

----------------------------------------------------------------------
 gradle/java.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f4439fc9/gradle/java.gradle
----------------------------------------------------------------------
diff --git a/gradle/java.gradle b/gradle/java.gradle
index de501c6..b20ebc8 100644
--- a/gradle/java.gradle
+++ b/gradle/java.gradle
@@ -51,7 +51,7 @@ subprojects {
 
         metaInf {
           from("$rootDir/LICENSE")
-          if (!jar.source.contains('NOTICE')) {
+          if (jar.source.filter({ it.name.contains('NOTICE') }).empty) {
             from("$rootDir/NOTICE")
           }
         }


[30/31] incubator-geode git commit: GEODE-2156: Remove incubating references from the website

Posted by ab...@apache.org.
GEODE-2156: Remove incubating references from the website


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

Branch: refs/heads/feature/GEODE-2156
Commit: 30c269ef5ab232cd0ee590a43c31c828f0143e19
Parents: 4dfdeee
Author: Anthony Baker <ab...@apache.org>
Authored: Wed Nov 30 19:46:11 2016 -0800
Committer: Anthony Baker <ab...@apache.org>
Committed: Thu Dec 1 17:35:15 2016 -0800

----------------------------------------------------------------------
 geode-site/website/README.md                    |  6 +++---
 geode-site/website/content/community/index.html | 12 ++++++------
 geode-site/website/content/docs/index.html      |  4 ++--
 geode-site/website/content/index.html           |  6 ++----
 geode-site/website/content/releases/index.html  |  2 +-
 geode-site/website/layouts/footer.html          |  6 +-----
 geode-site/website/layouts/header.html          |  4 ++--
 7 files changed, 17 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30c269ef/geode-site/website/README.md
----------------------------------------------------------------------
diff --git a/geode-site/website/README.md b/geode-site/website/README.md
index 8baf904..56b6aeb 100644
--- a/geode-site/website/README.md
+++ b/geode-site/website/README.md
@@ -6,7 +6,7 @@ Source files for the website are in `${geode-project-dir}/geode-site/website/con
 
 Generated files for the website are in `${geode-project-dir}/geode-site/content`.
 
-NOTE: To make changes to the [Apache Geode User Guide](http://geode.incubator.apache.org/docs/guide/About_Geode.html):
+NOTE: To make changes to the [Apache Geode User Guide](http://geode.apache.org/docs/guide/About_Geode.html):
 
 - See `${geode-project-dir}/geode-docs/CONTRIBUTE.md` for information about contributing to the documentation source files.
 - See `${geode-project-dir}/geode-book/README.md` for information about building a local version of the guide and adding it to the website.
@@ -15,7 +15,7 @@ The website is updated by a "sync" tool that monitors the __asf-site__ branch
 of our Git repo, so after making changes you must place your updated source
 and generated files on the __asf-site__ branch and push.
 The content will be published to the
-Geode website](http://geode.incubator.apache.org) after a 5-20 minute delay.
+Geode website](http://geode.apache.org) after a 5-20 minute delay.
 
 ## Prerequisites
 
@@ -48,7 +48,7 @@ If you need to change the layout or styling of the site,
 then you will probably need to change an HTML, JS or CSS file 
 within the ``${geode-project-dir}/geode-site/website/content`` directory.
 
-NOTE: The [Apache Geode User Guide](http://geode.incubator.apache.org/docs/guide/About_Geode.html) source files are in `${geode-project-dir}/geode-docs/`. See `${geode-project-dir}/geode-docs/CONTRIBUTE.md` for more information.
+NOTE: The [Apache Geode User Guide](http://geode.apache.org/docs/guide/About_Geode.html) source files are in `${geode-project-dir}/geode-docs/`. See `${geode-project-dir}/geode-docs/CONTRIBUTE.md` for more information.
 
 ### 2. Locally generate the site and test your changes
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30c269ef/geode-site/website/content/community/index.html
----------------------------------------------------------------------
diff --git a/geode-site/website/content/community/index.html b/geode-site/website/content/community/index.html
index 5126458..34e085c 100644
--- a/geode-site/website/content/community/index.html
+++ b/geode-site/website/content/community/index.html
@@ -22,7 +22,7 @@ under the License. -->
     	<div class="row">
         <br/>
 	    	<h2>Join Our Community of Contributors!</h2>
-        <p>The Apache Geode (incubating) team welcomes contributors who want to support the Geode technology. Our community builds everything from this website, from the Geode code to documentation and best practices information.</p>
+        <p>The Apache Geode team welcomes contributors who want to support the Geode technology. Our community builds everything from this website, from the Geode code to documentation and best practices information.</p>
 
         <p>We especially welcome additions and corrections to the documentation, wiki, and website to improve the user experience. Bug reports and fixes and additions to the Apache Geode code are welcome. Helping users learn best practices also earns good karma in our community.</p>
 		</div>
@@ -40,19 +40,19 @@ under the License. -->
 	    	<div class="col-md-4">
 	    		<h3>Users</h3>
 	    		<p><em>Perfect if you build apps against Apache Geode or deploy Apache Geode.</em></p>
-	    		<p>To subscribe, send a blank email to<br/><a href="mailto:user-subscribe@geode.incubator.apache.org">user-subscribe@geode.incubator.apache.org</a>.</p>
+	    		<p>To subscribe, send a blank email to<br/><a href="mailto:user-subscribe@geode.apache.org">user-subscribe@geode.apache.org</a>.</p>
 	    		<p>You can also <a href="http://markmail.org/search/?q=list%3Aorg.apache.geode.user+order%3Adate-backward">read the archives</a>.</p>
 			</div>
 	    	<div class="col-md-4">
 	    		<h3>Dev</h3>
 	    		<p><em>If you are building contributions & modifications to Apache Geode this is the list for you.</em><p>
-	    		<p>To subscribe, send a blank email to<br/><a href="mailto:dev-subscribe@geode.incubator.apache.org">dev-subscribe@geode.incubator.apache.org</a>.</p>
+	    		<p>To subscribe, send a blank email to<br/><a href="mailto:dev-subscribe@geode.apache.org">dev-subscribe@geode.apache.org</a>.</p>
 	    		<p>You can also <a href="http://markmail.org/search/?q=list%3Aorg.apache.geode.dev+order%3Adate-backward">read the archives</a>.</p>
 			</div>
 	    	<div class="col-md-4">
 	    		<h3>Commits</h3>
 	    		<p><em>This list receives an email whenever new code is contributed to Apache Geode.</em><p>
-	    		<p>To subscribe, send a blank email to<br/><a href="mailto:commits-subscribe@geode.incubator.apache.org">commits-subscribe@geode.incubator.apache.org</a>.</p>
+	    		<p>To subscribe, send a blank email to<br/><a href="mailto:commits-subscribe@geode.apache.org">commits-subscribe@geode.apache.org</a>.</p>
 	    		<p>You can also <a href="http://markmail.org/search/?q=list%3Aorg.apache.geode.commits+order%3Adate-backward">read the archives</a>.</p>
 			</div>
 		</div>
@@ -170,7 +170,7 @@ under the License. -->
 			</a> -->
 			<div class="col-md-3">
 				<h3>&nbsp;</h3>
-    	    	<p><i>Want to be added to this list? <a href="mailto:user@geode.incubator.apache.org">Contact us!</a></i><p>
+    	    	<p><i>Want to be added to this list? <a href="mailto:user@geode.apache.org">Contact us!</a></i><p>
 			</div>
 		</div>
 	</div>
@@ -284,7 +284,7 @@ under the License. -->
 			</div>
       <div class="col-md-3">
         <h3>&nbsp;</h3>
-            <p><i>Want to be added to this list? Join the community, contribute and <a href="mailto:dev@geode.incubator.apache.org">contact us!</a></i><p>
+            <p><i>Want to be added to this list? Join the community, contribute and <a href="mailto:dev@geode.apache.org">contact us!</a></i><p>
       </div>
 		</div>
 	</div>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30c269ef/geode-site/website/content/docs/index.html
----------------------------------------------------------------------
diff --git a/geode-site/website/content/docs/index.html b/geode-site/website/content/docs/index.html
index d09dea0..0a475f9 100644
--- a/geode-site/website/content/docs/index.html
+++ b/geode-site/website/content/docs/index.html
@@ -31,11 +31,11 @@ under the License. -->
     <div class="container">
 	<div class="row">
 	    <div class="col-md-4">
-	    		<h3><a href="guide/about_geode.html" style="color: #1275ff;">Apache Geode (incubating) User Documentation</a></h3>
+	    		<h3><a href="guide/about_geode.html" style="color: #1275ff;">Apache Geode User Documentation</a></h3>
 	    		<p>Installation Instructions, User Manual, other product docs</p>
 	    </div>
 	    <div class="col-md-4">
-	    		<h3><a href="http://geode.incubator.apache.org/releases/latest/javadoc/index.html" style="color: #1275ff;">Javadocs</a></h3>
+	    		<h3><a href="http://geode.apache.org/releases/latest/javadoc/index.html" style="color: #1275ff;">Javadocs</a></h3>
 	    		<p>API Reference in conventional Javadoc format<p>
 	    </div>
 	    <div class="col-md-4">

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30c269ef/geode-site/website/content/index.html
----------------------------------------------------------------------
diff --git a/geode-site/website/content/index.html b/geode-site/website/content/index.html
index 3761676..867eddd 100644
--- a/geode-site/website/content/index.html
+++ b/geode-site/website/content/index.html
@@ -29,7 +29,7 @@ under the License. -->
                   Take advantage of Apache Geode's unique technology that blends advanced techniques for data replication, partitioning and distributed processing.
 
                   <br/><br/>
-                  Apache Geode (incubating) provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing.<br/>
+                  Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing.<br/>
             </div>
 
             <div class="btn-wrapper">
@@ -149,7 +149,7 @@ under the License. -->
         <div class="row">
             <div class="col-md-12 text-left">
                 <h2>About the Project</h2>
-                <p>Apache Geode (incubating) is a data management platform that provides real-time, consistent access to data-intensive applications throughout widely distributed cloud architectures.</p>
+                <p>Apache Geode is a data management platform that provides real-time, consistent access to data-intensive applications throughout widely distributed cloud architectures.</p>
 
                 <p>By pooling memory, CPU, network resources, and (optionally) local disk across multiple processes to manage application objects and behavior, it uses dynamic replication and data partitioning techniques to implement high availability, improved performance, scalability, and fault tolerance. In addition to being a distributed data container, Apache Geode is an in-memory data management system that provides reliable asynchronous event notifications and guaranteed message delivery.</p>
 
@@ -157,8 +157,6 @@ under the License. -->
 Commercially available as GemFire\u2122, the technology was first widely deployed in the financial sector as the transactional, low-latency data engine used
 in Wall Street trading platforms.
 Today Apache Geode is used by over 600 enterprise customers for high-scale business applications that must meet low latency and 24x7 availability requirements.</p>
-
-                <p>This project is undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.</p>
             </div>
             <!--
             <div class="col-md-4 text-left">

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30c269ef/geode-site/website/content/releases/index.html
----------------------------------------------------------------------
diff --git a/geode-site/website/content/releases/index.html b/geode-site/website/content/releases/index.html
index 0efb681..08b28f1 100644
--- a/geode-site/website/content/releases/index.html
+++ b/geode-site/website/content/releases/index.html
@@ -95,7 +95,7 @@ under the License. -->
       <!-- END OF RELEASE -->
       <hr/>
         <p>
-					Project releases are approved by vote of the Apache Geode Podling Project Management Committee (PPMC) and Apache Incubator (PMC). Support for a release is provided by project volunteers on the project <a href="http://geode.incubator.apache.org/community/#mailing-lists">mailing lists</a>. Bugs found in a release may be discussed on the list and reported through the <a href="https://issues.apache.org/jira/browse/GEODE">issue tracker</a>. The user mailing list and issue tracker are the only support options hosted by the Apache Geode project.
+					Project releases are approved by vote of the Apache Geode Project Management Committee (PMC). Support for a release is provided by project volunteers on the project <a href="http://geode.apache.org/community/#mailing-lists">mailing lists</a>. Bugs found in a release may be discussed on the list and reported through the <a href="https://issues.apache.org/jira/browse/GEODE">issue tracker</a>. The user mailing list and issue tracker are the only support options hosted by the Apache Geode project.
 				</p>
 				<p>
 					<strong>Note</strong>: When downloading from a mirror, please be sure to verify that checksums and signatures are correct. To do so, use the checksum and signature files from the main Apache site at <a href="https://dist.apache.org/repos/dist/release/incubator/geode/">https://dist.apache.org/repos/dist/release/incubator/geode/</a>. Find here the KEYS file, which contains all OpenPGP keys we use to sign releases here: <a href="https://git-wip-us.apache.org/repos/asf?p=incubator-geode.git;a=blob;f=KEYS;h=9d13f70a9ce8f8d6a7c3feb1e194ccec123b5868;hb=c26334542fa9e90daff5f58467d6e174b3e0f3e2">KEYS</a>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30c269ef/geode-site/website/layouts/footer.html
----------------------------------------------------------------------
diff --git a/geode-site/website/layouts/footer.html b/geode-site/website/layouts/footer.html
index 08dc71d..fc817f4 100644
--- a/geode-site/website/layouts/footer.html
+++ b/geode-site/website/layouts/footer.html
@@ -64,12 +64,8 @@
         <div class="row">
           <center>
             <div id="copyright">
-                <a href="http://incubator.apache.org" target="_blank"><img src="/img/egg-logo.png" /></a><br/><br/>
-                <p class="credits">
-                Apache Geode is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indicate that the project has yet to be fully endorsed by the ASF.
-                </p>
                 <p>Copyright � 2016 The Apache Software Foundation, Licensed under the Apache License, Version 2.0.<br>
-                Apache, Apache Geode (incubating), and the Apache feather logos are trademarks of The Apache Software Foundation.</p>
+                Apache, Apache Geode, and the Apache feather logos are trademarks of The Apache Software Foundation.</p>
                 <p>Site designed & assembled with love by <a href="https://github.com/ryuneeee">@ryuneeee</a> + <a href="https://github.com/realbeast">@realbeast</a> + <a href="https://twitter.com/timanglade">@timanglade</a> + <a href="https://twitter.com/snoopdave">@snoopdave</a> for Apache Usergrid.</p>
                 <p>Modified for Apache Geode by <a href="https://twitter.com/william_markito">@william_markito</a>.</p>
             </div>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/30c269ef/geode-site/website/layouts/header.html
----------------------------------------------------------------------
diff --git a/geode-site/website/layouts/header.html b/geode-site/website/layouts/header.html
index 843c689..b40ccd9 100644
--- a/geode-site/website/layouts/header.html
+++ b/geode-site/website/layouts/header.html
@@ -16,12 +16,12 @@
   specific language governing permissions and limitations
   under the License. -->
     <meta charset="utf-8">
-    <title>Apache Geode (incubating) \u2014 <%= @item[:title] %></title>
+    <title>Apache Geode \u2014 <%= @item[:title] %></title>
     <meta http-equiv="x-ua-compatible" content="ie=edge" />
     <meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1" />
     <meta name="keywords" content="Apache Geode, Geode, GemFire, In-memory, IMDB, IMDG, cache">
     <meta name="description" content="Apache Geode is a distributed, in-memory database with strong data consistency, built to support transactional applications with low latency and high concurrency needs." />
-    <meta property="og:title" content="Apache Geode (incubating)" />
+    <meta property="og:title" content="Apache Geode" />
     <meta property="og:description" content="Apache Geode is a distributed, in-memory database with strong data consistency, built to support transactional applications with low latency and high concurrency needs." />
     <!-- Loading Typekit -->
     <script type="text/javascript" src="//use.typekit.net/ddl7izx.js"></script>


[22/31] incubator-geode git commit: GEODE-2129: Docs - clarify need for unique distributed-system-id

Posted by ab...@apache.org.
GEODE-2129: Docs - clarify need for unique distributed-system-id


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

Branch: refs/heads/feature/GEODE-2156
Commit: fdd6166889af780435cbae0923655fdfdff5d628
Parents: 1477c74
Author: Dave Barnes <db...@pivotal.io>
Authored: Thu Dec 1 15:28:13 2016 -0800
Committer: Dave Barnes <db...@pivotal.io>
Committed: Thu Dec 1 15:29:38 2016 -0800

----------------------------------------------------------------------
 geode-docs/configuring/chapter_overview.html.md.erb          | 5 +++--
 .../configuring/cluster_config/export-import.html.md.erb     | 2 +-
 .../cluster_config/gfsh_config_troubleshooting.html.md.erb   | 2 +-
 .../running/deploy_config_files_intro.html.md.erb            | 6 ++++--
 geode-docs/reference/topics/gemfire_properties.html.md.erb   | 8 +++++++-
 5 files changed, 16 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fdd61668/geode-docs/configuring/chapter_overview.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/configuring/chapter_overview.html.md.erb b/geode-docs/configuring/chapter_overview.html.md.erb
index 295444c..f4a48e8 100644
--- a/geode-docs/configuring/chapter_overview.html.md.erb
+++ b/geode-docs/configuring/chapter_overview.html.md.erb
@@ -19,9 +19,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-You use the `gfsh` command-line utility to configure your Apache Geode cluster (also called a "distributed system"). The cluster configuration service persists the cluster configurations and distributes the configurations to members of the cluster. There are also several additional ways to configure a cluster.
+Use the `gfsh` command-line utility to configure your Apache Geode cluster (also called a "distributed system"). The cluster configuration service persists the cluster configurations and distributes the configurations to members of the cluster. There are also several additional ways to configure a cluster.
 
-You use `gfsh` to configure regions, disk stores, members, and other Geode objects. You also use `gfsh` to start and stop locators, servers, and Geode monitoring tools. As you execute these commands, the cluster configuration service persists the configuration. When new members join the cluster, the service distributes the configuration to the new members.
+Use `gfsh` to configure regions, disk stores, members, and other Geode objects. 
+You can also use `gfsh` to start and stop locators, servers, and Geode monitoring tools. As you execute these commands, the cluster configuration service persists the configuration. When new members join the cluster, the service distributes the configuration to the new members.
 
 `gfsh` is the recommended means of configuring and managing your Apache Geode cluster, however you can still configure many aspects of a cluster using the older methods of the cache.xml and gemfire.properties files. See [cache.xml](../reference/topics/chapter_overview_cache_xml.html#cache_xml) and the [Reference](../reference/book_intro.html#reference) for configuration parameters. You can also configure some aspects of a cluster using a Java API. See [Managing Apache Geode](../managing/book_intro.html#managing_gemfire_intro).
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fdd61668/geode-docs/configuring/cluster_config/export-import.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/configuring/cluster_config/export-import.html.md.erb b/geode-docs/configuring/cluster_config/export-import.html.md.erb
index 5a89f51..32dab1e 100644
--- a/geode-docs/configuring/cluster_config/export-import.html.md.erb
+++ b/geode-docs/configuring/cluster_config/export-import.html.md.erb
@@ -25,7 +25,7 @@ The cluster configuration service saves the cluster configuration as you create
 
 ## Exporting a Cluster Configuration
 
-You issue the `gfsh` `export cluster-configuration` command to save the configuration data for you cluster in a zip file. This zip file contains subdirectories for cluster-level configurations and a directory for each group specified in the cluster. The contents of these directories are described in [Cluster Configuration Files and Troubleshooting](gfsh_config_troubleshooting.html#concept_ylt_2cb_y4).
+Issue the `gfsh` `export cluster-configuration` command to save the configuration data for your cluster in a zip file. This zip file contains subdirectories for cluster-level configurations and a directory for each group specified in the cluster. The contents of these directories are described in [Cluster Configuration Files and Troubleshooting](gfsh_config_troubleshooting.html#concept_ylt_2cb_y4).
 
 To export a cluster configuration, run the `gfsh` `export cluster-configuration` command while connected to a Geode cluster. For example:
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fdd61668/geode-docs/configuring/cluster_config/gfsh_config_troubleshooting.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/configuring/cluster_config/gfsh_config_troubleshooting.html.md.erb b/geode-docs/configuring/cluster_config/gfsh_config_troubleshooting.html.md.erb
index 638ff1d..99a4932 100644
--- a/geode-docs/configuring/cluster_config/gfsh_config_troubleshooting.html.md.erb
+++ b/geode-docs/configuring/cluster_config/gfsh_config_troubleshooting.html.md.erb
@@ -24,7 +24,7 @@ When you use the cluster configuration service in Geode, you can examine the gen
 The following directories and configuration files are available on the locator running the cluster configuration service:
 
 **Cluster-level configuration**  
-For configurations that apply to all members of a cluster, the locator creates a `cluster` subdirectory within the `cluster_config` directory (or in the cluster configuration directory when starting up the locator with the `--cluster-config-dir=value` parameter) specified All servers receive this configuration when they are started using `gfsh`. This directory contains:
+For configurations that apply to all members of a cluster, the locator creates a `cluster` subdirectory within the `cluster_config` directory (or in the cluster configuration directory when starting up the locator with the `--cluster-config-dir=value` parameter) specified. All servers receive this configuration when they are started using `gfsh`. This directory contains:
 
 -   `cluster.xml` -- A Geode `cache.xml` file containing configuration common to all members
 -   `cluster.properties` -- a Geode ` gemfire.properties` file containing properties common to all members

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fdd61668/geode-docs/configuring/running/deploy_config_files_intro.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/configuring/running/deploy_config_files_intro.html.md.erb b/geode-docs/configuring/running/deploy_config_files_intro.html.md.erb
index 6d52529..f44d60e 100644
--- a/geode-docs/configuring/running/deploy_config_files_intro.html.md.erb
+++ b/geode-docs/configuring/running/deploy_config_files_intro.html.md.erb
@@ -27,8 +27,10 @@ These are the basic steps for deploying configuration files, with related detail
 
 ## <a id="concept_337B365782E44951B73F33E1E17AB07B__section_53C98F9DB1584E3BABFA315CDF254A92" class="no-quick-link"></a>Geode Configuration Files
 
--   `gemfire.properties`. Contains the settings required by members of a distributed system. These settings include licensing, system member discovery, communication parameters, logging, and statistics. See the [Reference](../../reference/book_intro.html#reference).
--   **`gfsecurity.properties`**. An optional separate file that contains security-related (`security-*`) settings that are otherwise defined in `gemfire.properties`. Placing these member properties into a separate file allows you to restrict user access to those specific settings. See the [Reference](../../reference/book_intro.html#reference).
+-   `gemfire.properties`. Contains the settings required by members of a distributed system. These settings include licensing, system member discovery, communication parameters, logging, and statistics. 
+See the [Geode Properties Reference](../../reference/topics/gemfire_properties.html).
+-   **`gfsecurity.properties`**. An optional separate file that contains security-related (`security-*`) settings that are otherwise defined in `gemfire.properties`. Placing these member properties into a separate file allows you to restrict user access to those specific settings. 
+See the [Geode Properties Reference](../../reference/topics/gemfire_properties.html).
 -   `cache.xml`. Declarative cache configuration file. This file contains XML declarations for cache, region, and region entry configuration. You also use it to configure disk stores, database login credentials, server and remote site location information, and socket information. See [cache.xml](../../reference/topics/chapter_overview_cache_xml.html#cache_xml).
 
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fdd61668/geode-docs/reference/topics/gemfire_properties.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/reference/topics/gemfire_properties.html.md.erb b/geode-docs/reference/topics/gemfire_properties.html.md.erb
index f9455dd..80b4ee8 100644
--- a/geode-docs/reference/topics/gemfire_properties.html.md.erb
+++ b/geode-docs/reference/topics/gemfire_properties.html.md.erb
@@ -145,7 +145,13 @@ See <a href="../../managing/autoreconnect/member-reconnect.html">Handling Forced
 </tr>
 <tr class="even">
 <td>distributed-system-id</td>
-<td>Identifier used to distinguish messages from different distributed systems. Set this to different values for different systems in a multi-site (WAN) configuration. This is required for Portable Data eXchange (PDX) data serialization. This setting must be the same for every member in the same distributed system and unique to the distributed system within the WAN installation. -1 means no setting. Valid values are integers in the range -1...255.</td>
+<td>Identifier used to distinguish messages from different distributed systems. 
+This is required for Portable Data eXchange (PDX) data serialization. 
+Set <code class="ph codeph">distributed-system-id</code> to different values for different systems in a multi-site (WAN) configuration, and to different values for production vs. development environments.
+This setting must be the same for every member of a given distributed system and unique to each distributed system within a WAN installation. 
+<br/>Valid values are integers in the range -1...255.
+-1 means no setting. 
+</td>
 <td>-1</td>
 </tr>
 <tr class="odd">


[14/31] incubator-geode git commit: GEODE-2146: deploy should require more elevated privileges than just data:manage

Posted by ab...@apache.org.
GEODE-2146: deploy should require more elevated privileges than just data:manage


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

Branch: refs/heads/feature/GEODE-2156
Commit: 4f67348dc974867e4b68b8b0e9467c97311e6ede
Parents: 6eb62eb
Author: Jinmei Liao <ji...@pivotal.io>
Authored: Wed Nov 30 10:16:58 2016 -0800
Committer: Jinmei Liao <ji...@pivotal.io>
Committed: Thu Dec 1 08:12:22 2016 -0800

----------------------------------------------------------------------
 .../cli/commands/AbstractCommandsSupport.java   |  13 +-
 .../internal/cli/commands/DeployCommands.java   |  28 +++--
 .../security/DeployCommandsSecurityTest.java    | 124 +++++++++++++++++++
 .../security/SimpleSecurityManagerTest.java     |  27 ++--
 .../security/SimpleTestSecurityManager.java     |  12 +-
 5 files changed, 177 insertions(+), 27 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4f67348d/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupport.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupport.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupport.java
index d5403d9..6db6415 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupport.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AbstractCommandsSupport.java
@@ -15,11 +15,6 @@
 
 package org.apache.geode.management.internal.cli.commands;
 
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.HashSet;
-import java.util.Set;
-
 import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.CacheFactory;
 import org.apache.geode.cache.execute.Execution;
@@ -27,13 +22,18 @@ import org.apache.geode.cache.execute.Function;
 import org.apache.geode.cache.execute.FunctionService;
 import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.internal.lang.StringUtils;
+import org.apache.geode.internal.security.SecurityService;
 import org.apache.geode.management.cli.CliMetaData;
 import org.apache.geode.management.internal.cli.i18n.CliStrings;
 import org.apache.geode.management.internal.cli.shell.Gfsh;
 import org.apache.geode.management.internal.cli.util.MemberNotFoundException;
-
 import org.springframework.shell.core.CommandMarker;
 
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * The AbstractCommandsSupport class is an abstract base class encapsulating common functionality
  * for implementing command classes with command for the GemFire shell (gfsh).
@@ -48,6 +48,7 @@ import org.springframework.shell.core.CommandMarker;
  */
 @SuppressWarnings("unused")
 public abstract class AbstractCommandsSupport implements CommandMarker {
+  protected static SecurityService securityService = SecurityService.getSecurityService();
 
   protected static void assertArgument(final boolean valid, final String message,
       final Object... args) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4f67348d/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java
index 832207b..a5302ea 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommands.java
@@ -14,13 +14,6 @@
  */
 package org.apache.geode.management.internal.cli.commands;
 
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.text.DecimalFormat;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
 import org.apache.geode.SystemFailure;
 import org.apache.geode.cache.execute.ResultCollector;
 import org.apache.geode.distributed.DistributedMember;
@@ -43,14 +36,21 @@ import org.apache.geode.management.internal.cli.result.ResultBuilder;
 import org.apache.geode.management.internal.cli.result.TabularResultData;
 import org.apache.geode.management.internal.configuration.SharedConfigurationWriter;
 import org.apache.geode.management.internal.security.ResourceOperation;
+import org.apache.geode.security.NotAuthorizedException;
 import org.apache.geode.security.ResourcePermission.Operation;
 import org.apache.geode.security.ResourcePermission.Resource;
-
 import org.springframework.shell.core.CommandMarker;
 import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
 import org.springframework.shell.core.annotation.CliCommand;
 import org.springframework.shell.core.annotation.CliOption;
 
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 
 /**
  * Commands for deploying, un-deploying and listing files deployed using the command line shell.
@@ -77,7 +77,6 @@ public final class DeployCommands extends AbstractCommandsSupport implements Com
   @CliMetaData(
       interceptor = "org.apache.geode.management.internal.cli.commands.DeployCommands$Interceptor",
       relatedTopic = {CliStrings.TOPIC_GEODE_CONFIG}, writesToSharedConfiguration = true)
-  @ResourceOperation(resource = Resource.DATA, operation = Operation.MANAGE)
   public final Result deploy(
       @CliOption(key = {CliStrings.DEPLOY__GROUP}, help = CliStrings.DEPLOY__GROUP__HELP,
           optionContext = ConverterHint.MEMBERGROUP) @CliMetaData(
@@ -85,6 +84,14 @@ public final class DeployCommands extends AbstractCommandsSupport implements Com
       @CliOption(key = {CliStrings.DEPLOY__JAR}, help = CliStrings.DEPLOY__JAR__HELP) String jar,
       @CliOption(key = {CliStrings.DEPLOY__DIR}, help = CliStrings.DEPLOY__DIR__HELP) String dir) {
     try {
+
+      // since deploy function can potentially do a lot of damage to security, this action should
+      // require these following privileges
+      securityService.authorizeClusterManage();
+      securityService.authorizeClusterWrite();
+      securityService.authorizeDataManage();
+      securityService.authorizeDataWrite();
+
       TabularResultData tabularData = ResultBuilder.createTabularResultData();
 
       byte[][] shellBytesData = CommandExecutionContext.getBytesFromShell();
@@ -140,6 +147,9 @@ public final class DeployCommands extends AbstractCommandsSupport implements Com
             (new SharedConfigurationWriter()).addJars(jarNames, jarBytes, groups));
       }
       return result;
+    } catch (NotAuthorizedException e) {
+      // for NotAuthorizedException, will catch this later in the code
+      throw e;
     } catch (VirtualMachineError e) {
       SystemFailure.initiateFailure(e);
       throw e;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4f67348d/geode-core/src/test/java/org/apache/geode/management/internal/security/DeployCommandsSecurityTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/security/DeployCommandsSecurityTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/security/DeployCommandsSecurityTest.java
new file mode 100644
index 0000000..b040751
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/security/DeployCommandsSecurityTest.java
@@ -0,0 +1,124 @@
+/*
+ * 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 org.apache.geode.management.internal.security;
+
+import static org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_MANAGER;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.Assert.assertTrue;
+
+import org.apache.geode.internal.AvailablePort;
+import org.apache.geode.management.MemberMXBean;
+import org.apache.geode.security.NotAuthorizedException;
+import org.apache.geode.security.SimpleTestSecurityManager;
+import org.apache.geode.test.dunit.rules.ConnectionConfiguration;
+import org.apache.geode.test.dunit.rules.MBeanServerConnectionRule;
+import org.apache.geode.test.dunit.rules.ServerStarterRule;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.apache.geode.test.junit.categories.SecurityTest;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.ClassRule;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import org.junit.rules.TemporaryFolder;
+
+import java.io.File;
+import java.util.Properties;
+
+@Category({IntegrationTest.class, SecurityTest.class})
+public class DeployCommandsSecurityTest {
+
+  private static int jmxManagerPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+
+  private MemberMXBean bean;
+
+  @ClassRule
+  public static ServerStarterRule serverRule = new ServerStarterRule(new Properties() {
+    {
+      setProperty(SECURITY_MANAGER, SimpleTestSecurityManager.class.getName());
+      setProperty(JMX_MANAGER_PORT, jmxManagerPort + "");
+    }
+  });
+
+  @ClassRule
+  public static TemporaryFolder temporaryFolder = new TemporaryFolder();
+  private static String deployCommand = null;
+  private static String zipFileName = "functions.jar";
+
+  @BeforeClass
+  public static void beforeClass() throws Exception {
+    File zipFile = temporaryFolder.newFile(zipFileName);
+    zipFile.createNewFile();
+    deployCommand = "deploy --jar=" + zipFile.getAbsolutePath();
+  }
+
+  @Rule
+  public MBeanServerConnectionRule connectionRule = new MBeanServerConnectionRule(jmxManagerPort);
+
+  @Before
+  public void setUp() throws Exception {
+    bean = connectionRule.getProxyMBean(MemberMXBean.class);
+  }
+
+
+  @Test // regular user can't deploy
+  @ConnectionConfiguration(user = "user", password = "user")
+  public void testNoAccess1() {
+    assertThatThrownBy(() -> bean.processCommand(deployCommand))
+        .isInstanceOf(NotAuthorizedException.class);
+  }
+
+  @Test // only data access right is not enough to deploy
+  @ConnectionConfiguration(user = "data", password = "data")
+  public void testNoAccess2() {
+    assertThatThrownBy(() -> bean.processCommand(deployCommand))
+        .isInstanceOf(NotAuthorizedException.class);
+  }
+
+  @Test // only cluster access right is not enough to deploy
+  @ConnectionConfiguration(user = "cluster", password = "cluster")
+  public void testNoAccess3() {
+    assertThatThrownBy(() -> bean.processCommand(deployCommand))
+        .isInstanceOf(NotAuthorizedException.class);
+  }
+
+  @Test // not sufficient privalge
+  @ConnectionConfiguration(user = "clusterRead,clusterWrite,dataRead,dataWrite",
+      password = "clusterRead,clusterWrite,dataRead,dataWrite")
+  public void testNoAccess4() {
+    assertThatThrownBy(() -> bean.processCommand(deployCommand))
+        .isInstanceOf(NotAuthorizedException.class);
+  }
+
+  @Test // only power user can deploy
+  @ConnectionConfiguration(user = "cluster,data", password = "cluster,data")
+  public void testPowerAccess1() {
+    String result = bean.processCommand(deployCommand);
+    assertTrue(result.contains("File does not contain valid JAR content: functions.jar"));
+  }
+
+  @Test // only power user can deploy
+  @ConnectionConfiguration(user = "clusterManage,clusterWrite,dataManage,dataWrite",
+      password = "clusterManage,clusterWrite,dataManage,dataWrite")
+  public void testPowerAccess2() {
+    String result = bean.processCommand(deployCommand);
+    assertTrue(result.contains("File does not contain valid JAR content: functions.jar"));
+  }
+
+
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4f67348d/geode-core/src/test/java/org/apache/geode/security/SimpleSecurityManagerTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/SimpleSecurityManagerTest.java b/geode-core/src/test/java/org/apache/geode/security/SimpleSecurityManagerTest.java
index 066c139..2d6fbca 100644
--- a/geode-core/src/test/java/org/apache/geode/security/SimpleSecurityManagerTest.java
+++ b/geode-core/src/test/java/org/apache/geode/security/SimpleSecurityManagerTest.java
@@ -16,20 +16,17 @@
 package org.apache.geode.security;
 
 import static org.apache.geode.internal.Assert.assertTrue;
-import static org.assertj.core.api.Assertions.*;
-import static org.junit.Assert.*;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 
-import java.util.Properties;
-
-import org.apache.geode.security.SimpleTestSecurityManager;
+import org.apache.geode.test.junit.categories.SecurityTest;
+import org.apache.geode.test.junit.categories.UnitTest;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import org.apache.geode.security.AuthenticationFailedException;
-import org.apache.geode.security.ResourcePermission;
-import org.apache.geode.test.junit.categories.SecurityTest;
-import org.apache.geode.test.junit.categories.UnitTest;
+import java.util.Properties;
 
 @Category({UnitTest.class, SecurityTest.class})
 public class SimpleSecurityManagerTest {
@@ -78,4 +75,16 @@ public class SimpleSecurityManagerTest {
     assertFalse(manager.authorize("dataRead", permission));
   }
 
+  @Test
+  public void testMultipleRoleAuthorization() {
+    ResourcePermission permission = new ResourcePermission("CLUSTER", "READ");
+    assertTrue(manager.authorize("clusterRead,clusterWrite", permission));
+    assertTrue(manager.authorize("cluster,data", permission));
+    assertFalse(manager.authorize("clusterWrite,data", permission));
+
+    permission = new ResourcePermission("DATA", "WRITE", "regionA", "key1");
+    assertTrue(manager.authorize("data,cluster", permission));
+    assertTrue(manager.authorize("dataWrite,clusterWrite", permission));
+  }
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4f67348d/geode-core/src/test/java/org/apache/geode/security/SimpleTestSecurityManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/security/SimpleTestSecurityManager.java b/geode-core/src/test/java/org/apache/geode/security/SimpleTestSecurityManager.java
index 0db9825..c754376 100644
--- a/geode-core/src/test/java/org/apache/geode/security/SimpleTestSecurityManager.java
+++ b/geode-core/src/test/java/org/apache/geode/security/SimpleTestSecurityManager.java
@@ -31,6 +31,8 @@ import java.util.Properties;
  * data:read data:write username = dataWrite: is authorized for data writes on all regions:
  * data:write data:write:regionA username = cluster: authorized for all cluster operations username
  * = cluserRead: authorzed for all cluster read operations
+ *
+ * a user could be a comma separated list of roles as well.
  */
 public class SimpleTestSecurityManager implements SecurityManager {
   @Override
@@ -48,9 +50,13 @@ public class SimpleTestSecurityManager implements SecurityManager {
 
   @Override
   public boolean authorize(final Object principal, final ResourcePermission permission) {
-    String permissionString = permission.toString().replace(":", "").toLowerCase();
-    String principle = principal.toString().toLowerCase();
-    return permissionString.startsWith(principle);
+    String[] principals = principal.toString().toLowerCase().split(",");
+    for (String role : principals) {
+      String permissionString = permission.toString().replace(":", "").toLowerCase();
+      if (permissionString.startsWith(role))
+        return true;
+    }
+    return false;
   }
 
   @Override


[03/31] incubator-geode git commit: GEODE-2137 client membership IDs contain 17 bytes of useless information

Posted by ab...@apache.org.
GEODE-2137 client membership IDs contain 17 bytes of useless information

This removes the UUID and member-weight bytes from the serialized form
of event IDs, version tags and client IDs while retaining them for server
IDs in general.


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

Branch: refs/heads/feature/GEODE-2156
Commit: 9de8732a950a385ed97bfffb1a3483c5a9e5eefc
Parents: b633f67
Author: Bruce Schuchardt <bs...@pivotal.io>
Authored: Wed Nov 30 10:44:01 2016 -0800
Committer: Bruce Schuchardt <bs...@pivotal.io>
Committed: Wed Nov 30 10:44:41 2016 -0800

----------------------------------------------------------------------
 .../internal/DistributionLocatorConfigImpl.java |    3 +-
 .../membership/InternalDistributedMember.java   |  446 +++-----
 .../internal/membership/MemberAttributes.java   |    3 +
 .../internal/membership/NetMember.java          |   36 +
 .../internal/membership/gms/GMSMember.java      |   55 +-
 .../membership/gms/GMSMemberFactory.java        |    2 +-
 .../java/org/apache/geode/internal/Version.java |    9 +-
 .../internal/cache/persistence/DiskStoreID.java |   10 -
 .../cache/tier/sockets/CommandInitializer.java  |    7 +-
 .../internal/cache/versions/VersionSource.java  |    2 -
 .../internal/cache/versions/VersionTag.java     |    9 -
 .../geode/distributed/LocatorDUnitTest.java     |   30 +-
 .../geode/distributed/LocatorJUnitTest.java     |    7 +-
 .../apache/geode/distributed/RoleDUnitTest.java |    3 +-
 .../internal/DistributionManagerDUnitTest.java  |   30 +-
 .../InternalDistributedSystemJUnitTest.java     |   61 +-
 .../gms/fd/GMSHealthMonitorJUnitTest.java       |   13 +-
 .../test/dunit/standalone/ProcessManager.java   |    3 +-
 .../sanctionedDataSerializables.txt             | 1080 +++++++++---------
 19 files changed, 861 insertions(+), 948 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9de8732a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java
index 851693a..65a29a8 100644
--- a/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/admin/internal/DistributionLocatorConfigImpl.java
@@ -66,11 +66,10 @@ public class DistributionLocatorConfigImpl extends ManagedEntityConfigImpl
    * @return <code>null</code> if the locator cannot be contacted
    */
   static DistributionLocatorConfig createConfigFor(String host, int port, InetAddress bindAddress) {
-    TcpClient client = new TcpClient();
     String[] info = new String[] {"unknown", "unknown"};
 
     try {
-      client = new TcpClient();
+      TcpClient client = new TcpClient();
       if (bindAddress != null) {
         info = client.getInfo(bindAddress, port);
       } else {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9de8732a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
index 0d4fd9e..3404495 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
@@ -50,38 +50,12 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
   protected NetMember netMbr; // the underlying member object, e.g. from JGroups
 
   /**
-   * This is the direct channel port. The underlying NetMember must be able to serialize and deliver
-   * this value.
-   */
-  private int dcPort = -1;
-
-  /**
-   * This is the process id of this member on its machine. The underlying NetMember must be able to
-   * serialize and deliver this value.
-   */
-  private int vmPid = -1;
-
-  /**
-   * This is a representation of the type of VM. The underlying NetMember must be able to serialize
-   * and deliver this value.
-   */
-  private int vmKind = DistributionManager.NORMAL_DM_TYPE;
-
-  /**
-   * This is the view identifier where this ID was born, or zero if this is a loner member
-   */
-  private int vmViewId = -1;
-
-  /**
    * whether this is a partial member ID (without roles, durable attributes). We use partial IDs in
    * EventID objects to reduce their size. It would be better to use canonical IDs but there is
    * currently no central mechanism that would allow that for both server and client identifiers
    */
   private boolean isPartial;
 
-  /** Internal list of group/role names for this member. */
-  private String[] groups;
-
   /**
    * The roles, if any, of this member. Lazily created first time getRoles() is called.
    */
@@ -91,13 +65,6 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
   private final Object rolesLock = new Object();
 
   /**
-   * The name of this member's distributed system connection.
-   * 
-   * @see org.apache.geode.distributed.DistributedSystem#getName
-   */
-  private String name = null;
-
-  /**
    * Unique tag (such as randomly generated bytes) to help enforce uniqueness. Note: this should be
    * displayable.
    */
@@ -115,24 +82,21 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
   /** product version bit flag */
   private static final int VERSION_BIT = 0x8;
 
+  /** additional membership data */
+  private static final int NETMBR_DATA_BIT = 0x10;
+
   /**
    * Representing the host name of this member.
    */
   private String hostName = null;
 
-  private transient short version = Version.CURRENT_ORDINAL;
   private transient Version versionObj = Version.CURRENT;
 
-  /**
-   * User-defined attributes (id and timeout) used by durable clients.
-   */
-  private DurableClientAttributes durableClientAttributes = null;
-
   /** The versions in which this message was modified */
-  private static final Version[] dsfidVersions = new Version[] {Version.GFE_71, Version.GFE_90};
+  private static final Version[] dsfidVersions = new Version[] {Version.GFE_71};
 
   private void defaultToCurrentHost() {
-    this.vmPid = OSProcess.getId();
+    netMbr.setProcessId(OSProcess.getId());
     try {
       if (SocketCreator.resolve_dns) {
         this.hostName = SocketCreator.getHostName(SocketCreator.getLocalHost());
@@ -142,14 +106,11 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
     } catch (UnknownHostException ee) {
       throw new InternalGemFireError(ee);
     }
-    synchPayload();
   }
 
 
   // Used only by Externalization
-  public InternalDistributedMember() {
-    this.groups = new String[0];
-  }
+  public InternalDistributedMember() {}
 
   /**
    * Construct a InternalDistributedMember. All fields are specified.
@@ -167,17 +128,13 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
    */
   public InternalDistributedMember(InetAddress i, int p, boolean splitBrainEnabled,
       boolean canBeCoordinator, MemberAttributes attr) {
-    this.dcPort = attr.getPort();
-    this.vmPid = attr.getVmPid();
-    this.vmKind = attr.getVmKind();
-    this.vmViewId = attr.getVmViewId();
-    this.name = attr.getName();
-    this.groups = attr.getGroups();
-    this.durableClientAttributes = attr.getDurableClientAttributes();
+
     this.netMbr = MemberFactory.newNetMember(i, p, splitBrainEnabled, canBeCoordinator,
         Version.CURRENT_ORDINAL, attr);
+
     this.hostName = SocketCreator.resolve_dns ? SocketCreator.getHostName(i) : i.getHostAddress();
-    this.version = netMbr.getVersionOrdinal();
+
+    short version = netMbr.getVersionOrdinal();
     try {
       this.versionObj = Version.fromOrdinal(version, false);
     } catch (UnsupportedVersionException e) {
@@ -198,22 +155,11 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
   public InternalDistributedMember(NetMember m) {
     netMbr = m;
 
-    MemberAttributes attr = m.getAttributes();
     this.hostName = SocketCreator.resolve_dns ? SocketCreator.getHostName(m.getInetAddress())
         : m.getInetAddress().getHostAddress();
     // checkHostName();
-    if (attr == null) {
-      // no extended information available, so this address is crippled
-    } else {
-      this.dcPort = attr.getPort();
-      this.vmPid = attr.getVmPid();
-      this.vmKind = attr.getVmKind();
-      this.vmViewId = attr.getVmViewId();
-      this.name = attr.getName();
-      this.groups = attr.getGroups();
-      this.durableClientAttributes = attr.getDurableClientAttributes();
-    }
-    this.version = m.getVersionOrdinal();
+
+    short version = m.getVersionOrdinal();
     try {
       this.versionObj = Version.fromOrdinal(version, false);
     } catch (UnsupportedVersionException e) {
@@ -263,9 +209,10 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
     } catch (UnknownHostException e) {
       throw new GemFireConfigException("Unable to resolve server location " + location, e);
     }
-    this.netMbr = MemberFactory.newNetMember(addr, location.getPort());
-    this.vmKind = DistributionManager.NORMAL_DM_TYPE;
-    this.versionObj = Version.CURRENT;
+    netMbr = MemberFactory.newNetMember(addr, location.getPort());
+    netMbr.setVmKind(DistributionManager.NORMAL_DM_TYPE);
+    versionObj = Version.CURRENT;
+    netMbr.setVersion(versionObj);
   }
 
   /**
@@ -297,8 +244,9 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
   public InternalDistributedMember(String i, int p, Version version, NetMember netMember) {
     netMbr = netMember;
     defaultToCurrentHost();
-    this.vmKind = DistributionManager.NORMAL_DM_TYPE;
+    netMember.setVmKind(DistributionManager.NORMAL_DM_TYPE);
     this.versionObj = version;
+    netMember.setVersion(version);
   }
 
   /**
@@ -328,14 +276,13 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
     InetAddress addr = SocketCreator.toInetAddress(host);
     netMbr = MemberFactory.newNetMember(addr, p, false, true, Version.CURRENT_ORDINAL, mattr);
     defaultToCurrentHost();
-    this.name = n;
+    netMbr.setName(n);
     this.uniqueTag = u;
-    this.vmKind = vmKind;
-    this.dcPort = p;
-    this.durableClientAttributes = attr;
+    netMbr.setVmKind(vmKind);
+    netMbr.setDirectPort(p);
+    netMbr.setDurableClientAttributes(attr);
     this.hostName = host;
-    this.vmPid = OSProcess.getId();
-    this.groups = groups;
+    netMbr.setGroups(groups);
   }
 
   /**
@@ -402,7 +349,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
    */
   public int getDirectChannelPort() {
     assert !this.isPartial;
-    return dcPort;
+    return netMbr.getDirectPort();
   }
 
   /**
@@ -412,7 +359,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
    * @see org.apache.geode.distributed.internal.DistributionManager#NORMAL_DM_TYPE
    */
   public int getVmKind() {
-    return vmKind;
+    return netMbr.getVmKind();
   }
 
   /**
@@ -420,7 +367,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
    * this is limited to 16 bits.
    */
   public int getVmViewId() {
-    return this.vmViewId;
+    return netMbr.getVmViewId();
   }
 
   /**
@@ -435,7 +382,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
     synchronized (this.rolesLock) {
       tmpRolesSet = this.rolesSet;
       if (tmpRolesSet == null) {
-        final String[] tmpRoles = this.groups;
+        final String[] tmpRoles = netMbr.getGroups();
         // convert array of string role names to array of Roles...
         if (tmpRoles == null || tmpRoles.length == 0) {
           tmpRolesSet = Collections.emptySet();
@@ -454,34 +401,26 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
   }
 
   public List<String> getGroups() {
-    return Collections.unmodifiableList(Arrays.asList(this.groups));
+    return Collections.unmodifiableList(Arrays.asList(netMbr.getGroups()));
   }
 
   public void setGroups(String[] newGroups) {
     assert !this.isPartial;
     assert newGroups != null;
     synchronized (this.rolesLock) {
-      this.groups = newGroups;
-      synchPayload();
+      netMbr.setGroups(newGroups);
       this.rolesSet = null;
       this.cachedToString = null;
     }
   }
 
-  private void synchPayload() {
-    netMbr.setAttributes(new MemberAttributes(dcPort, vmPid, vmKind, vmViewId, name, groups,
-        durableClientAttributes));
-  }
-
   public void setVmKind(int p) {
-    vmKind = p;
-    synchPayload();
+    netMbr.setVmKind(p);
     cachedToString = null;
   }
 
   public void setVmViewId(int p) {
-    this.vmViewId = p;
-    synchPayload();
+    netMbr.setVmViewId(p);
     cachedToString = null;
   }
 
@@ -492,7 +431,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
    * @since GemFire 4.0
    */
   public int getVmPid() {
-    return vmPid;
+    return netMbr.getProcessId();
   }
 
   /**
@@ -501,8 +440,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
    * @since GemFire 4.0
    */
   public void setVmPid(int p) {
-    this.vmPid = p;
-    synchPayload();
+    netMbr.setProcessId(p);
     cachedToString = null;
   }
 
@@ -513,7 +451,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
    * @see org.apache.geode.distributed.DistributedSystem#getName
    */
   public String getName() {
-    String result = this.name;
+    String result = netMbr.getName();
     if (result == null) {
       result = "";
     }
@@ -533,7 +471,12 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
    */
   public DurableClientAttributes getDurableClientAttributes() {
     assert !this.isPartial;
-    return this.durableClientAttributes;
+    DurableClientAttributes attributes = netMbr.getDurableClientAttributes();
+    if (attributes == null) {
+      attributes = new DurableClientAttributes("", 300);
+      netMbr.setDurableClientAttributes(attributes);
+    }
+    return netMbr.getDurableClientAttributes();
   }
 
   /**
@@ -605,14 +548,16 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
         return 1; // same as far as they go, but longer...
     }
 
-    if (this.name == null && other.name == null) {
+    String myName = getName();
+    String otherName = other.getName();
+    if (myName == null && otherName == null) {
       // do nothing
-    } else if (this.name == null) {
+    } else if (myName == null) {
       return -1;
-    } else if (other.name == null) {
+    } else if (otherName == null) {
       return 1;
     } else {
-      int i = this.name.compareTo(other.name);
+      int i = myName.compareTo(otherName);
       if (i != 0) {
         return i;
       }
@@ -621,10 +566,12 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
     if (this.uniqueTag == null && other.uniqueTag == null) {
       if (verifyViewId) {
         // not loners, so look at P2P view ID
-        if (this.vmViewId >= 0 && other.vmViewId >= 0) {
-          if (this.vmViewId < other.vmViewId) {
+        int thisViewId = getVmViewId();
+        int otherViewId = other.getVmViewId();
+        if (thisViewId >= 0 && otherViewId >= 0) {
+          if (thisViewId < otherViewId) {
             return -1;
-          } else if (this.vmViewId > other.vmViewId) {
+          } else if (thisViewId > otherViewId) {
             return 1;
           } // else they're the same, so continue
         }
@@ -641,7 +588,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
     }
 
     if (checkNetMembersIfEqual && this.netMbr != null && other.netMbr != null) {
-      return this.netMbr.compareTo(other.netMbr);
+      return this.netMbr.compareAdditionalData(other.netMbr);
     } else {
       return 0;
     }
@@ -703,6 +650,8 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
       sb.append(host);
 
       String myName = getName();
+      int vmPid = netMbr.getProcessId();
+      int vmKind = netMbr.getVmKind();
       if (vmPid > 0 || vmKind != DistributionManager.NORMAL_DM_TYPE || !"".equals(myName)) {
         sb.append("(");
 
@@ -740,8 +689,9 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
       if (vmKind != DistributionManager.LONER_DM_TYPE && netMbr.preferredForCoordinator()) {
         sb.append("<ec>");
       }
-      if (this.vmViewId >= 0) {
-        sb.append("<v" + this.vmViewId + ">");
+      int vmViewId = getVmViewId();
+      if (vmViewId >= 0) {
+        sb.append("<v" + vmViewId + ">");
       }
       sb.append(":");
       sb.append(getPort());
@@ -757,14 +707,16 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
         if (this.uniqueTag != null && this.uniqueTag.length() != 0) {
           sb.append(":").append(this.uniqueTag);
         }
-        if (this.name != null && this.name.length() != 0) {
-          sb.append(":").append(this.name);
+        String name = getName();
+        if (name.length() != 0) {
+          sb.append(":").append(name);
         }
       }
 
       // add version if not current
-      if (this.version != Version.CURRENT.ordinal()) {
-        sb.append("(version:").append(Version.toString(this.version)).append(')');
+      short version = netMbr.getVersionOrdinal();
+      if (version != Version.CURRENT.ordinal()) {
+        sb.append("(version:").append(Version.toString(version)).append(')');
       }
 
       if (SHOW_NETMEMBER) {
@@ -783,17 +735,19 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
     return result;
   }
 
-  private void readVersion(int flags, DataInput in) throws IOException {
+  private short readVersion(int flags, DataInput in) throws IOException {
     if ((flags & VERSION_BIT) != 0) {
-      this.version = Version.readOrdinal(in);
-      this.versionObj = Version.fromOrdinalNoThrow(this.version, false);
+      short version = Version.readOrdinal(in);
+      this.versionObj = Version.fromOrdinalNoThrow(version, false);
+      return version;
     } else {
       // prior to 7.1 member IDs did not serialize their version information
       Version v = InternalDataSerializer.getVersionForDataStreamOrNull(in);
       if (v != null) {
         this.versionObj = v;
-        this.version = v.ordinal();
+        return v.ordinal();
       }
+      return Version.CURRENT_ORDINAL;
     }
   }
 
@@ -803,7 +757,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
    * @see Externalizable
    */
   public void writeExternal(ObjectOutput out) throws IOException {
-    Assert.assertTrue(vmKind > 0);
+    Assert.assertTrue(netMbr.getVmKind() > 0);
 
     // do it the way we like
     byte[] address = getInetAddress().getAddress();
@@ -826,21 +780,19 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
     flags |= VERSION_BIT;
     out.writeByte((byte) (flags & 0xff));
 
-    out.writeInt(dcPort);
-    out.writeInt(vmPid);
-    out.writeInt(vmKind);
-    out.writeInt(vmViewId);
-    DataSerializer.writeStringArray(this.groups, out);
+    out.writeInt(netMbr.getDirectPort());
+    out.writeInt(netMbr.getProcessId());
+    out.writeInt(netMbr.getVmKind());
+    out.writeInt(netMbr.getVmViewId());
+    DataSerializer.writeStringArray(netMbr.getGroups(), out);
 
-    DataSerializer.writeString(this.name, out);
+    DataSerializer.writeString(netMbr.getName(), out);
     DataSerializer.writeString(this.uniqueTag, out);
-    DataSerializer.writeString(
-        this.durableClientAttributes == null ? "" : this.durableClientAttributes.getId(), out);
-    DataSerializer.writeInteger(
-        Integer.valueOf(
-            this.durableClientAttributes == null ? 300 : this.durableClientAttributes.getTimeout()),
+    DurableClientAttributes attributes = netMbr.getDurableClientAttributes();
+    DataSerializer.writeString(attributes == null ? "" : attributes.getId(), out);
+    DataSerializer.writeInteger(Integer.valueOf(attributes == null ? 300 : attributes.getTimeout()),
         out);
-    Version.writeOrdinal(out, this.version, true);
+    Version.writeOrdinal(out, netMbr.getVersionOrdinal(), true);
     netMbr.writeAdditionalData(out);
   }
 
@@ -863,32 +815,33 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
     boolean elCoord = (flags & COORD_ENABLED_BIT) != 0;
     this.isPartial = (flags & PARTIAL_ID_BIT) != 0;
 
-    this.dcPort = in.readInt();
-    this.vmPid = in.readInt();
-    this.vmKind = in.readInt();
-    this.vmViewId = in.readInt();
-    this.groups = DataSerializer.readStringArray(in);
+    int dcPort = in.readInt();
+    int vmPid = in.readInt();
+    int vmKind = in.readInt();
+    int vmViewId = in.readInt();
+    String[] groups = DataSerializer.readStringArray(in);
 
-    this.name = DataSerializer.readString(in);
+    String name = DataSerializer.readString(in);
     this.uniqueTag = DataSerializer.readString(in);
     String durableId = DataSerializer.readString(in);
     int durableTimeout = DataSerializer.readInteger(in).intValue();
-    this.durableClientAttributes = new DurableClientAttributes(durableId, durableTimeout);
+    DurableClientAttributes durableClientAttributes =
+        new DurableClientAttributes(durableId, durableTimeout);
 
-    readVersion(flags, in);
+    short version = readVersion(flags, in);
 
     netMbr = MemberFactory.newNetMember(inetAddr, port, sbEnabled, elCoord, version,
         new MemberAttributes(dcPort, vmPid, vmKind, vmViewId, name, groups,
             durableClientAttributes));
-    if (this.version >= Version.GFE_90.ordinal()) {
+    if (version >= Version.GFE_90.ordinal()) {
       try {
         netMbr.readAdditionalData(in);
       } catch (java.io.EOFException e) {
-        // old version quand-meme
+        // old version
       }
     }
 
-    Assert.assertTrue(this.vmKind > 0);
+    Assert.assertTrue(netMbr.getVmKind() > 0);
   }
 
   public int getDSFID() {
@@ -896,14 +849,6 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
   }
 
   public void toData(DataOutput out) throws IOException {
-    toDataPre_GFE_9_0_0_0(out);
-    if (this.version >= Version.GFE_90.ordinal()) {
-      getNetMember().writeAdditionalData(out);
-    }
-  }
-
-
-  public void toDataPre_GFE_9_0_0_0(DataOutput out) throws IOException {
     // Assert.assertTrue(vmKind > 0);
     // NOTE: If you change the serialized format of this class
     // then bump Connection.HANDSHAKE_VERSION since an
@@ -923,30 +868,39 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
     // always write product version but enable reading from older versions
     // that do not have it
     flags |= VERSION_BIT;
+    boolean writeNetMbrData = netMbr.hasAdditionalData();
+    if (writeNetMbrData) {
+      flags |= NETMBR_DATA_BIT;
+    }
     out.writeByte((byte) (flags & 0xff));
 
-    out.writeInt(dcPort);
-    out.writeInt(vmPid);
+    out.writeInt(netMbr.getDirectPort());
+    out.writeInt(netMbr.getProcessId());
+    int vmKind = netMbr.getVmKind();
     out.writeByte(vmKind);
-    DataSerializer.writeStringArray(this.groups, out);
+    DataSerializer.writeStringArray(netMbr.getGroups(), out);
 
-    DataSerializer.writeString(this.name, out);
-    if (this.vmKind == DistributionManager.LONER_DM_TYPE) {
+    DataSerializer.writeString(netMbr.getName(), out);
+    if (vmKind == DistributionManager.LONER_DM_TYPE) {
       DataSerializer.writeString(this.uniqueTag, out);
     } else { // added in 6.5 for unique identifiers in P2P
-      DataSerializer.writeString(String.valueOf(this.vmViewId), out);
+      DataSerializer.writeString(String.valueOf(netMbr.getVmViewId()), out);
+    }
+    DurableClientAttributes durableClientAttributes = netMbr.getDurableClientAttributes();
+    DataSerializer
+        .writeString(durableClientAttributes == null ? "" : durableClientAttributes.getId(), out);
+    DataSerializer.writeInteger(Integer.valueOf(
+        durableClientAttributes == null ? 300 : durableClientAttributes.getTimeout()), out);
+    short version = netMbr.getVersionOrdinal();
+    Version.writeOrdinal(out, version, true);
+
+    if (version >= Version.GFE_90.ordinal() && writeNetMbrData) {
+      getNetMember().writeAdditionalData(out);
     }
-    DataSerializer.writeString(
-        this.durableClientAttributes == null ? "" : this.durableClientAttributes.getId(), out);
-    DataSerializer.writeInteger(
-        Integer.valueOf(
-            this.durableClientAttributes == null ? 300 : this.durableClientAttributes.getTimeout()),
-        out);
-    Version.writeOrdinal(out, this.version, true);
   }
 
   public void toDataPre_GFE_7_1_0_0(DataOutput out) throws IOException {
-    Assert.assertTrue(vmKind > 0);
+    Assert.assertTrue(netMbr.getVmKind() > 0);
     // [bruce] disabled to allow post-connect setting of the port for loner systems
     // Assert.assertTrue(getPort() > 0);
     // if (this.getPort() == 0) {
@@ -971,40 +925,27 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
       flags |= PARTIAL_ID_BIT;
     out.writeByte((byte) (flags & 0xff));
 
-    out.writeInt(dcPort);
-    out.writeInt(vmPid);
-    out.writeByte(vmKind);
-    DataSerializer.writeStringArray(this.groups, out);
+    out.writeInt(netMbr.getDirectPort());
+    out.writeInt(netMbr.getProcessId());
+    out.writeByte(netMbr.getVmKind());
+    DataSerializer.writeStringArray(netMbr.getGroups(), out);
 
-    DataSerializer.writeString(this.name, out);
-    if (this.vmKind == DistributionManager.LONER_DM_TYPE) {
+    DataSerializer.writeString(netMbr.getName(), out);
+    int vmKind = netMbr.getVmKind();
+    if (vmKind == DistributionManager.LONER_DM_TYPE) {
       DataSerializer.writeString(this.uniqueTag, out);
     } else { // added in 6.5 for unique identifiers in P2P
-      DataSerializer.writeString(String.valueOf(this.vmViewId), out);
+      DataSerializer.writeString(String.valueOf(netMbr.getVmViewId()), out);
     }
-    DataSerializer.writeString(
-        this.durableClientAttributes == null ? "" : this.durableClientAttributes.getId(), out);
-    DataSerializer.writeInteger(
-        Integer.valueOf(
-            this.durableClientAttributes == null ? 300 : this.durableClientAttributes.getTimeout()),
-        out);
-
+    DurableClientAttributes durableClientAttributes = netMbr.getDurableClientAttributes();
+    DataSerializer
+        .writeString(durableClientAttributes == null ? "" : durableClientAttributes.getId(), out);
+    DataSerializer.writeInteger(Integer.valueOf(
+        durableClientAttributes == null ? 300 : durableClientAttributes.getTimeout()), out);
   }
 
-  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
-    fromDataPre_GFE_9_0_0_0(in);
-    // just in case this is just a non-versioned read
-    // from a file we ought to check the version
-    if (this.version >= Version.GFE_90.ordinal()) {
-      try {
-        netMbr.readAdditionalData(in);
-      } catch (EOFException e) {
-        // nope - it's from a pre-GEODE client or WAN site
-      }
-    }
-  }
 
-  public void fromDataPre_GFE_9_0_0_0(DataInput in) throws IOException, ClassNotFoundException {
+  public void fromData(DataInput in) throws IOException, ClassNotFoundException {
     InetAddress inetAddr = DataSerializer.readInetAddress(in);
     int port = in.readInt();
 
@@ -1018,35 +959,41 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
     boolean elCoord = (flags & COORD_ENABLED_BIT) != 0;
     this.isPartial = (flags & PARTIAL_ID_BIT) != 0;
 
-    this.dcPort = in.readInt();
-    this.vmPid = in.readInt();
-    this.vmKind = in.readUnsignedByte();
-    this.groups = DataSerializer.readStringArray(in);
+    int dcPort = in.readInt();
+    int vmPid = in.readInt();
+    int vmKind = in.readUnsignedByte();
+    String[] groups = DataSerializer.readStringArray(in);
+    int vmViewId = -1;
 
-    this.name = DataSerializer.readString(in);
-    if (this.vmKind == DistributionManager.LONER_DM_TYPE) {
+    String name = DataSerializer.readString(in);
+    if (vmKind == DistributionManager.LONER_DM_TYPE) {
       this.uniqueTag = DataSerializer.readString(in);
     } else {
       String str = DataSerializer.readString(in);
       if (str != null) { // backward compatibility from earlier than 6.5
-        this.vmViewId = Integer.parseInt(str);
+        vmViewId = Integer.parseInt(str);
       }
     }
 
     String durableId = DataSerializer.readString(in);
     int durableTimeout = DataSerializer.readInteger(in).intValue();
-    this.durableClientAttributes = new DurableClientAttributes(durableId, durableTimeout);
+    DurableClientAttributes durableClientAttributes =
+        durableId.length() > 0 ? new DurableClientAttributes(durableId, durableTimeout) : null;
 
-    readVersion(flags, in);
+    short version = readVersion(flags, in);
 
-    MemberAttributes attr = new MemberAttributes(this.dcPort, this.vmPid, this.vmKind,
-        this.vmViewId, this.name, this.groups, this.durableClientAttributes);
+    MemberAttributes attr = new MemberAttributes(dcPort, vmPid, vmKind, vmViewId, name, groups,
+        durableClientAttributes);
     netMbr = MemberFactory.newNetMember(inetAddr, port, sbEnabled, elCoord, version, attr);
 
-    synchPayload();
-
-    Assert.assertTrue(this.vmKind > 0);
+    Assert.assertTrue(netMbr.getVmKind() > 0);
     // Assert.assertTrue(getPort() > 0);
+
+    // just in case this is just a non-versioned read
+    // from a file we ought to check the version
+    if (version >= Version.GFE_90.ordinal() && (flags & NETMBR_DATA_BIT) == NETMBR_DATA_BIT) {
+      netMbr.readAdditionalData(in);
+    }
   }
 
   public void fromDataPre_GFE_7_1_0_0(DataInput in) throws IOException, ClassNotFoundException {
@@ -1054,6 +1001,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
     int port = in.readInt();
 
     this.hostName = DataSerializer.readString(in);
+
     this.hostName = SocketCreator.resolve_dns
         ? SocketCreator.getCanonicalHostName(inetAddr, hostName) : inetAddr.getHostAddress();
 
@@ -1062,36 +1010,37 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
     boolean elCoord = (flags & COORD_ENABLED_BIT) != 0;
     this.isPartial = (flags & PARTIAL_ID_BIT) != 0;
 
-    this.dcPort = in.readInt();
-    this.vmPid = in.readInt();
-    this.vmKind = in.readUnsignedByte();
-    this.groups = DataSerializer.readStringArray(in);
+    int dcPort = in.readInt();
+    int vmPid = in.readInt();
+    int vmKind = in.readUnsignedByte();
+    String[] groups = DataSerializer.readStringArray(in);
+    int vmViewId = -1;
 
-    this.name = DataSerializer.readString(in);
-    if (this.vmKind == DistributionManager.LONER_DM_TYPE) {
+    String name = DataSerializer.readString(in);
+    if (vmKind == DistributionManager.LONER_DM_TYPE) {
       this.uniqueTag = DataSerializer.readString(in);
     } else {
       String str = DataSerializer.readString(in);
       if (str != null) { // backward compatibility from earlier than 6.5
-        this.vmViewId = Integer.parseInt(str);
+        vmViewId = Integer.parseInt(str);
       }
     }
 
     String durableId = DataSerializer.readString(in);
     int durableTimeout = DataSerializer.readInteger(in).intValue();
-    this.durableClientAttributes = new DurableClientAttributes(durableId, durableTimeout);
+    DurableClientAttributes durableClientAttributes =
+        durableId.length() > 0 ? new DurableClientAttributes(durableId, durableTimeout) : null;
 
-    MemberAttributes attr = new MemberAttributes(this.dcPort, this.vmPid, this.vmKind,
-        this.vmViewId, this.name, this.groups, this.durableClientAttributes);
-    netMbr = MemberFactory.newNetMember(inetAddr, port, sbEnabled, elCoord,
-        InternalDataSerializer.getVersionForDataStream(in).ordinal(), attr);
+    short version = readVersion(flags, in);
 
-    synchPayload();
+    MemberAttributes attr = new MemberAttributes(dcPort, vmPid, vmKind, vmViewId, name, groups,
+        durableClientAttributes);
+    netMbr = MemberFactory.newNetMember(inetAddr, port, sbEnabled, elCoord, version, attr);
 
-    Assert.assertTrue(this.vmKind > 0);
+    Assert.assertTrue(netMbr.getVmKind() > 0);
   }
 
-  /** this writes just the parts of the ID that are needed for comparisons and communications */
+  /** this reads an ID written with writeEssentialData */
   public static InternalDistributedMember readEssentialData(DataInput in)
       throws IOException, ClassNotFoundException {
     final InternalDistributedMember mbr = new InternalDistributedMember();
@@ -1111,35 +1060,32 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
     boolean sbEnabled = (flags & NPD_ENABLED_BIT) != 0;
     boolean elCoord = (flags & COORD_ENABLED_BIT) != 0;
 
-    this.vmKind = in.readUnsignedByte();
-
+    int vmKind = in.readUnsignedByte();
+    int vmViewId = -1;
 
-    if (this.vmKind == DistributionManager.LONER_DM_TYPE) {
+    if (vmKind == DistributionManager.LONER_DM_TYPE) {
       this.uniqueTag = DataSerializer.readString(in);
     } else {
       String str = DataSerializer.readString(in);
       if (str != null) { // backward compatibility from earlier than 6.5
-        this.vmViewId = Integer.parseInt(str);
+        vmViewId = Integer.parseInt(str);
       }
     }
 
-    this.name = DataSerializer.readString(in);
+    String name = DataSerializer.readString(in);
 
-    MemberAttributes attr = new MemberAttributes(this.dcPort, this.vmPid, this.vmKind,
-        this.vmViewId, this.name, this.groups, this.durableClientAttributes);
+    MemberAttributes attr = new MemberAttributes(-1, -1, vmKind, vmViewId, name, null, null);
     netMbr = MemberFactory.newNetMember(inetAddr, port, sbEnabled, elCoord,
         InternalDataSerializer.getVersionForDataStream(in).ordinal(), attr);
 
-    synchPayload();
-
-    if (InternalDataSerializer.getVersionForDataStream(in).compareTo(Version.GFE_90) >= 0) {
+    if (InternalDataSerializer.getVersionForDataStream(in).compareTo(Version.GFE_90) == 0) {
       netMbr.readAdditionalData(in);
     }
   }
 
 
   public void writeEssentialData(DataOutput out) throws IOException {
-    Assert.assertTrue(vmKind > 0);
+    Assert.assertTrue(netMbr.getVmKind() > 0);
     DataSerializer.writeInetAddress(getInetAddress(), out);
     out.writeInt(getPort());
 
@@ -1152,17 +1098,18 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
     out.writeByte((byte) (flags & 0xff));
 
     // out.writeInt(dcPort);
+    byte vmKind = netMbr.getVmKind();
     out.writeByte(vmKind);
 
-    if (this.vmKind == DistributionManager.LONER_DM_TYPE) {
+    if (vmKind == DistributionManager.LONER_DM_TYPE) {
       DataSerializer.writeString(this.uniqueTag, out);
     } else { // added in 6.5 for unique identifiers in P2P
-      DataSerializer.writeString(String.valueOf(this.vmViewId), out);
+      DataSerializer.writeString(String.valueOf(netMbr.getVmViewId()), out);
     }
     // write name last to fix bug 45160
-    DataSerializer.writeString(this.name, out);
+    DataSerializer.writeString(netMbr.getName(), out);
 
-    if (InternalDataSerializer.getVersionForDataStream(out).compareTo(Version.GFE_90) >= 0) {
+    if (InternalDataSerializer.getVersionForDataStream(out).compareTo(Version.GFE_90) == 0) {
       netMbr.writeAdditionalData(out);
     }
   }
@@ -1171,8 +1118,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
    * [GemStone] Set the direct channel port
    */
   public void setDirectChannelPort(int p) {
-    dcPort = p;
-    synchPayload();
+    netMbr.setDirectPort(p);
   }
 
   /**
@@ -1180,9 +1126,8 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
    * information to help form a unique ID
    */
   public void setPort(int p) {
-    assert this.vmKind == DistributionManager.LONER_DM_TYPE;
+    assert netMbr.getVmKind() == DistributionManager.LONER_DM_TYPE;
     this.netMbr.setPort(p);
-    synchPayload();
     cachedToString = null;
   }
 
@@ -1196,7 +1141,7 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
   }
 
   public int getProcessId() {
-    return this.vmPid;
+    return netMbr.getProcessId();
   }
 
   public String getId() {
@@ -1216,7 +1161,6 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
    */
 
   public final void setVersionObjectForTest(Version v) {
-    this.version = v.ordinal();
     this.versionObj = v;
     netMbr.setVersion(v);
   }
@@ -1231,32 +1175,6 @@ public class InternalDistributedMember implements DistributedMember, Externaliza
   }
 
 
-  @Override
-  public int getSizeInBytes() {
-
-    int size = 0;
-
-    // ipaddr: 1 byte length + 4 bytes (IPv4) or 16 bytes (IPv6)
-    if (netMbr.getInetAddress() instanceof Inet4Address) {
-      size += 5;
-    } else {
-      size += 17;
-    }
-
-    // port: 4 bytes
-    // flags: 1 byte
-    // vmKind: 1 byte
-    size += 6;
-
-    // viewID: String(1+1+numchars)
-    size += (2 + String.valueOf(this.vmViewId).length());
-
-    // empty name: String(1+1)
-    size += 2;
-
-    return size;
-  }
-
   public static class InternalDistributedMemberWrapper {
     InternalDistributedMember mbr;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9de8732a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberAttributes.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberAttributes.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberAttributes.java
index 75cdd49..f8ea15d 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberAttributes.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/MemberAttributes.java
@@ -19,6 +19,7 @@ import java.util.List;
 import java.util.StringTokenizer;
 
 import org.apache.geode.distributed.DurableClientAttributes;
+import org.apache.geode.distributed.internal.DistributionManager;
 
 /**
  * The attributes of a distributed member. This is largely deprecated as GMSMember holds all of this
@@ -30,6 +31,8 @@ public class MemberAttributes {
 
   public static final MemberAttributes INVALID =
       new MemberAttributes(-1, -1, -1, -1, null, null, null);
+  public static final MemberAttributes DEFAULT =
+      new MemberAttributes(-1, -1, DistributionManager.NORMAL_DM_TYPE, -1, null, null, null);
 
   private int dcPort;
   private int vmPid;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9de8732a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/NetMember.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/NetMember.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/NetMember.java
index 4db207f..1f909f2 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/NetMember.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/NetMember.java
@@ -19,7 +19,9 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.net.InetAddress;
 
+import org.apache.geode.distributed.DurableClientAttributes;
 import org.apache.geode.internal.Version;
+import org.apache.geode.internal.shared.StringPrintWriter;
 
 /**
  * This is the SPI for the basic element of membership provided in the GemFire system.
@@ -70,10 +72,44 @@ public interface NetMember extends Comparable<NetMember> {
 
   public void setVersion(Version v);
 
+  public int getProcessId();
+
+  public void setProcessId(int id);
+
+  public byte getVmKind();
+
+  public void setVmKind(int kind);
+
+  public int getVmViewId();
+
+  public void setVmViewId(int id);
+
+  public int getDirectPort();
+
+  public void setDirectPort(int port);
+
+  public String getName();
+
+  public void setName(String name);
+
+  public DurableClientAttributes getDurableClientAttributes();
+
+  public void setDurableClientAttributes(DurableClientAttributes attributes);
+
+  public String[] getGroups();
+
+  public void setGroups(String[] groups);
+
+  /** whether this NetMember has additional data to be serialized as part of a DistributedMember */
+  public boolean hasAdditionalData();
+
   /** write identity information not known by DistributedMember instances */
   public void writeAdditionalData(DataOutput out) throws IOException;
 
   /** read identity information not known by DistributedMember instances */
   public void readAdditionalData(DataInput in) throws ClassNotFoundException, IOException;
 
+  /** compare data that is not known to DistributedMember instances */
+  public int compareAdditionalData(NetMember other);
+
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9de8732a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMember.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMember.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMember.java
index 670d62b..b7079f8 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMember.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMember.java
@@ -22,11 +22,11 @@ import org.apache.geode.distributed.internal.membership.NetMember;
 import org.apache.geode.internal.DataSerializableFixedID;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.i18n.LocalizedStrings;
-
 import org.jgroups.util.UUID;
 
 import java.io.DataInput;
 import java.io.DataOutput;
+import java.io.EOFException;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
@@ -54,13 +54,13 @@ public class GMSMember implements NetMember, DataSerializableFixedID {
   private byte memberWeight;
   private InetAddress inetAddr;
   private int processId;
-  private int vmKind;
+  private byte vmKind;
   private int vmViewId = -1;
   private int directPort;
   private String name;
   private DurableClientAttributes durableClientAttributes;
   private String[] groups;
-  private short versionOrdinal;
+  private short versionOrdinal = Version.CURRENT_ORDINAL;
   private long uuidLSBs;
   private long uuidMSBs;
 
@@ -80,7 +80,7 @@ public class GMSMember implements NetMember, DataSerializableFixedID {
       attr = MemberAttributes.INVALID;
     }
     processId = attr.getVmPid();
-    vmKind = attr.getVmKind();
+    vmKind = (byte) attr.getVmKind();
     directPort = attr.getPort();
     vmViewId = attr.getVmViewId();
     name = attr.getName();
@@ -260,6 +260,24 @@ public class GMSMember implements NetMember, DataSerializableFixedID {
   }
 
   @Override
+  public int compareAdditionalData(NetMember other) {
+    GMSMember his = (GMSMember) other;
+    int result = 0;
+    if (this.uuidMSBs != 0 && his.uuidMSBs != 0) {
+      if (this.uuidMSBs < his.uuidMSBs) {
+        result = -1;
+      } else if (his.uuidMSBs < this.uuidMSBs) {
+        result = 1;
+      } else if (this.uuidLSBs < his.uuidLSBs) {
+        result = -1;
+      } else if (his.uuidLSBs < this.uuidLSBs) {
+        result = 1;
+      }
+    }
+    return result;
+  }
+
+  @Override
   public boolean equals(Object obj) {
     // GemStone fix for 29125
     if ((obj == null) || !(obj instanceof GMSMember)) {
@@ -309,7 +327,7 @@ public class GMSMember implements NetMember, DataSerializableFixedID {
     return processId;
   }
 
-  public int getVmKind() {
+  public byte getVmKind() {
     return vmKind;
   }
 
@@ -317,6 +335,11 @@ public class GMSMember implements NetMember, DataSerializableFixedID {
     return vmViewId;
   }
 
+  @Override
+  public void setVmViewId(int id) {
+    this.vmViewId = id;
+  }
+
   public int getDirectPort() {
     return directPort;
   }
@@ -354,7 +377,7 @@ public class GMSMember implements NetMember, DataSerializableFixedID {
   }
 
   public void setVmKind(int vmKind) {
-    this.vmKind = vmKind;
+    this.vmKind = (byte) vmKind;
   }
 
   public void setVersion(Version v) {
@@ -377,6 +400,11 @@ public class GMSMember implements NetMember, DataSerializableFixedID {
     this.durableClientAttributes = durableClientAttributes;
   }
 
+  @Override
+  public String[] getGroups() {
+    return groups;
+  }
+
   public void setGroups(String[] groups) {
     this.groups = groups;
   }
@@ -462,6 +490,11 @@ public class GMSMember implements NetMember, DataSerializableFixedID {
   }
 
   @Override
+  public boolean hasAdditionalData() {
+    return uuidMSBs != 0 || uuidLSBs != 0 || memberWeight != 0;
+  }
+
+  @Override
   public void writeAdditionalData(DataOutput out) throws IOException {
     out.writeLong(uuidMSBs);
     out.writeLong(uuidLSBs);
@@ -470,8 +503,12 @@ public class GMSMember implements NetMember, DataSerializableFixedID {
 
   @Override
   public void readAdditionalData(DataInput in) throws ClassNotFoundException, IOException {
-    this.uuidMSBs = in.readLong();
-    this.uuidLSBs = in.readLong();
-    memberWeight = (byte) (in.readByte() & 0xFF);
+    try {
+      this.uuidMSBs = in.readLong();
+      this.uuidLSBs = in.readLong();
+      memberWeight = (byte) (in.readByte() & 0xFF);
+    } catch (EOFException e) {
+      // some IDs do not have UUID or membership weight information
+    }
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9de8732a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberFactory.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberFactory.java b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberFactory.java
index c84690a..bc94ab5 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/GMSMemberFactory.java
@@ -71,7 +71,7 @@ public class GMSMemberFactory implements MemberServices {
    * @return the new NetMember
    */
   public NetMember newNetMember(InetAddress i, int p) {
-    return new GMSMember(MemberAttributes.INVALID, i, p, false, true, Version.CURRENT_ORDINAL, 0,
+    return new GMSMember(MemberAttributes.DEFAULT, i, p, false, true, Version.CURRENT_ORDINAL, 0,
         0);
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9de8732a/geode-core/src/main/java/org/apache/geode/internal/Version.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/Version.java b/geode-core/src/main/java/org/apache/geode/internal/Version.java
index fabb3a7..5f7c5ba 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/Version.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/Version.java
@@ -59,7 +59,7 @@ public final class Version implements Comparable<Version> {
   /** byte used as ordinal to represent this <code>Version</code> */
   private final short ordinal;
 
-  public static final int HIGHEST_VERSION = 45;
+  public static final int HIGHEST_VERSION = 50;
 
   private static final Version[] VALUES = new Version[HIGHEST_VERSION + 1];
 
@@ -180,11 +180,16 @@ public final class Version implements Comparable<Version> {
   public static final Version GFE_90 =
       new Version("GFE", "9.0", (byte) 9, (byte) 0, (byte) 0, (byte) 0, GFE_90_ORDINAL);
 
+  private static final byte GFE_91_ORDINAL = 50;
+
+  public static final Version GFE_91 =
+      new Version("GFE", "9.1", (byte) 9, (byte) 1, (byte) 0, (byte) 0, GFE_91_ORDINAL);
+
   /**
    * This constant must be set to the most current version of the product. !!! NOTE: update
    * HIGHEST_VERSION when changing CURRENT !!!
    */
-  public static final Version CURRENT = GFE_90;
+  public static final Version CURRENT = GFE_91;
 
   /**
    * A lot of versioning code needs access to the current version's ordinal

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9de8732a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskStoreID.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskStoreID.java b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskStoreID.java
index e94b081..c357e9b 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskStoreID.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/persistence/DiskStoreID.java
@@ -150,14 +150,4 @@ public class DiskStoreID implements VersionSource<DiskStoreID>, Serializable {
     return Long.toHexString(mostSig).substring(8);
   }
 
-  @Override
-  public int getSizeInBytes() {
-
-    int size = 0;
-
-    // two longs
-    size += 16;
-
-    return size;
-  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9de8732a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
index 0fe44cf..2f6b963 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
@@ -329,8 +329,13 @@ public class CommandInitializer {
       ALL_COMMANDS.put(Version.GFE_90, gfe90Commands);
       gfe90Commands.put(MessageType.QUERY_WITH_PARAMETERS, QueryWithParametersGeode10.getCommand());
       gfe90Commands.put(MessageType.QUERY, QueryGeode10.getCommand());
-
     }
+    {
+      Map<Integer, Command> gfe91Commands = new HashMap<Integer, Command>();
+      gfe91Commands.putAll(ALL_COMMANDS.get(Version.GFE_90));
+      ALL_COMMANDS.put(Version.GFE_91, gfe91Commands);
+    }
+
   }
 
   public static Map<Integer, Command> getCommands(Version version) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9de8732a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionSource.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionSource.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionSource.java
index bfbda2f..a53f999 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionSource.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionSource.java
@@ -35,6 +35,4 @@ public interface VersionSource<T> extends DataSerializableFixedID, Comparable<T>
 
   public void writeEssentialData(DataOutput out) throws IOException;
 
-  public int getSizeInBytes();
-
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9de8732a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionTag.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionTag.java b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionTag.java
index fa2c156..d502299 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionTag.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/versions/VersionTag.java
@@ -415,15 +415,6 @@ public abstract class VersionTag<T extends VersionSource>
   public abstract void writeMember(T memberID, DataOutput out) throws IOException;
 
 
-  public int getSizeInBytes() {
-    int size =
-        org.apache.geode.internal.cache.lru.Sizeable.PER_OBJECT_OVERHEAD + VersionTag.TAG_SIZE;
-    // member size calculation
-    size += memberID.getSizeInBytes();
-    return size;
-
-  }
-
   @Override
   public String toString() {
     StringBuilder s = new StringBuilder();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9de8732a/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
index 128f970..10c9238 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
@@ -451,8 +451,8 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
 
   @Test
   public void testStartTwoLocatorsOneWithSSLAndTheOtherNonSSL() throws Exception {
-    IgnoredException expectedException =
-        IgnoredException.addIgnoredException("Unrecognized SSL message, plaintext connection");
+    IgnoredException.addIgnoredException("Unrecognized SSL message, plaintext connection");
+    IgnoredException.addIgnoredException("LocatorCancelException");
     disconnectAllFromDS();
     Host host = Host.getHost(0);
     VM loc1 = host.getVM(1);
@@ -496,7 +496,6 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
         loc1.invoke("verifyLocatorNotInSplitBrain", () -> verifyLocatorNotInSplitBrain(1));
       } finally {
         loc1.invoke("stop locator", () -> stopLocator());
-        expectedException.remove();
       }
     }
   }
@@ -510,11 +509,10 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
 
   @Test
   public void testStartTwoLocatorsOneWithNonSSLAndTheOtherSSL() throws Exception {
-    IgnoredException expectedException =
-        IgnoredException.addIgnoredException("Remote host closed connection during handshake");
+    IgnoredException.addIgnoredException("Remote host closed connection during handshake");
+    IgnoredException.addIgnoredException("Unrecognized SSL message, plaintext connection");
+    IgnoredException.addIgnoredException("LocatorCancelException");
 
-    IgnoredException expectedException2 =
-        IgnoredException.addIgnoredException("Unrecognized SSL message, plaintext connection");
     disconnectAllFromDS();
     Host host = Host.getHost(0);
     VM loc1 = host.getVM(1);
@@ -559,23 +557,19 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
         loc1.invoke("verifyLocatorNotInSplitBrain", () -> verifyLocatorNotInSplitBrain(1));
       } finally {
         loc1.invoke("stop locator", () -> stopLocator());
-        expectedException.remove();
-        expectedException2.remove();
       }
     }
   }
 
   @Test
   public void testStartTwoLocatorsWithDifferentSSLCertificates() throws Exception {
-    IgnoredException expectedException =
-        IgnoredException.addIgnoredException("Remote host closed connection during handshake");
-    IgnoredException expectedException2 = IgnoredException
+    IgnoredException.addIgnoredException("Remote host closed connection during handshake");
+    IgnoredException
         .addIgnoredException("unable to find valid certification path to requested target");
-    IgnoredException expectedException3 =
-        IgnoredException.addIgnoredException("Received fatal alert: certificate_unknown");
+    IgnoredException.addIgnoredException("Received fatal alert: certificate_unknown");
+    IgnoredException.addIgnoredException("LocatorCancelException");
     disconnectAllFromDS();
-    IgnoredException expectedException4 =
-        IgnoredException.addIgnoredException("Unrecognized SSL message, plaintext connection");
+    IgnoredException.addIgnoredException("Unrecognized SSL message, plaintext connection");
     disconnectAllFromDS();
     Host host = Host.getHost(0);
     VM loc1 = host.getVM(1);
@@ -622,10 +616,6 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
         loc1.invoke("verifyLocatorNotInSplitBrain", () -> verifyLocatorNotInSplitBrain(1));
       } finally {
         loc1.invoke("stop locator", () -> stopLocator());
-        expectedException.remove();
-        expectedException2.remove();
-        expectedException3.remove();
-        expectedException4.remove();
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9de8732a/geode-core/src/test/java/org/apache/geode/distributed/LocatorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorJUnitTest.java
index d1e56c4..368b037 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/LocatorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorJUnitTest.java
@@ -45,6 +45,7 @@ import java.io.File;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 import java.util.function.IntSupplier;
 
 import static org.apache.geode.distributed.ConfigurationProperties.*;
@@ -52,6 +53,8 @@ import static org.apache.geode.internal.AvailablePort.SOCKET;
 import static org.apache.geode.internal.AvailablePort.getRandomAvailablePort;
 import static org.junit.Assert.*;
 
+import com.jayway.awaitility.Awaitility;
+
 @Category({IntegrationTest.class, MembershipTest.class})
 @RunWith(Parameterized.class)
 @Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
@@ -108,7 +111,7 @@ public class LocatorJUnitTest {
     System.setProperty(DistributionConfig.GEMFIRE_PREFIX + "disableManagement", "false"); // not
                                                                                           // needed
     try {
-      locator = Locator.startLocatorAndDS(port, new File("testJmxManager.log"), dsprops);
+      locator = Locator.startLocatorAndDS(port, null, dsprops);
       List<JmxManagerProfile> alreadyManaging =
           GemFireCacheImpl.getInstance().getJmxManagerAdvisor().adviseAlreadyManaging();
       assertEquals(1, alreadyManaging.size());
@@ -177,7 +180,7 @@ public class LocatorJUnitTest {
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION, "false");
 
-    locator = Locator.startLocatorAndDS(port, tmpFile, null, props);
+    locator = Locator.startLocatorAndDS(port, new File(""), null, props);
     assertTrue(locator.isPeerLocator());
     assertTrue(locator.isServerLocator());
     Thread.sleep(1000);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9de8732a/geode-core/src/test/java/org/apache/geode/distributed/RoleDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/RoleDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/RoleDUnitTest.java
index d804703..77ad879 100755
--- a/geode-core/src/test/java/org/apache/geode/distributed/RoleDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/RoleDUnitTest.java
@@ -21,6 +21,7 @@ import java.util.Iterator;
 import java.util.Properties;
 import java.util.Set;
 
+import org.apache.geode.test.junit.categories.MembershipTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -36,7 +37,7 @@ import org.apache.geode.test.junit.categories.DistributedTest;
 /**
  * Tests the setting of Roles in a DistributedSystem
  */
-@Category(DistributedTest.class)
+@Category({DistributedTest.class, MembershipTest.class})
 public class RoleDUnitTest extends JUnit4DistributedTestCase {
 
   static Properties distributionProperties = new Properties();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9de8732a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java
index b38a769..f7f4979 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/DistributionManagerDUnitTest.java
@@ -17,9 +17,12 @@ package org.apache.geode.distributed.internal;
 import static org.apache.geode.distributed.ConfigurationProperties.*;
 import static org.apache.geode.test.dunit.Assert.*;
 
+import com.jayway.awaitility.Awaitility;
+
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.util.Properties;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.geode.test.junit.categories.MembershipTest;
 import org.apache.logging.log4j.Logger;
@@ -105,34 +108,21 @@ public class DistributionManagerDUnitTest extends JUnit4DistributedTestCase {
   /**
    * Send the distribution manager a message it can't deserialize
    */
-  @Ignore("TODO: use Awaitility and reenable assertions")
   @Test
   public void testExceptionInThreads() throws InterruptedException {
-    DM dm = getSystem().getDistributionManager();
+    DistributionManager dm = (DistributionManager) getSystem().getDistributionManager();
     String p1 = "ItsOkayForMyClassNotToBeFound";
     logger.info("<ExpectedException action=add>" + p1 + "</ExpectedException>");
     DistributionMessage m = new ItsOkayForMyClassNotToBeFound();
     dm.putOutgoing(m);
     Thread.sleep(1 * 1000);
     logger.info("<ExpectedException action=remove>" + p1 + "</ExpectedException>");
-    // assertTrue(dm.exceptionInThreads());
-    // dm.clearExceptionInThreads();
-    // assertTrue(!dm.exceptionInThreads());
-  }
-
-  @Ignore("TODO: this passes when enabled")
-  @Test
-  public void testGetDistributionManagerIds() {
-    int systemCount = 0;
-    for (int h = 0; h < Host.getHostCount(); h++) {
-      Host host = Host.getHost(h);
-      systemCount += host.getSystemCount();
-    }
-
-    DM dm = getSystem().getDistributionManager();
-    systemCount += 1;
-
-    assertEquals(systemCount, dm.getNormalDistributionManagerIds().size());
+    Awaitility.await("waiting for exceptionInThreads to be true").atMost(15, TimeUnit.SECONDS)
+        .until(() -> {
+          return dm.exceptionInThreads();
+        });
+    dm.clearExceptionInThreads();
+    assertTrue(!dm.exceptionInThreads());
   }
 
   /**

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9de8732a/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java
index 49e8fa6..07c6f38 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/InternalDistributedSystemJUnitTest.java
@@ -279,26 +279,6 @@ public class InternalDistributedSystemJUnitTest {
   }
 
   /**
-   * Test a configuration with an <code>mcastPort</code> of zero and an empty <code>locators</code>.
-   * 
-   * @deprecated This test creates a "loner" distributed system
-   */
-  @Ignore
-  @Test
-  public void testEmptyLocators() {
-    Properties props = new Properties();
-    props.put(MCAST_PORT, String.valueOf(0));
-    props.put(LOCATORS, "");
-    try {
-      createSystem(props);
-      fail("Should have thrown an IllegalArgumentException");
-
-    } catch (IllegalArgumentException ex) {
-      // pass...
-    }
-  }
-
-  /**
    * Tests that getting the log level is what we expect.
    */
   @Test
@@ -356,10 +336,10 @@ public class InternalDistributedSystemJUnitTest {
     Properties props = new Properties();
     props.setProperty(MCAST_PORT, "0");
     props.setProperty(LOCATORS, "");
-    props.setProperty(MEMBERSHIP_PORT_RANGE, "5100-5200");
+    props.setProperty(MEMBERSHIP_PORT_RANGE, "45100-45200");
     DistributionConfig config = createSystem(props).getConfig();
-    assertEquals(5100, config.getMembershipPortRange()[0]);
-    assertEquals(5200, config.getMembershipPortRange()[1]);
+    assertEquals(45100, config.getMembershipPortRange()[0]);
+    assertEquals(45200, config.getMembershipPortRange()[1]);
   }
 
   @Test
@@ -389,41 +369,6 @@ public class InternalDistributedSystemJUnitTest {
     assertEquals(fileName, config.getStatisticArchiveFile().getName());
   }
 
-  /**
-   * @deprecated This test cannot be run because the gemfire.ack-wait-threshold system property is
-   *             set on this VM, thus overriding the value passed into the API.
-   */
-  @Ignore
-  @Test
-  public void testGetAckWaitThreshold() {
-    String time = String.valueOf(DistributionConfig.MIN_ACK_WAIT_THRESHOLD);
-    Properties props = new Properties();
-    // a loner is all this test needs
-    props.setProperty(MCAST_PORT, "0");
-    props.setProperty(LOCATORS, "");
-    props.put(ACK_WAIT_THRESHOLD, time);
-    DistributionConfig config = createSystem(props).getConfig();
-    assertEquals(Integer.parseInt(time), config.getAckWaitThreshold());
-  }
-
-  /**
-   * @deprecated This test cannot be run because the gemfire.ack-wait-threshold system property is
-   *             set on this VM, thus overriding the value passed into the API.
-   */
-  @Ignore
-  @Test
-  public void testInvalidAckWaitThreshold() {
-    Properties props = new Properties();
-    props.put(ACK_WAIT_THRESHOLD, "blah");
-    try {
-      createSystem(props);
-      fail("Should have thrown an IllegalArgumentException");
-
-    } catch (IllegalArgumentException ex) {
-      // pass...
-    }
-  }
-
   @Test
   public void testGetCacheXmlFile() {
     String fileName = "blah";

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9de8732a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
index ebf87be..792a1fd 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java
@@ -52,6 +52,7 @@ import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Properties;
+import java.util.concurrent.TimeUnit;
 
 import static org.apache.geode.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.assertFalse;
@@ -60,6 +61,8 @@ import static org.mockito.Matchers.any;
 import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.*;
 
+import com.jayway.awaitility.Awaitility;
+
 @Category({IntegrationTest.class, MembershipTest.class})
 public class GMSHealthMonitorJUnitTest {
 
@@ -336,11 +339,11 @@ public class GMSHealthMonitorJUnitTest {
 
     gmsHealthMonitor.processMessage(sm);
 
-    Thread.sleep(2 * memberTimeout + 200);
-
-    System.out.println("testRemoveMemberCalled ending");
-    verify(joinLeave, atLeastOnce()).remove(any(InternalDistributedMember.class),
-        any(String.class));
+    Awaitility.await("waiting for remove(member) to be invoked")
+        .atMost(3 * memberTimeout, TimeUnit.SECONDS).until(() -> {
+          verify(joinLeave, atLeastOnce()).remove(any(InternalDistributedMember.class),
+              any(String.class));
+        });
     Assert.assertTrue(gmsHealthMonitor.getStats().getSuspectsReceived() > 0);
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9de8732a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
index c3c33d0..7852db5 100644
--- a/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
+++ b/geode-core/src/test/java/org/apache/geode/test/dunit/standalone/ProcessManager.java
@@ -191,7 +191,8 @@ public class ProcessManager {
     cmds.add("-Xmx512m");
     cmds.add("-D" + DistributionConfig.GEMFIRE_PREFIX + "DEFAULT_MAX_OPLOG_SIZE=10");
     cmds.add("-D" + DistributionConfig.GEMFIRE_PREFIX + "disallowMcastDefaults=true");
-    cmds.add("-D" + DistributionConfig.RESTRICT_MEMBERSHIP_PORT_RANGE + "=true");
+    cmds.add("-D" + DistributionConfig.GEMFIRE_PREFIX
+        + DistributionConfig.RESTRICT_MEMBERSHIP_PORT_RANGE + "=true");
     cmds.add("-ea");
     cmds.add("-XX:MetaspaceSize=512m");
     cmds.add("-XX:+PrintGC");


[13/31] incubator-geode git commit: GEODE-1931: Spotless

Posted by ab...@apache.org.
GEODE-1931: Spotless


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

Branch: refs/heads/feature/GEODE-2156
Commit: 6eb62eb7f8f6f2b0f812cb8462982ef7a1bcaa64
Parents: f4439fc
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Thu Dec 1 07:45:09 2016 -0800
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Thu Dec 1 07:45:25 2016 -0800

----------------------------------------------------------------------
 .../geode/distributed/LocatorDUnitTest.java     | 34 ++++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6eb62eb7/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
index 3b8c406..9715b73 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
@@ -1812,21 +1812,21 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
         }
       }
     });
-    vm3.invoke("Start locator on " + port2,()->{
-        File logFile = new File("");
-        try {
-          Properties props = new Properties();
-          props.setProperty(MCAST_PORT, String.valueOf(mcastport));
-          props.setProperty(LOCATORS, locators);
-          props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
-          props.setProperty(MCAST_TTL, "0");
-          props.setProperty(ENABLE_NETWORK_PARTITION_DETECTION, "true");
-          props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
-          addDSProps(props);
-          Locator.startLocatorAndDS(port2, logFile, null, props);
-        } catch (IOException ex) {
-          org.apache.geode.test.dunit.Assert.fail("While starting locator on port " + port2, ex);
-        }
+    vm3.invoke("Start locator on " + port2, () -> {
+      File logFile = new File("");
+      try {
+        Properties props = new Properties();
+        props.setProperty(MCAST_PORT, String.valueOf(mcastport));
+        props.setProperty(LOCATORS, locators);
+        props.setProperty(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+        props.setProperty(MCAST_TTL, "0");
+        props.setProperty(ENABLE_NETWORK_PARTITION_DETECTION, "true");
+        props.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
+        addDSProps(props);
+        Locator.startLocatorAndDS(port2, logFile, null, props);
+      } catch (IOException ex) {
+        org.apache.geode.test.dunit.Assert.fail("While starting locator on port " + port2, ex);
+      }
     });
 
     SerializableRunnable connect = new SerializableRunnable("Connect to " + locators) {
@@ -1977,7 +1977,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
     Locator locator = Locator.startLocatorAndDS(port1, logFile, p);
     try {
 
-      vm0.invoke(()->DistributedSystem.connect(p));
+      vm0.invoke(() -> DistributedSystem.connect(p));
 
       LogWriterUtils.getLogWriter().info("Stopping locator");
       locator.stop();
@@ -1985,7 +1985,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
       LogWriterUtils.getLogWriter().info("Starting locator");
       locator = Locator.startLocatorAndDS(port1, logFile, p);
 
-      vm0.invoke("disconnect",()->DistributedSystem.connect(p).disconnect());
+      vm0.invoke("disconnect", () -> DistributedSystem.connect(p).disconnect());
 
     } finally {
       locator.stop();


[23/31] incubator-geode git commit: GEODE-2161: avoid unnecessary byte copy of hdos.

Posted by ab...@apache.org.
GEODE-2161: avoid unnecessary byte copy of hdos.


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

Branch: refs/heads/feature/GEODE-2156
Commit: 44278d165750d211a055d19e6e69ec21bb73edd9
Parents: fdd6166
Author: zhouxh <gz...@pivotal.io>
Authored: Thu Dec 1 10:18:15 2016 -0800
Committer: zhouxh <gz...@pivotal.io>
Committed: Thu Dec 1 16:15:15 2016 -0800

----------------------------------------------------------------------
 .../geode/internal/cache/FilterRoutingInfo.java     | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/44278d16/geode-core/src/main/java/org/apache/geode/internal/cache/FilterRoutingInfo.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/FilterRoutingInfo.java b/geode-core/src/main/java/org/apache/geode/internal/cache/FilterRoutingInfo.java
index b3cf2e4..279a4d1 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/FilterRoutingInfo.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/FilterRoutingInfo.java
@@ -389,8 +389,12 @@ public class FilterRoutingInfo implements VersionedDataSerializable {
       }
       InternalDataSerializer.writeSetOfLongs(this.interestedClients, this.longIDs, hdos);
       InternalDataSerializer.writeSetOfLongs(this.interestedClientsInv, this.longIDs, hdos);
-      byte[] myData = hdos.toByteArray();
-      DataSerializer.writeByteArray(myData, out);
+      if (out instanceof HeapDataOutputStream) {
+        ((HeapDataOutputStream) out).writeAsSerializedByteArray(hdos);
+      } else {
+        byte[] myData = hdos.toByteArray();
+        DataSerializer.writeByteArray(myData, out);
+      }
     }
 
 
@@ -424,8 +428,12 @@ public class FilterRoutingInfo implements VersionedDataSerializable {
         }
         InternalDataSerializer.writeSetOfLongs(this.interestedClients, this.longIDs, hdos);
         InternalDataSerializer.writeSetOfLongs(this.interestedClientsInv, this.longIDs, hdos);
-        byte[] myData = hdos.toByteArray();
-        DataSerializer.writeByteArray(myData, out);
+        if (out instanceof HeapDataOutputStream) {
+          ((HeapDataOutputStream) out).writeAsSerializedByteArray(hdos);
+        } else {
+          byte[] myData = hdos.toByteArray();
+          DataSerializer.writeByteArray(myData, out);
+        }
       } else {
         DataSerializer.writeHashMap(this.cqs, out);
         InternalDataSerializer.writeSetOfLongs(this.interestedClients, this.longIDs, out);


[26/31] incubator-geode git commit: GEODE-2156: Update mailing list references

Posted by ab...@apache.org.
GEODE-2156: Update mailing list references


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

Branch: refs/heads/feature/GEODE-2156
Commit: 4dfdeeeed57024917954a1f82d87c11e22fce900
Parents: 7d798c3
Author: Anthony Baker <ab...@apache.org>
Authored: Tue Nov 29 20:05:18 2016 -0800
Committer: Anthony Baker <ab...@apache.org>
Committed: Thu Dec 1 17:35:15 2016 -0800

----------------------------------------------------------------------
 .travis.yml                                             |  2 +-
 dev-tools/docker/base/Dockerfile                        |  2 +-
 dev-tools/docker/compile/Dockerfile                     |  2 +-
 dev-tools/docker/docs/Dockerfile                        |  2 +-
 docker/Dockerfile                                       |  2 +-
 geode-book/README.md                                    |  4 ++--
 geode-book/config.yml                                   | 12 ++++++------
 geode-book/redirects.rb                                 |  2 +-
 .../geode/cache/partition/PartitionListenerAdapter.java |  2 +-
 .../apache/geode/internal/i18n/LocalizedStrings.java    |  2 +-
 .../installation/install_standalone.html.md.erb         |  6 +++---
 geode-examples/README.md                                |  2 +-
 geode-spark-connector/doc/2_quick.md                    |  2 +-
 13 files changed, 21 insertions(+), 21 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4dfdeeee/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index fdbea8d..d496872 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,7 +32,7 @@ after_failure:
 notifications:
   email:
     recipients:
-      - dev@geode.incubator.apache.org
+      - dev@geode.apache.org
     on_success: change
     on_failure: change
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4dfdeeee/dev-tools/docker/base/Dockerfile
----------------------------------------------------------------------
diff --git a/dev-tools/docker/base/Dockerfile b/dev-tools/docker/base/Dockerfile
index 523ae57..1cce0dd 100644
--- a/dev-tools/docker/base/Dockerfile
+++ b/dev-tools/docker/base/Dockerfile
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 FROM centos:centos7
-MAINTAINER Geode Community <de...@geode.incubator.apache.org>
+MAINTAINER Geode Community <de...@geode.apache.org>
 
 LABEL Vendor="Apache Geode"
 LABEL version=unstable

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4dfdeeee/dev-tools/docker/compile/Dockerfile
----------------------------------------------------------------------
diff --git a/dev-tools/docker/compile/Dockerfile b/dev-tools/docker/compile/Dockerfile
index d1199bb..6ae343a 100644
--- a/dev-tools/docker/compile/Dockerfile
+++ b/dev-tools/docker/compile/Dockerfile
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 FROM geode/base:0.1
-MAINTAINER Geode Community <de...@geode.incubator.apache.org>
+MAINTAINER Geode Community <de...@geode.apache.org>
 
 LABEL Vendor="Apache Geode"
 LABEL version=unstable

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4dfdeeee/dev-tools/docker/docs/Dockerfile
----------------------------------------------------------------------
diff --git a/dev-tools/docker/docs/Dockerfile b/dev-tools/docker/docs/Dockerfile
index f124483..8ce7397 100644
--- a/dev-tools/docker/docs/Dockerfile
+++ b/dev-tools/docker/docs/Dockerfile
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 FROM ruby:2.3.0
-MAINTAINER Geode Community <de...@geode.incubator.apache.org>
+MAINTAINER Geode Community <de...@geode.apache.org>
 
 LABEL Vendor="Apache Geode"
 LABEL version=unstable

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4dfdeeee/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8896a4d..a42b47a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -15,7 +15,7 @@
 # limitations under the License.
 
 FROM geode/base:0.1
-MAINTAINER Geode Community <de...@geode.incubator.apache.org>
+MAINTAINER Geode Community <de...@geode.apache.org>
 
 LABEL Vendor="Apache Geode"
 LABEL version=unstable

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4dfdeeee/geode-book/README.md
----------------------------------------------------------------------
diff --git a/geode-book/README.md b/geode-book/README.md
index 15ed0eb..d69354b 100644
--- a/geode-book/README.md
+++ b/geode-book/README.md
@@ -10,7 +10,7 @@ This document contains instructions for building and viewing the Apache Geode Us
 
 ## About
 
-Apache Geode provides the full source for the Apache Geode User Guide in markdown format (see `{geode-project-dir}/geode-docs/CONTRIBUTE.md`). The latest check-ins to `{geode-project-dir}/geode-docs` on the `develop` branch are regularly built and published to http://geode.incubator.apache.org/docs/. Users can build the markdown into an HTML user guide using [Bookbinder](https://github.com/pivotal-cf/bookbinder) and the instructions below.
+Apache Geode provides the full source for the Apache Geode User Guide in markdown format (see `{geode-project-dir}/geode-docs/CONTRIBUTE.md`). The latest check-ins to `{geode-project-dir}/geode-docs` on the `develop` branch are regularly built and published to http://geode.apache.org/docs/. Users can build the markdown into an HTML user guide using [Bookbinder](https://github.com/pivotal-cf/bookbinder) and the instructions below.
 
 Bookbinder is a Ruby gem that binds  a unified documentation web application from markdown, html, and/or DITA source material. The source material for bookbinder must be stored either in local directories or in GitHub repositories. Bookbinder runs [Middleman](http://middlemanapp.com/) to produce a Rackup app that can be deployed locally or as a web application.
 
@@ -89,4 +89,4 @@ Once you have reviewed your local build of the User Guide, you can embed it in t
 
    You can now view the local website at http://localhost:3000.
 
-4. Once you have reviewed your changes, follow the instructions at `{geode-project-dir}/geode-site/website/README.md` for propagating changes to the `asf-site` branch.
\ No newline at end of file
+4. Once you have reviewed your changes, follow the instructions at `{geode-project-dir}/geode-site/website/README.md` for propagating changes to the `asf-site` branch.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4dfdeeee/geode-book/config.yml
----------------------------------------------------------------------
diff --git a/geode-book/config.yml b/geode-book/config.yml
index eee0909..6cbc87d 100644
--- a/geode-book/config.yml
+++ b/geode-book/config.yml
@@ -25,12 +25,12 @@ sections:
   subnav_template: geode-subnav
 
 template_variables:
-  support_url: http://geode.incubator.apache.org/community
-  product_url: http://geode.incubator.apache.org/
-  book_title: Apache Geode (Incubating) Documentation
-  support_link: <a href="http://geode.incubator.apache.org/community" target="_blank">Community</a>
-  support_call_to_action: <a href="http://geode.incubator.apache.org/community" target="_blank">Need Help?</a>
-  product_link: <div class="header-item"><a href="http://geode.incubator.apache.org/">Back to Geode Page</a></div>
+  support_url: http://geode.apache.org/community
+  product_url: http://geode.apache.org/
+  book_title: Apache Geode Documentation
+  support_link: <a href="http://geode.apache.org/community" target="_blank">Community</a>
+  support_call_to_action: <a href="http://geode.apache.org/community" target="_blank">Need Help?</a>
+  product_link: <div class="header-item"><a href="http://geode.apache.org/">Back to Geode Page</a></div>
   domain_name: apache.org
   book_title_short: Geode Docs
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4dfdeeee/geode-book/redirects.rb
----------------------------------------------------------------------
diff --git a/geode-book/redirects.rb b/geode-book/redirects.rb
index 71f50d9..81f27c8 100644
--- a/geode-book/redirects.rb
+++ b/geode-book/redirects.rb
@@ -13,6 +13,6 @@
 #express or implied. See the License for the specific language governing
 #permissions and limitations under the License.
 
-r301 %r{/releases/latest/javadoc/(.*)}, 'http://geode.incubator.apache.org/releases/latest/javadoc/$1'
+r301 %r{/releases/latest/javadoc/(.*)}, 'http://geode.apache.org/releases/latest/javadoc/$1'
 rewrite '/', '/docs/guide/about_geode.html'
 rewrite '/index.html', '/docs/guide/about_geode.html'

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4dfdeeee/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionListenerAdapter.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionListenerAdapter.java b/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionListenerAdapter.java
index 5c384b7..b56cdf3 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionListenerAdapter.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/partition/PartitionListenerAdapter.java
@@ -28,7 +28,7 @@ import org.apache.geode.cache.Region;
  * {@link org.apache.geode.cache.Declarable}
  * </p>
  * 
- * Note : Please request help on the Geode developer mailing list (dev@geode.incubator.apache.org)
+ * Note : Please request help on the Geode developer mailing list (dev@geode.apache.org)
  * before using these APIs.
  *
  * 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4dfdeeee/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java b/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
index fc59922..5923123 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/i18n/LocalizedStrings.java
@@ -7581,7 +7581,7 @@ public class LocalizedStrings {
   public static final StringId SwaggerConfig_EULA_LINK =
       new StringId(6619, "http://www.apache.org/licenses/");
   public static final StringId SwaggerConfig_DEVELOPER_EMAIL =
-      new StringId(6620, "dev@geode.incubator.apache.org");
+      new StringId(6620, "dev@geode.apache.org");
   public static final StringId SwaggerConfig_DOC_TITLE =
       new StringId(6621, "Apache Geode Documentation");
   public static final StringId SwaggerConfig_PRODUCT_LINK =

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4dfdeeee/geode-docs/getting_started/installation/install_standalone.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/getting_started/installation/install_standalone.html.md.erb b/geode-docs/getting_started/installation/install_standalone.html.md.erb
index 04b347a..9a1987e 100644
--- a/geode-docs/getting_started/installation/install_standalone.html.md.erb
+++ b/geode-docs/getting_started/installation/install_standalone.html.md.erb
@@ -30,7 +30,7 @@ Build from source or use the ZIP or TAR distribution to install Apache Geode on
     export JAVA_HOME
     ```
 
-2.  Download the project source from the Releases page found at [http://geode.incubator.apache.org](http://geode.incubator.apache.org/), and unpack the source code.
+2.  Download the project source from the Releases page found at [http://geode.apache.org](http://geode.apache.org/), and unpack the source code.
 3.  Within the directory containing the unpacked source code, build without tests:
 
     ``` pre
@@ -60,7 +60,7 @@ Build from source or use the ZIP or TAR distribution to install Apache Geode on
     ```
 
 2.  Install Gradle, version 2.3 or a more recent version.
-3.  Download the project source from the Releases page found at [http://geode.incubator.apache.org](http://geode.incubator.apache.org/), and unpack the source code.
+3.  Download the project source from the Releases page found at [http://geode.apache.org](http://geode.apache.org/), and unpack the source code.
 4.  Within the folder containing the unpacked source code, build without the tests:
 
     ``` pre
@@ -83,7 +83,7 @@ Build from source or use the ZIP or TAR distribution to install Apache Geode on
 
 ## <a id="concept_0129F6A1D0EB42C4A3D24861AF2C5425__section_D3326496B2BB47A7AB0CFC1A5E266842" class="no-quick-link"></a>Install Binaries from .zip or .tar File
 
-1.  Download the .zip or .tar file from the Releases page found at [http://geode.incubator.apache.org](http://geode.incubator.apache.org/).
+1.  Download the .zip or .tar file from the Releases page found at [http://geode.apache.org](http://geode.apache.org/).
 2.  Unzip the .zip file or expand the .tar file, where `path_to_product` is an absolute path, and the file name will vary due to the version number. For the .zip format:
 
     ``` pre

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4dfdeeee/geode-examples/README.md
----------------------------------------------------------------------
diff --git a/geode-examples/README.md b/geode-examples/README.md
index 83fd93d..de7a533 100644
--- a/geode-examples/README.md
+++ b/geode-examples/README.md
@@ -1,6 +1,6 @@
 # Apache Geode examples
 
-This is the home of Apache Geode examples that are bundled with the project. Contributions<sup>[2]</sup> and corrections are welcome. Please talk to us about your suggestions at [dev@geode.incubator.apache.org](mailto:dev@geode.incubator.apache.org) or submit a [pull request](https://github.com/apache/incubator-geode/pull/new/develop).
+This is the home of Apache Geode examples that are bundled with the project. Contributions<sup>[2]</sup> and corrections are welcome. Please talk to us about your suggestions at [dev@geode.apache.org](mailto:dev@geode.apache.org) or submit a [pull request](https://github.com/apache/incubator-geode/pull/new/develop).
 
 ## Example requirements
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4dfdeeee/geode-spark-connector/doc/2_quick.md
----------------------------------------------------------------------
diff --git a/geode-spark-connector/doc/2_quick.md b/geode-spark-connector/doc/2_quick.md
index ed79f39..70e1a17 100644
--- a/geode-spark-connector/doc/2_quick.md
+++ b/geode-spark-connector/doc/2_quick.md
@@ -6,7 +6,7 @@ Geode Connector functionalities.
 ### Prerequisites
 
 Before you start, you should have basic knowledge of Geode and Spark. 
-Please refer to [Geode Documentation](http://geode.incubator.apache.org/docs/)
+Please refer to [Geode Documentation](http://geode.apache.org/docs/)
 and [Spark Documentation](https://spark.apache.org/docs/latest/index.html) for
 details. If you are new to Geode, this 
 [Quick Start Guide](http://geode-docs.cfapps.io/docs/getting_started/15_minute_quickstart_gfsh.html)


[27/31] incubator-geode git commit: GEODE-2156 Remove incubating references

Posted by ab...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d798c34/geode-pulse/src/main/webapp/regionDetail.html
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/regionDetail.html b/geode-pulse/src/main/webapp/regionDetail.html
index 0323cd1..711ef31 100644
--- a/geode-pulse/src/main/webapp/regionDetail.html
+++ b/geode-pulse/src/main/webapp/regionDetail.html
@@ -1,552 +1,552 @@
-<!DOCTYPE html>
-<!--
-  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.
--->
-
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="X-UA-Compatible" content="IE=edge" />
-<meta http-equiv="CACHE-CONTROL" content="NO-CACHE,NO-STORE" />
-<meta http-equiv="PRAGMA" content="NO-CACHE" />
-<meta http-equiv="EXPIRES" content="-1">
-<title>Pulse</title>
-<link href="css/common.css" rel="stylesheet" type="text/css" />
-<link href="css/style.css" rel="stylesheet" type="text/css" />
-<link type="text/css" href="css/base.css" rel="stylesheet" />
-<link type="text/css" href="css/Treemap.css" rel="stylesheet" />
-<link type="text/css" href="css/jquery.jscrollpane.css" rel="stylesheet" media="all" />
-<link rel="stylesheet" type="text/css" media="screen" href="css/grid/ui.jqgrid.css" />
-<!-- fix IE Ui issues-->
-<!--[if IE 7]>
-  <link href="css/ie/ie7.css" type="text/css" rel="stylesheet"/>
- <![endif]-->
-<!--[if IE 8]>
-  <link href="css/ie/ie8.css" type="text/css" rel="stylesheet"/>
- <![endif]-->
-<!--[if IE 9]>
-  <link href="css/ie/ie9.css" type="text/css" rel="stylesheet"/>
- <![endif]-->
-<!-- IE Fix for HTML5 Tags -->
-<!--[if lt IE 9]>
-<script src='scripts/lib/html5.js'></script>
-<script type="text/javascript" src="scripts/lib/excanvas.js"></script>
-<script type="text/javascript"> if (!window.console) console = {log: function() {}}; </script>
-  <![endif]-->
-<script type="text/javascript" src="scripts/lib/jquery-1.7.2.js"></script>
-<script type="text/javascript" src="scripts/lib/jquery.i18n.properties.js"></script>
-<script type="text/javascript" src="scripts/lib/jit.js"></script>
-<script type="text/javascript" src='scripts/lib/common.js'></script>
-<script type="text/javascript" src="scripts/lib/jquery.mousewheel.js"></script>
-<script type="text/javascript" src="scripts/lib/jquery.jscrollpane.js"></script>
-<script type="text/javascript" src="scripts/lib/jquery.placeholder.js"></script>
-<script type="text/javascript" src="scripts/lib/jquery.sparkline.js"></script>
-<script type="text/javascript" src="scripts/lib/grid.locale-en.js"></script>
-<script type="text/javascript" src="scripts/lib/jquery.jqGrid.src.js"></script>
-<script type="text/javascript" src="scripts/lib/jquery.tablednd.js"></script>
-<script type="text/javascript" src="scripts/lib/jquery.timeago.js"></script>
-
-<script type="text/javascript" src='scripts/pulsescript/regionView.js'></script>
-<script type="text/javascript" src="scripts/pulsescript/PulseCallbacks.js"></script>
-<script type="text/javascript" src="scripts/pulsescript/PulseFunctions.js"></script>
-<script type="text/javascript" src='scripts/pulsescript/common.js'></script>
-<script type="text/javascript" src="scripts/lib/tooltip.js"></script>
-
-<STYLE type="text/css">
-	div.jspDrag {left: -3px;}
-</STYLE>
-</head>
-
-<body onload="return checkMedia();">
-
-<!-- popup (Riya) -->
-<div id="popupDiv" style="position:relative; display: none;"  data-role="widget" data-widgetid="ClusterSelectedRegionsMember" data-active ="yes" data-timeline="5000">
-
-	<!-- Large Block-->
-    <div class="content" style="background: none repeat scroll 0 0 #132634;">
-      <h3><span id="idMemberName">M1</span></h3>
-        
-        <div class="clearfix">
-          <div class="widthfull-100per left " style="padding-top:5px;">
-            <div class=" popupdetailsBlock">
-						  <div class="color-fff font-size15" id="regionMemberEntryCount">0</div>
-						  <span class="labeltext">Entry Count</span>
-					  </div>
-					  <div class="popupdetailsBlock">
-						  <div class="color-fff font-size15" id="regionMemberEntrySize">0</div>
-						  <span class="labeltext">Entry Size(MB)</span>
-					  </div>
-					  <div class="marginB5 popupdetailsBlock">
-						  <div class="color-fff font-size15" id="regionMemberAccessor">-</div>
-						  <span class="labeltext">Accessor</span>
-					  </div>
-          </div>
-				  <div class="left popupCanvasContentBlock" id="SmallBlock_3">
-				    <div style="border-top: 1px solid #4e6277; margin: 0px 10px 5px;"></div>
-                    <div class="marginB11 graphBlocksContent">
-                        <div class="left">
-                            <span class="left">Last 15 Minutes</span>
-                        </div>
-                        <div class="right marginL10">
-		                    <span data-prod-custom="pulse-reads-custom" class="left">Reads</span>
-		                    <span class="left marginL5 colorCodeBlockOnPopup diskReadsCode"></span>
-		                </div>
-		                <div class="right marginL10">
-		                    <span data-prod-custom="pulse-writes-custom" class="left">Writes</span>
-		                    <span class="left marginL5 colorCodeBlockOnPopup diskWritesCode"></span>
-		                </div>
-                    </div>
-                    <div class="clearfix">
-                        <div class="left" style="width:135px;">
-                            <div class="graphBlocksContent">
-                                <div class="color-fff font-size15">
-                                    <span id="memberMemoryReadsThroughput">&nbsp;</span>
-                                </div>
-                                <div class="width100Per">
-                                    <span class="">Reads</span>
-                                </div>
-                                <div class="left marginTop6 graphborder" style="background: #132634;">
-                                	<span class="left lineGraph" id="memberMemoryReadsTrend">&nbsp;</span>
-                            	</div>
-                            </div>
-                        </div>
-                        <div class="left" style="width:135px;">
-                            <div class="graphBlocksContent">
-                                <div class="color-fff font-size15">
-                                    <span id="memberMemoryWritesThroughput">&nbsp;</span>
-                                </div>
-                                <div class="width100Per ">
-                                    <span class="">Writes</span>
-                                </div>
-                                <div class="left marginTop6 graphborder" style="background: #132634;">
-                                	<span class="left lineGraph" id="memberMemoryWritesTrend">&nbsp;</span>
-                            	</div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="clearfix">
-                        <div class="left" style="width:135px;">
-                            <div class="graphBlocksContent">
-                                <div class="color-fff font-size15">
-                                    <span id="memberDiskReadsThroughput">&nbsp;</span>
-                                </div>
-                                <div class="width100Per">
-                                    <span class="">Disk Reads</span>
-                                </div>
-                                <div class="left marginTop6 graphborder" style="background: #132634;">
-                                	<span class="left lineGraph" id="memberDiskReadsTrend">&nbsp;</span>
-                            	</div>
-                            </div>
-                        </div>
-                        <div class="left" style="width:135px; border: 0px solid #889eb9;">
-                            <div class="graphBlocksContent" >
-                                <div class="color-fff font-size15">
-                                    <span id="memberDiskWritesThroughput">&nbsp;</span>
-                                </div>
-                                <div class="width100Per">
-                                    <span class="">Disk Writes</span>
-                                </div>
-                                <div class="left marginTop6 graphborder" style="background: #132634;">
-                                <span class="left lineGraph" id="memberDiskWritesTrend">&nbsp;</span>
-                            </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <!-- </div>
-            </div> -->
-        </div>
-    </div>
-</div>
-<!-- popup (Riya) -->
-
-<!-- Connection lost-->
-<div class="connectionLostMasterBlock hide" id="connectionStatusDiv" >
-<div class="connectionLostInnerBlock">
-    <label class="left">Connecting ...</label>
-    <div class="clear"></div>
-    <div id="connectionErrorMsgDiv" class="right"></div>
-</div>
-</div>
-<div id="canvasWidth">
-<!--Top Links-->
-  <div class="headerTopLinksMaster">
-    <div class="right">
-      <div class="left position-relative"><a href="#."class="left headerTopLinks aboutClicked-Off">About</a> 
-        <!-- About Dropdown-->
-        <div id="detailsAbout" class="aboutBlock display-none">
-          <div class="aboutDetailsBlock">
-            <div class="left widthfull-100per marginBottom30">
-              <div class="left"><img data-prod-custom="pulse-aboutimg-custom" src="images/about-geode.png">
-                <div>
-                 <div class="aboutVersionBlock left" id="pulseVersion"></div>
-                 <div class="left termsBlock">&nbsp;<a id="pulseVersionDetailsLink"  href="#dialog1" class="display-none" >Version Details</a></div>
-                </div>
-              </div>
-              <div data-prod-custom="pulse-about-custom" class="right aboutText">The Pulse tool monitors Apache Geode system in real time. It provides health information, detailed operational and configuration data, system alerts, throughput performance and statistics for system members and connected clients.</div>
-            </div>
-              <div class="left widthfull-100per copyright">
-                  <p>Apache Geode (incubating)<br>
-                      Copyright 2016 The Apache Software Foundation.</p>
-                  <p>&nbsp;</p>
-                  <p>This product includes software developed at
-                      The Apache Software Foundation (http://www.apache.org/).</p>
-              </div>
-            </div>
-        </div>
-        <!-- Version Details Popup -->
-      </div>
-      <div class="left headerTopSeperator"></div>
-      <div class="left"><a data-prod-custom="pulse-help-custom"  target="_blank" href="http://geode.apache.org/docs/guide/tools_modules/pulse/chapter_overview.html" class="left headerTopLinks">Help</a></div>
-      <div class="left headerTopSeperator"></div>
-      <div class="left headerTopLinks welcomeLabelPRZero">Welcome</div>
-      <div class="left headerTopLinks textbold font-size12" id="userName"></div>
-      <div class="left headerTopSeperator"></div>
-      <div class="left"><a href="pulse/clusterLogout" class="left headerTopLinks">Sign Out</a></div>
-    </div>
-  </div> 
-  <!-- Header block-->
-  <header>
-    <div class="left">
-      <a href="#." class="left textbold HeaderLink HeaderLinkActive" id="clusterName"  onclick="openClusterDetail();"></a>
-    </div>
-    <div class="textbold right logoBlock"><img src="images/apache_geode_logo.png"/><a href="#.">[LOGO]</a></div>
-  </header>
-  <div class="clear"></div>
-  <div class="subHeader">
-			<ul>
-				<li><a href="#." class="active" onclick="openClusterDetail();">Cluster View</a></li>
-				<!-- Hide Data Browser tab for gemfirexd (Pulse-Cheetah Release) -->
-				<li><a href="#."  onclick="openDataBrowser();">Data Browser</a></li>
-				<!-- Hide Query Statistics tab for gemfire -->
-				<li id="subTabQueryStatistics"><a href="#." onclick="openQueryStatistics();">Query Statistics</a></li>
-			</ul>
-		<div class="clear"></div>
-		</div>
-  <!-- Middle block-->
-  <div class="left widthfull-100per"> 
-    <!--Top Right Block 1-->
-    <div class="right widthfull-100per marginTB10">
-    <!-- Tab -->
-    <div id="notificationsPanel" class="right marginL10 TabTopPanel position-relative" 
-    data-role="widget" data-widgetid="CluserAlertNotification" data-active ="yes" data-timeline="5000">
-    </div>
-      <div class="left position-relative membersNameTopMargin"><span class="member_txt" style="font-size: 14px;">Region Name&nbsp;:&nbsp;<span id="regionNameText"></span></span> </div>
-    </div>
-    <!--Middle Block 1-->
-    <div class="left leftBlockCanvas">
-      <div  data-role="widget" data-widgetid="ClusterSelectedRegion" data-active ="yes" data-timeline="5000">
-        <div class="dataViewTreeViewBlock"> 
-          <!-- Large Block-->
-          <div class="canvasBlockLargeDataView marginBR10-11 left">
-            <div class="left widthfull-100per canvasBlockInnerBlock">
-              <span data-prod-custom="pulse-rtSummaryBySize-custom" class="left marginL10 canvasHeading">Region Members</span>
-              <a id="btngridIcon" class="gridIcon " onClick="tabClusterGrid();"></a>
-              <a id="btnchartIcon" class="chartIconActive" onClick="tabTreeMap();" ></a>
-            </div>
-            <div class="left widthfull-100per canvasBlockInnerBlock regionHeading">
-              <!-- Search-->
-              <div class="left marginBottom6 marginL10 marginTop6">
-                <div class="searchBlockMaster">
-                  <input type="button" class="searchButton">
-                  <!-- <input type="text" placeholder="Search" 
-                    onkeyup="applyFilterOnClusterRegions();" class="searchBox"
-                    id="filterClusterRegionsBox"> -->
-                    <input type="text" placeholder="Search" 
-                    onkeyup="applyFilterOnRegionMembers();" class="searchBox"
-                    id="filterRegionMembersBox">
-                </div>
-              </div>
-            </div>
-            <div class="left canvasInnerBlock canvasBlockLargeContentDataView" id="LargeBlock_1"> 
-              <!--Grid  Block-->
-              <div class="graphBlocksPanelDataView left display-none" id="gridBlocks_Panel">
-                <div class="left widthfull-100per">
-                  <table id="memberList"></table>
-                </div>
-              </div>
-              <!--chart  Block-->
-              <div class="chartBlocksPanelDataView left" id="chartBlocks_Panel">
-                <div class="left widthfull-100per">
-                  <div class="clear"></div>
-                  <div class="treeViewGraphDataView position-relative">
-                    <div id="GraphTreeMap" style="width: 100%; height: 690px; overflow: hidden;"></div> 
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <!-- Right Block-->
-        <div class="rightBlockDataView"> 
-          <!-- Block 1-->
-          <div class="canvasBlockDataView marginB10 left">
-            <!-- <div class="selectedRegionLabel" id="regionName"></div> -->
-            <div class="selectedRegionLabel" id="regionPath"></div>
-            <div class="left width563 canvasBlockInnerBlock regionHeading">
-              <span class="left marginL10 canvasHeading">
-                <!-- <span data-prod-custom="pulse-regionstablePath-custom" class="left">Region Path:&nbsp;</span>
-                <label id="regionPath"></label> -->
-                <span data-prod-custom="pulse-regionstableType-custom" class="left">Region Type:&nbsp;</span>
-                <label id="regionType"></label>
-              </span>
-            </div>
-            <div class="left canvasInnerBlock canvasContentBlockDataView" id="SmallBlock_1"> 
-              <!-- block 1-->
-              <div class="graphBlocksContentDataView left">
-                <div class="detailsBlock-memberDataView">
-                  <div class="color-d2d5d7 font-size20" id="regionMembersText"></div>
-                  <span class="labeltext">Members</span></div>
-                <div class="detailsBlock-memberDataView">
-                  <div class="color-d2d5d7 font-size20" id="regionEmptyNodes"></div>
-                  <span class="labeltext">Empty Nodes</span></div>
-                <div class="detailsBlock-memberDataView">
-                  <div class="color-d2d5d7 font-size20"  id="regionEntryCountText"></div>
-                  <span class="labeltext" data-prod-custom="pulse-entrycount-custom">Entry Count</span></div>
-                <div class="detailsBlock-memberDataView">
-                  <div class="color-d2d5d7 font-size20" id="regionDiskUsage"></div>
-                  <span class="labeltext">Disk Usage</span></div>
-                <div class="detailsBlock-memberDataView">
-                  <div class="color-d2d5d7 font-size20" id="regionPersistence"></div>
-                  <span class="labeltext">Persistence</span></div>
-                <!-- <div class="detailsBlock-memberDataView">
-                  <div class="color-d2d5d7 font-size20" id="regionIsEnableOffHeapMemory"></div>
-                  <span class="labeltext">Off-Heap</span></div>
-                <div class="detailsBlock-memberDataView">
-                  <div class="color-d2d5d7 font-size20" id="regionIsHdfsWriteOnly"></div>
-                  <span class="labeltext">HDFS Write Only</span></div> -->
-              </div>
-              <div class="clear"></div>
-              <div class="horizontalSeparator"></div>
-              <div class="left widthfull-100per">
-                <div class="left dataViewLeftBlock"> 
-                  <!-- B1 -->
-                  <div class="left display-block widthfull-100per marginTop10" id="memoryUsageDiv">
-                    <div class="pointGridHeading border-topZero">
-                      <span data-prod-custom="pulse-regionMemoryUsage-custom" class="pointHeadingPadding textUpper">Memory Usage</span>
-                    </div>
-                    <div class="pointGridDataView">
-                      <div class="left dataViewUsedMasterBlock">
-                        <div class="left widthfull-100per">
-                          <div class="usageDataView firstPaddingLeftZero left">
-                            <div class="color-d2d5d7 font-size20">
-                              <span id="memoryUsed">0</span>
-                              <span class="font-size13 paddingL5" id="memoryUsedMBSpan">MB</span>
-                            </div>
-                            <span class="labeltext">Used</span> </div>
-                          <div class="usageDataView lastPaddingLeftZero right">
-                            <div class="color-d2d5d7 font-size20">
-                              <span id="totalMemory">0</span>
-                              <span class="font-size13 paddingL5">MB</span>
-                            </div>
-                            <span class="labeltext">Total</span> </div>
-                        </div>
-                        <div class="dataUsedProgressbar">
-                          <div class="widthfull-100per">
-                            <div class="memoryUsageChart" id="memoryUsage"></div>
-                            <div class="memoryUsageValue">
-                              <span id="memoryUsageVal"></span>
-                              <span class="PerRightMargin">%</span>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                  <div class="clear"></div>
-                  <div class="horizontalSeparator"></div>
-                  <!--B2-->
-                  <div class=" border-topZero">
-                        <span data-prod-custom="pulse-regionMemoryReadsWrites-custom" class="pointHeadingPadding textUpper">In-Memory Read/Write</span>
-                  </div>
-	                <div class="dataViewGraphMaster marginzero width100Per">
-		                  <div class="left display-block widthfull-100per">
-		                    <div class="left widthfull-100per">
-		                      <div class="left dataViewUsedMasterBlock">
-		                        <div class="graphBlocksContent marginB11 ">
-		                          <div class="left">
-		                            <span class="left">Last 15 Minutes</span>
-		                          </div>
-		                          <div class="right marginL10">
-		                            <span data-prod-custom="pulse-reads-custom" class="left">Reads</span>
-		                            <span class="left marginL10 colorCodeBlock diskReadsCode"></span>
-		                          </div>
-		                          <div class="right marginL10">
-		                            <span data-prod-custom="pulse-writes-custom" class="left">Writes</span>
-		                            <span class="left marginL10 colorCodeBlock diskWritesCode"></span>
-		                          </div>
-		                        </div>
-		                        <div class="">
-		                         <div class="graphBlocksContent">
-		                            <div class="color-d2d5d7 font-size20" id="currentReadsPerSec"></div>
-		                            <span class="labeltext">Reads</span>
-		                         </div>
-		                          <div class="widthfull-100per">
-		                            <div class="dataViewGraph"><span class="left lineGraph" id="readsPerSecTrend"></span></div>
-		                          </div>
-		                        </div>
-		                      </div>
-		                    </div>
-		                  </div>
-		                  <div class="left display-block widthfull-100per">
-		                    <div class="left widthfull-100per">
-		                      <div class="left dataViewUsedMasterBlock marginTop4">
-		                        <div class="">
-		                         <div class="graphBlocksContent">
-		                            <div class="color-d2d5d7 font-size20" id="currentWritesPerSec"></div>
-		                            <span class="labeltext">Writes</span>
-		                         </div>
-		                          <div class="widthfull-100per">
-		                            <div class="dataViewGraph"><span class="left lineGraph" id="writesPerSecTrend"></span></div>
-		                          </div>
-		                        </div>
-		                      </div>
-		                    </div>
-		                  </div>
-	                </div>
-                </div>
-                <div class="left dataViewRightBlock marginL10">
-                  <!--B3-->
-                  <div class="left display-block widthfull-100per margin marginTop10" id="regionMembersWidgetContainer">
-                    <!-- <div class="pointGridHeading border-topZero"><span data-prod-custom="pulse-regionstableMembers-custom" class="pointHeadingPadding textUpper">Region Members</span></div> -->
-                    <div>
-                      <div class="left regionMembersMasterBlock">
-                        <!-- <div class="left widthfull-100per"> 
-                          Search
-                          <div class="left marginB10 marginL10">
-                           <div class="searchBlockMaster">
-                            <input type="button" class="searchButton">
-                            <input type="text" placeholder="Search" onkeyup="applyFilterOnMembersList();" class="searchBox" id="filterMembersListBox">
-                          </div>
-                          </div>
-                          <div class="clear"></div>
-                           <div class="left regionMembersSearchBlock">
-                           <div id="memberNames" class="memberNamescls"></div>
-                          </div>
-                        </div> -->
-                      </div>
-                    </div>
-                  </div>
-                  <div class="clear"></div>
-                  <div class="horizontalSeparator"></div>
-                  <!--B4-->
-                  <div class=" border-topZero">
-                        <span data-prod-custom="pulse-regionDiskReadsWrites-custom" class="pointHeadingPadding textUpper">Disk Read/Write</span>
-                  </div>
-                  <div class="dataViewGraphMaster marginzero width100Per">
-                      <div class="left display-block widthfull-100per">
-                        <div class="left widthfull-100per">
-                          <div class="left dataViewUsedMasterBlock ">
-                            <div class="graphBlocksContent marginB11 ">
-                              <div class="left">
-                                <span class="left">Last 15 Minutes</span>
-                              </div>
-                              <div class="right marginL10">
-                                <span data-prod-custom="pulse-reads-custom" class="left">Reads</span>
-                                <span class="left marginL10 colorCodeBlock diskReadsCode"></span>
-                              </div>
-                              <div class="right marginL10">
-                                <span data-prod-custom="pulse-writes-custom" class="left">Writes</span>
-                                <span class="left marginL10 colorCodeBlock diskWritesCode"></span>
-                              </div>
-                            </div>
-                            <div class="">
-                             <div class="graphBlocksContent">
-                                <div class="color-d2d5d7 font-size20" id="currentDiskReadsPerSec"></div>
-                                <span class="labeltext">Reads</span>
-                             </div>
-                              <div class="widthfull-100per">
-                                <div class="dataViewGraph"><span class="left lineGraph" id="diskReadsPerSecTrend"></span></div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                      <div class="left display-block widthfull-100per">
-                        <div class="left widthfull-100per">
-                          <div class="left dataViewUsedMasterBlock marginTop4">
-                            <div class="">
-                             <div class="graphBlocksContent">
-                                <div class="color-d2d5d7 font-size20" id="currentDiskWritesPerSec"></div>
-                                <span class="labeltext">Writes</span>
-                             </div>
-                              <div class="widthfull-100per">
-                                <div class="dataViewGraph"><span class="left lineGraph" id="diskWritesPerSecTrend"></span></div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                  </div>
-                 </div>
-                </div>
-              </div>
-            </div>
-          </div>
-          <div class="clear"></div>
-        </div>
-      </div>
-    </div>
-  </div>
-
-<!-- Placeholder--> 
-<script>
-$('input[placeholder], textarea[placeholder]').placeholder();
-</script>
-<!--Popups Block-->
-<div id="boxes"> 
-  <!-- Version Details popup-->
- <div id="dialog1" class="window width345" data-role="widget" data-widgetid="PulseVersionDetails" data-active ="yes" data-timeline="5000">
-    <div class="popup_heading"><span>Version Details</span><a href="#" class="closePopup">&nbsp;</a></div>
-    <div class="popup_contentBlock">
-      <div class="popup-innerblock">
-        <ul class="widthfull-100per left">
-          <li class="left widthfull-100per">
-            <label class="width-40 display-inline-block">Pulse Version:</label>
-            <label class="width-58 display-inline-block" id="pulseVer"></label>
-          </li>
-          <li class="left widthfull-100per">
-            <label class="width-40 display-inline-block">Build Id:</label>
-            <label class="width-58 display-inline-block" id="buildId"></label>
-          </li>
-          <li class="left widthfull-100per">
-            <label class="width-40 display-inline-block">Build Date:</label>
-            <label class="width-58 display-inline-block" id="buildDate"></label>
-          </li>
-          <li class="left widthfull-100per">
-            <label class="width-40 display-inline-block">Source Date:</label>
-            <label class="width-58 display-inline-block" id="sourceDate"></label>
-          </li>
-          <li class="left widthfull-100per">
-            <label class="width-40 display-inline-block">Source Revision:</label>
-            <label class="width-58 display-inline-block" id="sourceRevision"></label>
-          </li>
-          <li class="left widthfull-100per">
-            <label class="width-40 display-inline-block">Source Repository:</label>
-            <label class="width-58 display-inline-block" id="sourceRepository"></label>
-          </li>
-        </ul>
-        <div class="clear"></div>
-      </div>
-    </div>
-  </div>
-  <!-- Mask to cover the whole screen -->
-  <div id="mask"></div>
-</div>
-<div id="tooltip" class="tooltip"></div>
-<div id="region_tooltip" class="tooltip"></div>
-</body>
-</html>
+<!DOCTYPE html>
+<!--
+  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.
+-->
+
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="X-UA-Compatible" content="IE=edge" />
+<meta http-equiv="CACHE-CONTROL" content="NO-CACHE,NO-STORE" />
+<meta http-equiv="PRAGMA" content="NO-CACHE" />
+<meta http-equiv="EXPIRES" content="-1">
+<title>Pulse</title>
+<link href="css/common.css" rel="stylesheet" type="text/css" />
+<link href="css/style.css" rel="stylesheet" type="text/css" />
+<link type="text/css" href="css/base.css" rel="stylesheet" />
+<link type="text/css" href="css/Treemap.css" rel="stylesheet" />
+<link type="text/css" href="css/jquery.jscrollpane.css" rel="stylesheet" media="all" />
+<link rel="stylesheet" type="text/css" media="screen" href="css/grid/ui.jqgrid.css" />
+<!-- fix IE Ui issues-->
+<!--[if IE 7]>
+  <link href="css/ie/ie7.css" type="text/css" rel="stylesheet"/>
+ <![endif]-->
+<!--[if IE 8]>
+  <link href="css/ie/ie8.css" type="text/css" rel="stylesheet"/>
+ <![endif]-->
+<!--[if IE 9]>
+  <link href="css/ie/ie9.css" type="text/css" rel="stylesheet"/>
+ <![endif]-->
+<!-- IE Fix for HTML5 Tags -->
+<!--[if lt IE 9]>
+<script src='scripts/lib/html5.js'></script>
+<script type="text/javascript" src="scripts/lib/excanvas.js"></script>
+<script type="text/javascript"> if (!window.console) console = {log: function() {}}; </script>
+  <![endif]-->
+<script type="text/javascript" src="scripts/lib/jquery-1.7.2.js"></script>
+<script type="text/javascript" src="scripts/lib/jquery.i18n.properties.js"></script>
+<script type="text/javascript" src="scripts/lib/jit.js"></script>
+<script type="text/javascript" src='scripts/lib/common.js'></script>
+<script type="text/javascript" src="scripts/lib/jquery.mousewheel.js"></script>
+<script type="text/javascript" src="scripts/lib/jquery.jscrollpane.js"></script>
+<script type="text/javascript" src="scripts/lib/jquery.placeholder.js"></script>
+<script type="text/javascript" src="scripts/lib/jquery.sparkline.js"></script>
+<script type="text/javascript" src="scripts/lib/grid.locale-en.js"></script>
+<script type="text/javascript" src="scripts/lib/jquery.jqGrid.src.js"></script>
+<script type="text/javascript" src="scripts/lib/jquery.tablednd.js"></script>
+<script type="text/javascript" src="scripts/lib/jquery.timeago.js"></script>
+
+<script type="text/javascript" src='scripts/pulsescript/regionView.js'></script>
+<script type="text/javascript" src="scripts/pulsescript/PulseCallbacks.js"></script>
+<script type="text/javascript" src="scripts/pulsescript/PulseFunctions.js"></script>
+<script type="text/javascript" src='scripts/pulsescript/common.js'></script>
+<script type="text/javascript" src="scripts/lib/tooltip.js"></script>
+
+<STYLE type="text/css">
+	div.jspDrag {left: -3px;}
+</STYLE>
+</head>
+
+<body onload="return checkMedia();">
+
+<!-- popup (Riya) -->
+<div id="popupDiv" style="position:relative; display: none;"  data-role="widget" data-widgetid="ClusterSelectedRegionsMember" data-active ="yes" data-timeline="5000">
+
+	<!-- Large Block-->
+    <div class="content" style="background: none repeat scroll 0 0 #132634;">
+      <h3><span id="idMemberName">M1</span></h3>
+        
+        <div class="clearfix">
+          <div class="widthfull-100per left " style="padding-top:5px;">
+            <div class=" popupdetailsBlock">
+						  <div class="color-fff font-size15" id="regionMemberEntryCount">0</div>
+						  <span class="labeltext">Entry Count</span>
+					  </div>
+					  <div class="popupdetailsBlock">
+						  <div class="color-fff font-size15" id="regionMemberEntrySize">0</div>
+						  <span class="labeltext">Entry Size(MB)</span>
+					  </div>
+					  <div class="marginB5 popupdetailsBlock">
+						  <div class="color-fff font-size15" id="regionMemberAccessor">-</div>
+						  <span class="labeltext">Accessor</span>
+					  </div>
+          </div>
+				  <div class="left popupCanvasContentBlock" id="SmallBlock_3">
+				    <div style="border-top: 1px solid #4e6277; margin: 0px 10px 5px;"></div>
+                    <div class="marginB11 graphBlocksContent">
+                        <div class="left">
+                            <span class="left">Last 15 Minutes</span>
+                        </div>
+                        <div class="right marginL10">
+		                    <span data-prod-custom="pulse-reads-custom" class="left">Reads</span>
+		                    <span class="left marginL5 colorCodeBlockOnPopup diskReadsCode"></span>
+		                </div>
+		                <div class="right marginL10">
+		                    <span data-prod-custom="pulse-writes-custom" class="left">Writes</span>
+		                    <span class="left marginL5 colorCodeBlockOnPopup diskWritesCode"></span>
+		                </div>
+                    </div>
+                    <div class="clearfix">
+                        <div class="left" style="width:135px;">
+                            <div class="graphBlocksContent">
+                                <div class="color-fff font-size15">
+                                    <span id="memberMemoryReadsThroughput">&nbsp;</span>
+                                </div>
+                                <div class="width100Per">
+                                    <span class="">Reads</span>
+                                </div>
+                                <div class="left marginTop6 graphborder" style="background: #132634;">
+                                	<span class="left lineGraph" id="memberMemoryReadsTrend">&nbsp;</span>
+                            	</div>
+                            </div>
+                        </div>
+                        <div class="left" style="width:135px;">
+                            <div class="graphBlocksContent">
+                                <div class="color-fff font-size15">
+                                    <span id="memberMemoryWritesThroughput">&nbsp;</span>
+                                </div>
+                                <div class="width100Per ">
+                                    <span class="">Writes</span>
+                                </div>
+                                <div class="left marginTop6 graphborder" style="background: #132634;">
+                                	<span class="left lineGraph" id="memberMemoryWritesTrend">&nbsp;</span>
+                            	</div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="clearfix">
+                        <div class="left" style="width:135px;">
+                            <div class="graphBlocksContent">
+                                <div class="color-fff font-size15">
+                                    <span id="memberDiskReadsThroughput">&nbsp;</span>
+                                </div>
+                                <div class="width100Per">
+                                    <span class="">Disk Reads</span>
+                                </div>
+                                <div class="left marginTop6 graphborder" style="background: #132634;">
+                                	<span class="left lineGraph" id="memberDiskReadsTrend">&nbsp;</span>
+                            	</div>
+                            </div>
+                        </div>
+                        <div class="left" style="width:135px; border: 0px solid #889eb9;">
+                            <div class="graphBlocksContent" >
+                                <div class="color-fff font-size15">
+                                    <span id="memberDiskWritesThroughput">&nbsp;</span>
+                                </div>
+                                <div class="width100Per">
+                                    <span class="">Disk Writes</span>
+                                </div>
+                                <div class="left marginTop6 graphborder" style="background: #132634;">
+                                <span class="left lineGraph" id="memberDiskWritesTrend">&nbsp;</span>
+                            </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <!-- </div>
+            </div> -->
+        </div>
+    </div>
+</div>
+<!-- popup (Riya) -->
+
+<!-- Connection lost-->
+<div class="connectionLostMasterBlock hide" id="connectionStatusDiv" >
+<div class="connectionLostInnerBlock">
+    <label class="left">Connecting ...</label>
+    <div class="clear"></div>
+    <div id="connectionErrorMsgDiv" class="right"></div>
+</div>
+</div>
+<div id="canvasWidth">
+<!--Top Links-->
+  <div class="headerTopLinksMaster">
+    <div class="right">
+      <div class="left position-relative"><a href="#."class="left headerTopLinks aboutClicked-Off">About</a> 
+        <!-- About Dropdown-->
+        <div id="detailsAbout" class="aboutBlock display-none">
+          <div class="aboutDetailsBlock">
+            <div class="left widthfull-100per marginBottom30">
+              <div class="left"><img data-prod-custom="pulse-aboutimg-custom" src="images/about-geode.png">
+                <div>
+                 <div class="aboutVersionBlock left" id="pulseVersion"></div>
+                 <div class="left termsBlock">&nbsp;<a id="pulseVersionDetailsLink"  href="#dialog1" class="display-none" >Version Details</a></div>
+                </div>
+              </div>
+              <div data-prod-custom="pulse-about-custom" class="right aboutText">The Pulse tool monitors Apache Geode system in real time. It provides health information, detailed operational and configuration data, system alerts, throughput performance and statistics for system members and connected clients.</div>
+            </div>
+              <div class="left widthfull-100per copyright">
+                  <p>Apache Geode<br>
+                      Copyright 2016 The Apache Software Foundation.</p>
+                  <p>&nbsp;</p>
+                  <p>This product includes software developed at
+                      The Apache Software Foundation (http://www.apache.org/).</p>
+              </div>
+            </div>
+        </div>
+        <!-- Version Details Popup -->
+      </div>
+      <div class="left headerTopSeperator"></div>
+      <div class="left"><a data-prod-custom="pulse-help-custom"  target="_blank" href="http://geode.apache.org/docs/guide/tools_modules/pulse/chapter_overview.html" class="left headerTopLinks">Help</a></div>
+      <div class="left headerTopSeperator"></div>
+      <div class="left headerTopLinks welcomeLabelPRZero">Welcome</div>
+      <div class="left headerTopLinks textbold font-size12" id="userName"></div>
+      <div class="left headerTopSeperator"></div>
+      <div class="left"><a href="pulse/clusterLogout" class="left headerTopLinks">Sign Out</a></div>
+    </div>
+  </div> 
+  <!-- Header block-->
+  <header>
+    <div class="left">
+      <a href="#." class="left textbold HeaderLink HeaderLinkActive" id="clusterName"  onclick="openClusterDetail();"></a>
+    </div>
+    <div class="textbold right logoBlock"><img src="images/apache_geode_logo.png"/><a href="#.">[LOGO]</a></div>
+  </header>
+  <div class="clear"></div>
+  <div class="subHeader">
+			<ul>
+				<li><a href="#." class="active" onclick="openClusterDetail();">Cluster View</a></li>
+				<!-- Hide Data Browser tab for gemfirexd (Pulse-Cheetah Release) -->
+				<li><a href="#."  onclick="openDataBrowser();">Data Browser</a></li>
+				<!-- Hide Query Statistics tab for gemfire -->
+				<li id="subTabQueryStatistics"><a href="#." onclick="openQueryStatistics();">Query Statistics</a></li>
+			</ul>
+		<div class="clear"></div>
+		</div>
+  <!-- Middle block-->
+  <div class="left widthfull-100per"> 
+    <!--Top Right Block 1-->
+    <div class="right widthfull-100per marginTB10">
+    <!-- Tab -->
+    <div id="notificationsPanel" class="right marginL10 TabTopPanel position-relative" 
+    data-role="widget" data-widgetid="CluserAlertNotification" data-active ="yes" data-timeline="5000">
+    </div>
+      <div class="left position-relative membersNameTopMargin"><span class="member_txt" style="font-size: 14px;">Region Name&nbsp;:&nbsp;<span id="regionNameText"></span></span> </div>
+    </div>
+    <!--Middle Block 1-->
+    <div class="left leftBlockCanvas">
+      <div  data-role="widget" data-widgetid="ClusterSelectedRegion" data-active ="yes" data-timeline="5000">
+        <div class="dataViewTreeViewBlock"> 
+          <!-- Large Block-->
+          <div class="canvasBlockLargeDataView marginBR10-11 left">
+            <div class="left widthfull-100per canvasBlockInnerBlock">
+              <span data-prod-custom="pulse-rtSummaryBySize-custom" class="left marginL10 canvasHeading">Region Members</span>
+              <a id="btngridIcon" class="gridIcon " onClick="tabClusterGrid();"></a>
+              <a id="btnchartIcon" class="chartIconActive" onClick="tabTreeMap();" ></a>
+            </div>
+            <div class="left widthfull-100per canvasBlockInnerBlock regionHeading">
+              <!-- Search-->
+              <div class="left marginBottom6 marginL10 marginTop6">
+                <div class="searchBlockMaster">
+                  <input type="button" class="searchButton">
+                  <!-- <input type="text" placeholder="Search" 
+                    onkeyup="applyFilterOnClusterRegions();" class="searchBox"
+                    id="filterClusterRegionsBox"> -->
+                    <input type="text" placeholder="Search" 
+                    onkeyup="applyFilterOnRegionMembers();" class="searchBox"
+                    id="filterRegionMembersBox">
+                </div>
+              </div>
+            </div>
+            <div class="left canvasInnerBlock canvasBlockLargeContentDataView" id="LargeBlock_1"> 
+              <!--Grid  Block-->
+              <div class="graphBlocksPanelDataView left display-none" id="gridBlocks_Panel">
+                <div class="left widthfull-100per">
+                  <table id="memberList"></table>
+                </div>
+              </div>
+              <!--chart  Block-->
+              <div class="chartBlocksPanelDataView left" id="chartBlocks_Panel">
+                <div class="left widthfull-100per">
+                  <div class="clear"></div>
+                  <div class="treeViewGraphDataView position-relative">
+                    <div id="GraphTreeMap" style="width: 100%; height: 690px; overflow: hidden;"></div> 
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <!-- Right Block-->
+        <div class="rightBlockDataView"> 
+          <!-- Block 1-->
+          <div class="canvasBlockDataView marginB10 left">
+            <!-- <div class="selectedRegionLabel" id="regionName"></div> -->
+            <div class="selectedRegionLabel" id="regionPath"></div>
+            <div class="left width563 canvasBlockInnerBlock regionHeading">
+              <span class="left marginL10 canvasHeading">
+                <!-- <span data-prod-custom="pulse-regionstablePath-custom" class="left">Region Path:&nbsp;</span>
+                <label id="regionPath"></label> -->
+                <span data-prod-custom="pulse-regionstableType-custom" class="left">Region Type:&nbsp;</span>
+                <label id="regionType"></label>
+              </span>
+            </div>
+            <div class="left canvasInnerBlock canvasContentBlockDataView" id="SmallBlock_1"> 
+              <!-- block 1-->
+              <div class="graphBlocksContentDataView left">
+                <div class="detailsBlock-memberDataView">
+                  <div class="color-d2d5d7 font-size20" id="regionMembersText"></div>
+                  <span class="labeltext">Members</span></div>
+                <div class="detailsBlock-memberDataView">
+                  <div class="color-d2d5d7 font-size20" id="regionEmptyNodes"></div>
+                  <span class="labeltext">Empty Nodes</span></div>
+                <div class="detailsBlock-memberDataView">
+                  <div class="color-d2d5d7 font-size20"  id="regionEntryCountText"></div>
+                  <span class="labeltext" data-prod-custom="pulse-entrycount-custom">Entry Count</span></div>
+                <div class="detailsBlock-memberDataView">
+                  <div class="color-d2d5d7 font-size20" id="regionDiskUsage"></div>
+                  <span class="labeltext">Disk Usage</span></div>
+                <div class="detailsBlock-memberDataView">
+                  <div class="color-d2d5d7 font-size20" id="regionPersistence"></div>
+                  <span class="labeltext">Persistence</span></div>
+                <!-- <div class="detailsBlock-memberDataView">
+                  <div class="color-d2d5d7 font-size20" id="regionIsEnableOffHeapMemory"></div>
+                  <span class="labeltext">Off-Heap</span></div>
+                <div class="detailsBlock-memberDataView">
+                  <div class="color-d2d5d7 font-size20" id="regionIsHdfsWriteOnly"></div>
+                  <span class="labeltext">HDFS Write Only</span></div> -->
+              </div>
+              <div class="clear"></div>
+              <div class="horizontalSeparator"></div>
+              <div class="left widthfull-100per">
+                <div class="left dataViewLeftBlock"> 
+                  <!-- B1 -->
+                  <div class="left display-block widthfull-100per marginTop10" id="memoryUsageDiv">
+                    <div class="pointGridHeading border-topZero">
+                      <span data-prod-custom="pulse-regionMemoryUsage-custom" class="pointHeadingPadding textUpper">Memory Usage</span>
+                    </div>
+                    <div class="pointGridDataView">
+                      <div class="left dataViewUsedMasterBlock">
+                        <div class="left widthfull-100per">
+                          <div class="usageDataView firstPaddingLeftZero left">
+                            <div class="color-d2d5d7 font-size20">
+                              <span id="memoryUsed">0</span>
+                              <span class="font-size13 paddingL5" id="memoryUsedMBSpan">MB</span>
+                            </div>
+                            <span class="labeltext">Used</span> </div>
+                          <div class="usageDataView lastPaddingLeftZero right">
+                            <div class="color-d2d5d7 font-size20">
+                              <span id="totalMemory">0</span>
+                              <span class="font-size13 paddingL5">MB</span>
+                            </div>
+                            <span class="labeltext">Total</span> </div>
+                        </div>
+                        <div class="dataUsedProgressbar">
+                          <div class="widthfull-100per">
+                            <div class="memoryUsageChart" id="memoryUsage"></div>
+                            <div class="memoryUsageValue">
+                              <span id="memoryUsageVal"></span>
+                              <span class="PerRightMargin">%</span>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                  <div class="clear"></div>
+                  <div class="horizontalSeparator"></div>
+                  <!--B2-->
+                  <div class=" border-topZero">
+                        <span data-prod-custom="pulse-regionMemoryReadsWrites-custom" class="pointHeadingPadding textUpper">In-Memory Read/Write</span>
+                  </div>
+	                <div class="dataViewGraphMaster marginzero width100Per">
+		                  <div class="left display-block widthfull-100per">
+		                    <div class="left widthfull-100per">
+		                      <div class="left dataViewUsedMasterBlock">
+		                        <div class="graphBlocksContent marginB11 ">
+		                          <div class="left">
+		                            <span class="left">Last 15 Minutes</span>
+		                          </div>
+		                          <div class="right marginL10">
+		                            <span data-prod-custom="pulse-reads-custom" class="left">Reads</span>
+		                            <span class="left marginL10 colorCodeBlock diskReadsCode"></span>
+		                          </div>
+		                          <div class="right marginL10">
+		                            <span data-prod-custom="pulse-writes-custom" class="left">Writes</span>
+		                            <span class="left marginL10 colorCodeBlock diskWritesCode"></span>
+		                          </div>
+		                        </div>
+		                        <div class="">
+		                         <div class="graphBlocksContent">
+		                            <div class="color-d2d5d7 font-size20" id="currentReadsPerSec"></div>
+		                            <span class="labeltext">Reads</span>
+		                         </div>
+		                          <div class="widthfull-100per">
+		                            <div class="dataViewGraph"><span class="left lineGraph" id="readsPerSecTrend"></span></div>
+		                          </div>
+		                        </div>
+		                      </div>
+		                    </div>
+		                  </div>
+		                  <div class="left display-block widthfull-100per">
+		                    <div class="left widthfull-100per">
+		                      <div class="left dataViewUsedMasterBlock marginTop4">
+		                        <div class="">
+		                         <div class="graphBlocksContent">
+		                            <div class="color-d2d5d7 font-size20" id="currentWritesPerSec"></div>
+		                            <span class="labeltext">Writes</span>
+		                         </div>
+		                          <div class="widthfull-100per">
+		                            <div class="dataViewGraph"><span class="left lineGraph" id="writesPerSecTrend"></span></div>
+		                          </div>
+		                        </div>
+		                      </div>
+		                    </div>
+		                  </div>
+	                </div>
+                </div>
+                <div class="left dataViewRightBlock marginL10">
+                  <!--B3-->
+                  <div class="left display-block widthfull-100per margin marginTop10" id="regionMembersWidgetContainer">
+                    <!-- <div class="pointGridHeading border-topZero"><span data-prod-custom="pulse-regionstableMembers-custom" class="pointHeadingPadding textUpper">Region Members</span></div> -->
+                    <div>
+                      <div class="left regionMembersMasterBlock">
+                        <!-- <div class="left widthfull-100per"> 
+                          Search
+                          <div class="left marginB10 marginL10">
+                           <div class="searchBlockMaster">
+                            <input type="button" class="searchButton">
+                            <input type="text" placeholder="Search" onkeyup="applyFilterOnMembersList();" class="searchBox" id="filterMembersListBox">
+                          </div>
+                          </div>
+                          <div class="clear"></div>
+                           <div class="left regionMembersSearchBlock">
+                           <div id="memberNames" class="memberNamescls"></div>
+                          </div>
+                        </div> -->
+                      </div>
+                    </div>
+                  </div>
+                  <div class="clear"></div>
+                  <div class="horizontalSeparator"></div>
+                  <!--B4-->
+                  <div class=" border-topZero">
+                        <span data-prod-custom="pulse-regionDiskReadsWrites-custom" class="pointHeadingPadding textUpper">Disk Read/Write</span>
+                  </div>
+                  <div class="dataViewGraphMaster marginzero width100Per">
+                      <div class="left display-block widthfull-100per">
+                        <div class="left widthfull-100per">
+                          <div class="left dataViewUsedMasterBlock ">
+                            <div class="graphBlocksContent marginB11 ">
+                              <div class="left">
+                                <span class="left">Last 15 Minutes</span>
+                              </div>
+                              <div class="right marginL10">
+                                <span data-prod-custom="pulse-reads-custom" class="left">Reads</span>
+                                <span class="left marginL10 colorCodeBlock diskReadsCode"></span>
+                              </div>
+                              <div class="right marginL10">
+                                <span data-prod-custom="pulse-writes-custom" class="left">Writes</span>
+                                <span class="left marginL10 colorCodeBlock diskWritesCode"></span>
+                              </div>
+                            </div>
+                            <div class="">
+                             <div class="graphBlocksContent">
+                                <div class="color-d2d5d7 font-size20" id="currentDiskReadsPerSec"></div>
+                                <span class="labeltext">Reads</span>
+                             </div>
+                              <div class="widthfull-100per">
+                                <div class="dataViewGraph"><span class="left lineGraph" id="diskReadsPerSecTrend"></span></div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                      <div class="left display-block widthfull-100per">
+                        <div class="left widthfull-100per">
+                          <div class="left dataViewUsedMasterBlock marginTop4">
+                            <div class="">
+                             <div class="graphBlocksContent">
+                                <div class="color-d2d5d7 font-size20" id="currentDiskWritesPerSec"></div>
+                                <span class="labeltext">Writes</span>
+                             </div>
+                              <div class="widthfull-100per">
+                                <div class="dataViewGraph"><span class="left lineGraph" id="diskWritesPerSecTrend"></span></div>
+                              </div>
+                            </div>
+                          </div>
+                        </div>
+                      </div>
+                  </div>
+                 </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="clear"></div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+<!-- Placeholder--> 
+<script>
+$('input[placeholder], textarea[placeholder]').placeholder();
+</script>
+<!--Popups Block-->
+<div id="boxes"> 
+  <!-- Version Details popup-->
+ <div id="dialog1" class="window width345" data-role="widget" data-widgetid="PulseVersionDetails" data-active ="yes" data-timeline="5000">
+    <div class="popup_heading"><span>Version Details</span><a href="#" class="closePopup">&nbsp;</a></div>
+    <div class="popup_contentBlock">
+      <div class="popup-innerblock">
+        <ul class="widthfull-100per left">
+          <li class="left widthfull-100per">
+            <label class="width-40 display-inline-block">Pulse Version:</label>
+            <label class="width-58 display-inline-block" id="pulseVer"></label>
+          </li>
+          <li class="left widthfull-100per">
+            <label class="width-40 display-inline-block">Build Id:</label>
+            <label class="width-58 display-inline-block" id="buildId"></label>
+          </li>
+          <li class="left widthfull-100per">
+            <label class="width-40 display-inline-block">Build Date:</label>
+            <label class="width-58 display-inline-block" id="buildDate"></label>
+          </li>
+          <li class="left widthfull-100per">
+            <label class="width-40 display-inline-block">Source Date:</label>
+            <label class="width-58 display-inline-block" id="sourceDate"></label>
+          </li>
+          <li class="left widthfull-100per">
+            <label class="width-40 display-inline-block">Source Revision:</label>
+            <label class="width-58 display-inline-block" id="sourceRevision"></label>
+          </li>
+          <li class="left widthfull-100per">
+            <label class="width-40 display-inline-block">Source Repository:</label>
+            <label class="width-58 display-inline-block" id="sourceRepository"></label>
+          </li>
+        </ul>
+        <div class="clear"></div>
+      </div>
+    </div>
+  </div>
+  <!-- Mask to cover the whole screen -->
+  <div id="mask"></div>
+</div>
+<div id="tooltip" class="tooltip"></div>
+<div id="region_tooltip" class="tooltip"></div>
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d798c34/geode-web-api/src/main/webapp/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/geode-web-api/src/main/webapp/META-INF/NOTICE b/geode-web-api/src/main/webapp/META-INF/NOTICE
index e09ef37..21082b6 100644
--- a/geode-web-api/src/main/webapp/META-INF/NOTICE
+++ b/geode-web-api/src/main/webapp/META-INF/NOTICE
@@ -1,4 +1,4 @@
-Apache Geode (incubating) 
+Apache Geode
 Copyright 2016 The Apache Software Foundation.
 
 This product includes software developed at

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d798c34/geode-web/src/main/webapp/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/geode-web/src/main/webapp/META-INF/NOTICE b/geode-web/src/main/webapp/META-INF/NOTICE
index f89291d..8c6e1d7 100644
--- a/geode-web/src/main/webapp/META-INF/NOTICE
+++ b/geode-web/src/main/webapp/META-INF/NOTICE
@@ -1,4 +1,4 @@
-Apache Geode (incubating) 
+Apache Geode
 Copyright 2016 The Apache Software Foundation.
 
 This product includes software developed at

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d798c34/gradle.properties
----------------------------------------------------------------------
diff --git a/gradle.properties b/gradle.properties
index f16326f..164d482 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -36,7 +36,7 @@ releaseType = -SNAPSHOT
 # `gradle -PbuildId=N ...` where N is an artibitrary string.
 buildId = 0
 
-productName = Apache Geode (incubating)
+productName = Apache Geode
 productOrg = Apache Software Foundation (ASF)
 
 org.gradle.daemon = true

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d798c34/gradle/publish.gradle
----------------------------------------------------------------------
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
index 8a579c2..dbb5919 100644
--- a/gradle/publish.gradle
+++ b/gradle/publish.gradle
@@ -73,9 +73,9 @@ subprojects {
     }
 
     project {
-      name 'Apache Geode (incubating)'
-      description 'Apache Geode (incubating) provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing'
-      url 'http://geode.incubator.apache.org'
+      name 'Apache Geode'
+      description 'Apache Geode provides a database-like consistency model, reliable transaction processing and a shared-nothing architecture to maintain very low latency performance with high concurrency processing'
+      url 'http://geode.apache.org'
   
       scm {
         url 'https://git-wip-us.apache.org/repos/asf?p=incubator-geode.git;a=tree'

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d798c34/gradle/sonar.gradle
----------------------------------------------------------------------
diff --git a/gradle/sonar.gradle b/gradle/sonar.gradle
index 45bb772..32f1883 100644
--- a/gradle/sonar.gradle
+++ b/gradle/sonar.gradle
@@ -26,7 +26,7 @@ sonarqube {
     property "sonar.scm.provider", "git"
     property "sonar.projectName", "Apache Geode"
     property "sonar.projectVersion", version
-    property "sonar.projectDescription", "Apache Geode (incubating)"
+    property "sonar.projectDescription", "Apache Geode"
   }
 }
 


[15/31] incubator-geode git commit: GEODE-2159 add serialVersionUIDs to exception classes not having them

Posted by ab...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0cdb66a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt
index 7ab7c4e..3f92148 100644
--- a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt
+++ b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedSerializables.txt
@@ -1,843 +1,843 @@
-org/apache/geode/CancelException,true,3215578659523282642
-org/apache/geode/CopyException,true,-1143711608610323585
-org/apache/geode/DeltaSerializationException,false
-org/apache/geode/ForcedDisconnectException,true,4977003259880566257
-org/apache/geode/GemFireCacheException,true,-2844020916351682908
-org/apache/geode/GemFireCheckedException,false
-org/apache/geode/GemFireConfigException,true,7791789785331120991
-org/apache/geode/GemFireException,true,-6972360779789402295
-org/apache/geode/GemFireIOException,true,5694009444435264497
-org/apache/geode/GemFireRethrowable,true,8349791552668922571
-org/apache/geode/IncompatibleSystemException,true,-6852188720149734350
-org/apache/geode/InternalGemFireError,true,6390043490679349593
-org/apache/geode/InternalGemFireException,true,-6912843691545178619
-org/apache/geode/InvalidDeltaException,false
-org/apache/geode/InvalidValueException,true,6186767885369527709
-org/apache/geode/InvalidVersionException,true,6342040462194322698
-org/apache/geode/LicenseException,true,-1178557127300465801
-org/apache/geode/NoSystemException,true,-101890149467219630
-org/apache/geode/OutOfOffHeapMemoryException,true,4111959438738739010
-org/apache/geode/SerializationException,true,7783018024920098997
-org/apache/geode/SystemConnectException,true,-7378174428634468238
-org/apache/geode/SystemIsRunningException,true,3516268055878767189
-org/apache/geode/ThreadInterruptedException,true,6169940883541267514
-org/apache/geode/ToDataException,true,-2329606027453879918
-org/apache/geode/UncreatedSystemException,true,5424354567878425435
-org/apache/geode/UnmodifiableException,true,-1043243260052395455
-org/apache/geode/UnstartedSystemException,true,-4285897556527521788
-org/apache/geode/admin/AdminException,true,879398950879472021
-org/apache/geode/admin/AdminXmlException,true,-6848726449157550169
-org/apache/geode/admin/AlertLevel,true,-4752438966587392126,ordinal:int
-org/apache/geode/admin/CacheDoesNotExistException,true,-1639933911265729978
-org/apache/geode/admin/GemFireHealth$Health,true,3039539430412151801,healthString:java/lang/String
-org/apache/geode/admin/GemFireMemberStatus,true,3389997790525991310,_bindAddress:java/lang/String,_clientHealthStats:java/util/Map,_clientHostNames:java/util/Map,_clientQueueSizes:java/util/Map,_connectedClients:java/util/Set,_connectedIncomingGateways:java/util/Map,_connectedPeers:java/util/Set,_connectedServers:java/util/Set,_freeHeapSize:long,_gatewayHubStatus:java/lang/Object,_gatewayQueueSizes:java/util/Map,_hostAddress:java/net/InetAddress,_isClient:boolean,_isConnected:boolean,_isGatewayHub:boolean,_isLocator:boolean,_isPrimaryGatewayHub:boolean,_isServer:boolean,_locators:java/lang/String,_maximumHeapSize:long,_mcastAddress:java/net/InetAddress,_mcastPort:int,_memberId:java/io/Serializable,_memberName:java/lang/String,_outgoingGateways:java/util/Map,_regionStatuses:java/util/Map,_serverPort:int,_unconnectedServers:java/util/Set,upTime:long
-org/apache/geode/admin/OperationCancelledException,true,5474068770227602546
-org/apache/geode/admin/RegionNotFoundException,true,1758668137691463909
-org/apache/geode/admin/RuntimeAdminException,true,-7512771113818634005
-org/apache/geode/admin/SystemMemberType,true,3284366994485749302,ordinal:int
-org/apache/geode/admin/UnmodifiableConfigurationException,true,-7653547392992060646
-org/apache/geode/admin/internal/BackupStatusImpl,true,3704162840296921840,backedUpDiskStores:java/util/Map,offlineDiskStores:java/util/Set
-org/apache/geode/admin/internal/CacheHealthConfigImpl,false,maxEventQueueSize:long,maxLoadTime:long,maxNetSearchTime:long,minHitRatio:double
-org/apache/geode/admin/internal/GemFireHealthConfigImpl,true,-6797673296902808018,hostName:java/lang/String,interval:int
-org/apache/geode/admin/internal/MemberHealthConfigImpl,true,3966032573073580490,maxMessageQueueSize:long,maxReplyTimeouts:long,maxRetransmissionRatio:double,maxVMProcessSize:long
-org/apache/geode/admin/internal/StatisticImpl,true,3899296873901634399,internalStat:org/apache/geode/internal/admin/Stat
-org/apache/geode/admin/jmx/internal/AgentImpl$StartupException,true,6614145962199330348
-org/apache/geode/admin/jmx/internal/AgentLauncher$Status,true,-7758402454664266174,baseName:java/lang/String,exception:java/lang/Throwable,msg:java/lang/String,pid:int,state:int
-org/apache/geode/admin/jmx/internal/ConfigAttributeInfo,true,-1918437700841687078,config:org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl
-org/apache/geode/admin/jmx/internal/ConfigurationParameterJmxImpl,true,-7822171853906772375,deserialized:boolean
-org/apache/geode/admin/jmx/internal/ConnectionNotificationFilterImpl,true,1
-org/apache/geode/admin/jmx/internal/DynamicManagedBean,true,4051924500150228160
-org/apache/geode/admin/jmx/internal/GemFireHealthConfigJmxImpl,true,1482719647163239953,delegate:org/apache/geode/admin/GemFireHealthConfig,health:org/apache/geode/admin/GemFireHealth,mbeanName:java/lang/String,modelMBean:javax/management/modelmbean/ModelMBean,objectName:javax/management/ObjectName
-org/apache/geode/admin/jmx/internal/ManagedResourceType,true,3752874768667480449,ordinal:int
-org/apache/geode/admin/jmx/internal/RefreshNotificationType,true,4376763592395613794,ordinal:int
-org/apache/geode/admin/jmx/internal/StatisticAttributeInfo,true,28022387514935560,stat:org/apache/geode/admin/Statistic
-org/apache/geode/cache/AttributesFactory$RegionAttributesImpl,true,-3663000883567530374,asyncEventQueueIds:java/util/Set,cacheListeners:java/util/ArrayList,cacheLoader:org/apache/geode/cache/CacheLoader,cacheWriter:org/apache/geode/cache/CacheWriter,compressor:org/apache/geode/compression/Compressor,concurrencyChecksEnabled:boolean,concurrencyLevel:int,customEntryIdleTimeout:org/apache/geode/cache/CustomExpiry,customEntryTimeToLive:org/apache/geode/cache/CustomExpiry,dataPolicy:org/apache/geode/cache/DataPolicy,diskDirs:java/io/File[],diskSizes:int[],diskStoreName:java/lang/String,diskSynchronous:boolean,diskWriteAttributes:org/apache/geode/cache/DiskWriteAttributes,earlyAck:boolean,enableAsyncConflation:boolean,enableSubscriptionConflation:boolean,entryIdleTimeout:int,entryIdleTimeoutExpirationAction:org/apache/geode/cache/ExpirationAction,entryTimeToLive:int,entryTimeToLiveExpirationAction:org/apache/geode/cache/ExpirationAction,evictionAttributes:org/apache/geode/internal/cache/E
 victionAttributesImpl,gatewaySenderIds:java/util/Set,ignoreJTA:boolean,indexMaintenanceSynchronous:boolean,initialCapacity:int,isBucketRegion:boolean,isCloningEnabled:boolean,isLockGrantor:boolean,keyConstraint:java/lang/Class,loadFactor:float,membershipAttributes:org/apache/geode/cache/MembershipAttributes,multicastEnabled:boolean,offHeap:boolean,partitionAttributes:org/apache/geode/cache/PartitionAttributes,poolName:java/lang/String,publisher:boolean,regionIdleTimeout:int,regionIdleTimeoutExpirationAction:org/apache/geode/cache/ExpirationAction,regionTimeToLive:int,regionTimeToLiveExpirationAction:org/apache/geode/cache/ExpirationAction,scope:org/apache/geode/cache/Scope,statisticsEnabled:boolean,subscriptionAttributes:org/apache/geode/cache/SubscriptionAttributes,valueConstraint:java/lang/Class
-org/apache/geode/cache/CacheClosedException,true,-6479561694497811262
-org/apache/geode/cache/CacheException,true,7699432887938858940
-org/apache/geode/cache/CacheExistsException,true,4090002289325418100
-org/apache/geode/cache/CacheLoaderException,true,-3383072059406642140
-org/apache/geode/cache/CacheRuntimeException,true,6750107573015376688
-org/apache/geode/cache/CacheWriterException,true,-2872212342970454458
-org/apache/geode/cache/CacheXmlException,true,-4343870964883131754
-org/apache/geode/cache/CommitConflictException,true,-1491184174802596675
-org/apache/geode/cache/CommitDistributionException,true,-3517820638706581823,regionDistributionExceptions:java/util/Set
-org/apache/geode/cache/CommitIncompleteException,true,1017741483744420800
-org/apache/geode/cache/DataPolicy,true,2095573273889467233,ordinal:byte
-org/apache/geode/cache/DiskAccessException,true,5799100281147167888
-org/apache/geode/cache/DiskWriteAttributesFactory,true,-4077746249663727235,props:java/util/Properties
-org/apache/geode/cache/DuplicatePrimaryPartitionException,true,1
-org/apache/geode/cache/EntryDestroyedException,true,831865939772672542
-org/apache/geode/cache/EntryExistsException,true,2925082493103537925,oldValue:java/lang/Object
-org/apache/geode/cache/EntryNotFoundException,true,-2404101631744605659
-org/apache/geode/cache/EntryNotFoundInRegion,true,5572550909947420405
-org/apache/geode/cache/EvictionAction,true,-98840597493242980
-org/apache/geode/cache/EvictionAlgorithm,true,5778669432033106789
-org/apache/geode/cache/ExpirationAction,true,658925707882047900,ordinal:int
-org/apache/geode/cache/FailedSynchronizationException,true,-6225053492344591496
-org/apache/geode/cache/GatewayConfigurationException,false
-org/apache/geode/cache/GatewayException,true,8090143153569084886
-org/apache/geode/cache/IncompatibleVersionException,true,668812986092856749
-org/apache/geode/cache/InterestPolicy,true,1567179436331385968,ordinal:byte
-org/apache/geode/cache/InterestResultPolicy,true,-4993765891973030160,ordinal:byte
-org/apache/geode/cache/LossAction,true,-832035480397447797,ordinal:byte
-org/apache/geode/cache/LowMemoryException,true,6585765466722883168,critMems:java/util/Set
-org/apache/geode/cache/MirrorType,true,-6632651349646672540,ordinal:int
-org/apache/geode/cache/NoQueueServersAvailableException,true,8484086019155762365
-org/apache/geode/cache/NoSubscriptionServersAvailableException,true,8484086019155762365
-org/apache/geode/cache/Operation,true,-7521751729852504238,ordinal:byte
-org/apache/geode/cache/OperationAbortedException,true,-8293166225026556949
-org/apache/geode/cache/PartitionedRegionDistributionException,true,-3004093739855972548
-org/apache/geode/cache/PartitionedRegionStorageException,true,5905463619475329732
-org/apache/geode/cache/RegionAccessException,true,3142958723089038406
-org/apache/geode/cache/RegionDestroyedException,true,319804842308010754,regionFullPath:java/lang/String
-org/apache/geode/cache/RegionDistributionException,true,-5950359426786805646
-org/apache/geode/cache/RegionExistsException,true,-5643670216230359426
-org/apache/geode/cache/RegionReinitializedException,true,8532904304288670752
-org/apache/geode/cache/RegionRoleException,false,regionFullPath:java/lang/String
-org/apache/geode/cache/RegionShortcut,false
-org/apache/geode/cache/RemoteTransactionException,true,-2217135580436381984
-org/apache/geode/cache/ResourceException,false
-org/apache/geode/cache/ResumptionAction,true,6632254151314915610,ordinal:byte
-org/apache/geode/cache/RoleException,true,-7521056108445887394
-org/apache/geode/cache/Scope,true,5534399159504301602,ordinal:int
-org/apache/geode/cache/StatisticsDisabledException,true,-2987721454129719551
-org/apache/geode/cache/SynchronizationCommitConflictException,true,2619806460255259492
-org/apache/geode/cache/TimeoutException,true,-6260761691185737442
-org/apache/geode/cache/TransactionDataNodeHasDepartedException,true,-2217135580436381984
-org/apache/geode/cache/TransactionDataNotColocatedException,true,-2217135580436381984
-org/apache/geode/cache/TransactionDataRebalancedException,true,-2217135580436381984
-org/apache/geode/cache/TransactionException,true,-8400774340264221993
-org/apache/geode/cache/TransactionInDoubtException,true,4895453685211922512
-org/apache/geode/cache/TransactionWriterException,true,-5557392877576634835
-org/apache/geode/cache/UnsupportedOperationInTransactionException,false
-org/apache/geode/cache/UnsupportedVersionException,true,1152280300663399399
-org/apache/geode/cache/VersionException,false
-org/apache/geode/cache/client/AllConnectionsInUseException,true,7304243507881787071
-org/apache/geode/cache/client/ClientNotReadyException,true,-315765802919271588
-org/apache/geode/cache/client/ClientRegionShortcut,false
-org/apache/geode/cache/client/NoAvailableLocatorsException,true,-8212446737778234890
-org/apache/geode/cache/client/NoAvailableServersException,true,-8212446737778234890
-org/apache/geode/cache/client/ServerConnectivityException,true,-5205644901262051330
-org/apache/geode/cache/client/ServerOperationException,true,-3106323103325266219
-org/apache/geode/cache/client/ServerRefusedConnectionException,true,1794959225832197946
-org/apache/geode/cache/client/SubscriptionNotEnabledException,true,-8212446737778234890
-org/apache/geode/cache/client/internal/ContainsKeyOp$MODE,false
-org/apache/geode/cache/client/internal/TXSynchronizationOp$CompletionType,false
-org/apache/geode/cache/client/internal/pooling/ConnectionDestroyedException,true,-6918516787578041316
-org/apache/geode/cache/execute/EmptyRegionFunctionException,true,1
-org/apache/geode/cache/execute/FunctionAdapter,false
-org/apache/geode/cache/execute/FunctionException,true,4893171227542647452
-org/apache/geode/cache/execute/FunctionInvocationTargetException,true,1,id:org/apache/geode/distributed/DistributedMember
-org/apache/geode/cache/operations/OperationContext$OperationCode,false
-org/apache/geode/cache/partition/PartitionNotAvailableException,true,1
-org/apache/geode/cache/persistence/ConflictingPersistentDataException,true,-2629287782021455875
-org/apache/geode/cache/persistence/PartitionOfflineException,true,-6471045959318795870,offlineMembers:java/util/Set
-org/apache/geode/cache/persistence/PersistentReplicatesOfflineException,true,6209644027346609970
-org/apache/geode/cache/persistence/RevokeFailedException,true,-2629287782021455875
-org/apache/geode/cache/persistence/RevokedPersistentDataException,true,0
-org/apache/geode/cache/query/AmbiguousNameException,true,5635771575414148564
-org/apache/geode/cache/query/CqClosedException,true,-3793993436374495840
-org/apache/geode/cache/query/CqException,true,-5905461592471139171
-org/apache/geode/cache/query/CqExistsException,true,-4805225282677926623
-org/apache/geode/cache/query/FunctionDomainException,true,1198115662851760423
-org/apache/geode/cache/query/IndexCreationException,true,-2218359458870240534
-org/apache/geode/cache/query/IndexExistsException,true,-168312863985932144
-org/apache/geode/cache/query/IndexInvalidException,true,3285601274732772770
-org/apache/geode/cache/query/IndexMaintenanceException,true,3326023943226474039
-org/apache/geode/cache/query/IndexNameConflictException,true,7047969935188485334
-org/apache/geode/cache/query/MultiIndexCreationException,true,6312081720315894780,exceptionsMap:java/util/Map
-org/apache/geode/cache/query/NameNotFoundException,true,4827972941932684358
-org/apache/geode/cache/query/NameResolutionException,true,-7409771357534316562
-org/apache/geode/cache/query/ParameterCountInvalidException,true,-3249156440150789428
-org/apache/geode/cache/query/QueryException,true,7100830250939955452
-org/apache/geode/cache/query/QueryExecutionLowMemoryException,false
-org/apache/geode/cache/query/QueryExecutionTimeoutException,false
-org/apache/geode/cache/query/QueryInvalidException,true,2849255122285215114
-org/apache/geode/cache/query/QueryInvocationTargetException,true,2978208305701582906
-org/apache/geode/cache/query/RegionNotFoundException,true,592495934010222373
-org/apache/geode/cache/query/TypeMismatchException,true,4205901708655503775
-org/apache/geode/cache/query/internal/CompiledSelect$NullIteratorException,false
-org/apache/geode/cache/query/internal/CompiledSortCriterion$1,false,this$0:org/apache/geode/cache/query/internal/CompiledSortCriterion
-org/apache/geode/cache/query/internal/ObjectIntHashMap,true,7718697444988416372,hashingStrategy:org/apache/geode/cache/query/internal/HashingStrategy,loadFactor:float,threshold:int
-org/apache/geode/cache/query/internal/ObjectIntHashMap$IntHashMapStrategy,false,this$0:org/apache/geode/cache/query/internal/ObjectIntHashMap
-org/apache/geode/cache/query/internal/QueryExecutionCanceledException,false
-org/apache/geode/cache/query/internal/StructBag$ObjectArrayHashingStrategy,false
-org/apache/geode/cache/query/internal/index/IMQException,true,-5012914292321850775
-org/apache/geode/cache/query/internal/index/IndexConcurrentHashSet,false
-org/apache/geode/cache/query/internal/parse/ASTAggregateFunc,true,8713004765228379685,aggFunctionType:int,distinctOnly:boolean
-org/apache/geode/cache/query/internal/parse/ASTAnd,true,7100190044926605881
-org/apache/geode/cache/query/internal/parse/ASTCombination,true,-5390937242819850292
-org/apache/geode/cache/query/internal/parse/ASTCompareOp,true,2764710765423856496
-org/apache/geode/cache/query/internal/parse/ASTConstruction,true,6647545354866647845
-org/apache/geode/cache/query/internal/parse/ASTConversionExpr,true,8713000632283704611
-org/apache/geode/cache/query/internal/parse/ASTDummy,true,-5390937473819850292
-org/apache/geode/cache/query/internal/parse/ASTGroupBy,true,2262777181888775078
-org/apache/geode/cache/query/internal/parse/ASTHint,false
-org/apache/geode/cache/query/internal/parse/ASTHintIdentifier,false
-org/apache/geode/cache/query/internal/parse/ASTIdentifier,true,-7534067808767107958
-org/apache/geode/cache/query/internal/parse/ASTImport,true,6002078657881181949
-org/apache/geode/cache/query/internal/parse/ASTIn,true,-7688132343283983119
-org/apache/geode/cache/query/internal/parse/ASTIteratorDef,true,-736956634497535951
-org/apache/geode/cache/query/internal/parse/ASTLike,true,1171234838254852463
-org/apache/geode/cache/query/internal/parse/ASTLimit,false
-org/apache/geode/cache/query/internal/parse/ASTLiteral,true,8374021603235812835
-org/apache/geode/cache/query/internal/parse/ASTMethodInvocation,true,-3158542132262327470,implicitReceiver:boolean
-org/apache/geode/cache/query/internal/parse/ASTOr,true,5770135811089855867
-org/apache/geode/cache/query/internal/parse/ASTOrderBy,true,2262777181888775078
-org/apache/geode/cache/query/internal/parse/ASTParameter,true,2964948528198383319
-org/apache/geode/cache/query/internal/parse/ASTPostfix,true,1100525641797867500
-org/apache/geode/cache/query/internal/parse/ASTProjection,true,-1464858491766486290
-org/apache/geode/cache/query/internal/parse/ASTRegionPath,true,-4326820914154387472
-org/apache/geode/cache/query/internal/parse/ASTSelect,true,1389351692304773456
-org/apache/geode/cache/query/internal/parse/ASTSortCriterion,true,-3654854374157753771
-org/apache/geode/cache/query/internal/parse/ASTTrace,false
-org/apache/geode/cache/query/internal/parse/ASTType,true,6155481284905422722,javaType:org/apache/geode/cache/query/types/ObjectType,typeName:java/lang/String
-org/apache/geode/cache/query/internal/parse/ASTTypeCast,true,-6368577668325776355
-org/apache/geode/cache/query/internal/parse/ASTUnary,true,-3906821390970046083
-org/apache/geode/cache/query/internal/parse/ASTUndefinedExpr,true,-4629351288894274041
-org/apache/geode/cache/query/internal/parse/ASTUnsupported,true,-1192307218047393827
-org/apache/geode/cache/query/internal/parse/GemFireAST,true,779964802274305208
-org/apache/geode/cache/query/internal/utils/PDXUtils$1,false
-org/apache/geode/cache/query/internal/utils/PDXUtils$2,false
-org/apache/geode/cache/snapshot/SnapshotOptions$SnapshotFormat,false
-org/apache/geode/cache/util/Gateway$OrderPolicy,false
-org/apache/geode/cache/wan/GatewaySender$OrderPolicy,false
-org/apache/geode/compression/CompressionException,true,4118639654597191235
-org/apache/geode/compression/SnappyCompressor,true,496609875302446099
-org/apache/geode/distributed/AbstractLauncher$Status,false,description:java/lang/String
-org/apache/geode/distributed/DistributedSystemDisconnectedException,true,-2484849299224086250
-org/apache/geode/distributed/FutureCancelledException,true,-4599338440381989844
-org/apache/geode/distributed/GatewayCancelledException,true,-1444310105860938512
-org/apache/geode/distributed/LeaseExpiredException,true,6216142987243536540
-org/apache/geode/distributed/LockNotHeldException,true,3827860179805916215
-org/apache/geode/distributed/LockServiceDestroyedException,true,7528711924957352636
-org/apache/geode/distributed/OplogCancelledException,true,106566926222526806
-org/apache/geode/distributed/PoolCancelledException,true,-4562742255812266767
-org/apache/geode/distributed/TXManagerCancelledException,true,3902857360354568446
-org/apache/geode/distributed/internal/AtomicLongWithTerminalState,true,-6130409343386576390
-org/apache/geode/distributed/internal/DistributionConfigSnapshot,true,7445728132965092798,modifiable:java/util/HashSet
-org/apache/geode/distributed/internal/DistributionException,true,9039055444056269504
-org/apache/geode/distributed/internal/FlowControlParams,true,7322447678546893647,byteAllowance:int,rechargeBlockMs:int,rechargeThreshold:float
-org/apache/geode/distributed/internal/HighPriorityAckedMessage$operationType,false
-org/apache/geode/distributed/internal/OverflowQueueWithDMStats,true,-1846248853494394996,stats:org/apache/geode/distributed/internal/QueueStatHelper
-org/apache/geode/distributed/internal/ReliableReplyException,true,472566058783450438
-org/apache/geode/distributed/internal/ReplyException,true,-4410839793809166071
-org/apache/geode/distributed/internal/ResourceEvent,false
-org/apache/geode/distributed/internal/RuntimeDistributionConfigImpl,true,-805637520096606113
-org/apache/geode/distributed/internal/ThrottlingMemLinkedQueueWithDMStats,true,5425180246954573433,maxMemSize:int,maxSize:int,memSize:int,startThrottleMemSize:int,startThrottleSize:int
-org/apache/geode/distributed/internal/deadlock/DLockDependencyMonitor$LockId,false,serviceName:java/lang/String,tokenName:java/io/Serializable
-org/apache/geode/distributed/internal/deadlock/Dependency,true,1,depender:java/lang/Object,dependsOn:java/lang/Object
-org/apache/geode/distributed/internal/deadlock/DependencyGraph,true,-6794339771271587648,edges:java/util/Set,vertices:java/util/Map
-org/apache/geode/distributed/internal/deadlock/GemFireDeadlockDetector$CollectDependencyFunction,true,6204378622627095817
-org/apache/geode/distributed/internal/deadlock/LocalLockInfo,true,1,info:org/apache/geode/internal/concurrent/LI,locatility:java/io/Serializable
-org/apache/geode/distributed/internal/deadlock/LocalThread,true,1,locality:java/io/Serializable,threadId:long,threadName:java/lang/String,threadStack:java/lang/String
-org/apache/geode/distributed/internal/deadlock/MessageDependencyMonitor$MessageKey,true,414781046295505260,myId:org/apache/geode/distributed/internal/membership/InternalDistributedMember,processorId:int
-org/apache/geode/distributed/internal/direct/ShunnedMemberException,true,-6455664684151074915
-org/apache/geode/distributed/internal/locks/DistributedMemberLock$LockReentryPolicy,false
-org/apache/geode/distributed/internal/locks/LockGrantorDestroyedException,true,-3540124531032570817
-org/apache/geode/distributed/internal/membership/gms/messages/InstallViewMessage$messageType,false
-org/apache/geode/distributed/internal/membership/gms/messenger/JGAddress,true,-1818672332115113291,ip_addr:java/net/InetAddress,port:int,vmViewId:int
-org/apache/geode/distributed/internal/membership/gms/mgr/GMSMembershipManager$BoundedLinkedHashMap,true,-3419897166186852692
-org/apache/geode/internal/AbstractConfig$SortedProperties,true,7156507110684631135
-org/apache/geode/internal/ConfigSource,true,-4097017272431018553,description:java/lang/String,type:org/apache/geode/internal/ConfigSource$Type
-org/apache/geode/internal/ConfigSource$Type,false
-org/apache/geode/internal/CopyOnWriteHashSet,true,8591978652141659932
-org/apache/geode/internal/DSFIDNotFoundException,true,130596009484324655,dsfid:int,versionOrdinal:short
-org/apache/geode/internal/InternalDataSerializer$SERIALIZATION_VERSION,false
-org/apache/geode/internal/InternalStatisticsDisabledException,true,4146181546364258311
-org/apache/geode/internal/ObjIdConcurrentMap,true,7249069246763182397,segmentMask:int,segmentShift:int,segments:org/apache/geode/internal/ObjIdConcurrentMap$Segment[]
-org/apache/geode/internal/ObjIdConcurrentMap$Segment,true,2249069246763182397,loadFactor:float
-org/apache/geode/internal/SystemAdmin$CombinedResources,false
-org/apache/geode/internal/admin/CompoundEntrySnapshot,true,5776382582897895718,allUserAttributes:java/util/Set,allValues:java/util/Set,hitRatio:float,hitRatioSum:double,hitResponders:long,lastAccessTime:long,lastModifiedTime:long,name:java/lang/Object,numHits:long,numMisses:long
-org/apache/geode/internal/admin/CompoundRegionSnapshot,true,6295026394298398004,allCacheLoaders:java/util/Set,allCacheWriters:java/util/Set,allCapControllers:java/util/Set,allConcLevels:java/util/Set,allCustomIdle:java/util/HashSet,allCustomTtl:java/util/HashSet,allDataPolicies:java/util/Set,allEntryIdleTimeout:java/util/Set,allEntryTtl:java/util/Set,allInitialCaps:java/util/Set,allKeyConstraints:java/util/Set,allListeners:java/util/Set,allLoadFactors:java/util/Set,allRegionIdleTimeout:java/util/Set,allRegionTtl:java/util/Set,allScopes:java/util/Set,allStatsEnabled:java/util/Set,allUserAttributes:java/util/Set,allValueConstraints:java/util/Set,hitRatio:float,hitRatioSum:double,hitResponders:long,lastAccessTime:long,lastModifiedTime:long,name:java/lang/String,numHits:long,numMisses:long
-org/apache/geode/internal/admin/StatAlert,true,5725457607122449170,definitionId:int,time:java/util/Date,values:java/lang/Number[]
-org/apache/geode/internal/admin/remote/DistributionLocatorId,true,6587390186971937865,bindAddress:java/lang/String,host:java/net/InetAddress,hostnameForClients:java/lang/String,peerLocator:boolean,port:int,serverLocator:boolean
-org/apache/geode/internal/admin/remote/EntryValueNodeImpl,false,fields:org/apache/geode/internal/admin/remote/EntryValueNodeImpl[],name:java/lang/String,primitive:boolean,primitiveVal:java/lang/Object,type:java/lang/String
-org/apache/geode/internal/cache/BackupLock,false,backupDone:java/util/concurrent/locks/Condition,backupThread:java/lang/Thread,isBackingUp:boolean
-org/apache/geode/internal/cache/BucketAdvisor$SetFromMap,true,2454657854757543876,m:java/util/Map
-org/apache/geode/internal/cache/BucketNotFoundException,false
-org/apache/geode/internal/cache/BucketRegion$SizeOp,false
-org/apache/geode/internal/cache/CacheClientStatus,true,-56148046466517217,_id:org/apache/geode/internal/cache/tier/sockets/ClientProxyMembershipID,_memberId:java/lang/String,_numberOfConnections:int,_socketAddresses:java/util/List,_socketPorts:java/util/List
-org/apache/geode/internal/cache/CacheServerLauncher$Status,true,190943081363646485,baseName:java/lang/String,dsMsg:java/lang/String,exception:java/lang/Throwable,msg:java/lang/String,pid:int,state:int
-org/apache/geode/internal/cache/CommitReplyException,true,-7711083075296622596,exceptions:java/util/Set
-org/apache/geode/internal/cache/DataLocationException,false
-org/apache/geode/internal/cache/DiskInitFile$DiskRegionFlag,false
-org/apache/geode/internal/cache/DiskStoreAttributes,true,1,allowForceCompaction:boolean,autoCompact:boolean,compactionThreshold:int,diskDirSizes:int[],diskDirs:java/io/File[],diskUsageCriticalPct:float,diskUsageWarningPct:float,maxOplogSizeInBytes:long,name:java/lang/String,queueSize:int,timeInterval:long,writeBufferSize:int
-org/apache/geode/internal/cache/DiskStoreImpl$KillCompactorException,false
-org/apache/geode/internal/cache/DiskWriteAttributesImpl,true,-4269181954992768424,bytesThreshold:long,compactOplogs:boolean,isSynchronous:boolean,maxOplogSize:long,timeInterval:long
-org/apache/geode/internal/cache/DistTXCommitMessage$DistTxCommitExceptionCollectingException,true,-2681117727592137893,cacheExceptions:java/util/Set,fatalExceptions:java/util/Map,id:org/apache/geode/internal/cache/TXId,regionExceptions:java/util/Map
-org/apache/geode/internal/cache/DistTXPrecommitMessage$DistTxPrecommitExceptionCollectingException,true,-2681117727592137893,cacheExceptions:java/util/Set,fatalExceptions:java/util/Map,id:org/apache/geode/internal/cache/TXId,regionExceptions:java/util/Map
-org/apache/geode/internal/cache/DistTXRollbackMessage$DistTxRollbackExceptionCollectingException,true,-2681117727592137893,cacheExceptions:java/util/Set,fatalExceptions:java/util/Map,id:org/apache/geode/internal/cache/TXId,regionExceptions:java/util/Map
-org/apache/geode/internal/cache/DistributedClearOperation$OperationType,false
-org/apache/geode/internal/cache/DistributedTombstoneOperation$TOperation,false
-org/apache/geode/internal/cache/FilterProfile$interestType,false
-org/apache/geode/internal/cache/FilterProfile$operationType,false
-org/apache/geode/internal/cache/ForceReattemptException,true,-595988965679204903,hasHash:boolean,keyHash:int
-org/apache/geode/internal/cache/ForceableLinkedBlockingQueue,true,-6903933977591709194,capacity:int,count:java/util/concurrent/atomic/AtomicInteger,notEmpty:java/util/concurrent/locks/Condition,notFull:java/util/concurrent/locks/Condition,putLock:java/util/concurrent/locks/ReentrantLock,takeLock:java/util/concurrent/locks/ReentrantLock
-org/apache/geode/internal/cache/IdentityArrayList,true,449125332499184497,size:int,wrapped:boolean
-org/apache/geode/internal/cache/IncomingGatewayStatus,true,-4579815367602658353,_memberId:java/lang/String,_socketAddress:java/net/InetAddress,_socketPort:int
-org/apache/geode/internal/cache/InitialImageOperation$GIIStatus,false
-org/apache/geode/internal/cache/InitialImageOperation$GIITestHookType,false
-org/apache/geode/internal/cache/LocalRegion$1,true,0,this$0:org/apache/geode/internal/cache/LocalRegion
-org/apache/geode/internal/cache/LocalRegion$IteratorType,false
-org/apache/geode/internal/cache/Oplog$OkToSkipResult,false
-org/apache/geode/internal/cache/Oplog$OplogFileType,false
-org/apache/geode/internal/cache/PRContainsValueFunction,false
-org/apache/geode/internal/cache/PRHARedundancyProvider$ArrayListWithClearState,true,1,wasCleared:boolean
-org/apache/geode/internal/cache/PartitionedRegion$7,true,0,this$0:org/apache/geode/internal/cache/PartitionedRegion,val$bucketId:int
-org/apache/geode/internal/cache/PartitionedRegion$PRIdMap,true,3667357372967498179,cleared:boolean
-org/apache/geode/internal/cache/PartitionedRegion$SizeEntry,false,isPrimary:boolean,size:int
-org/apache/geode/internal/cache/PartitionedRegionDataStore$CreateBucketResult,false,nowExists:boolean
-org/apache/geode/internal/cache/PartitionedRegionException,true,5113786059279106007
-org/apache/geode/internal/cache/PartitionedRegionQueryEvaluator$MemberResultsList,false,isLastChunkReceived:boolean
-org/apache/geode/internal/cache/PartitionedRegionStatus,true,-6755318987122602065,numberOfLocalEntries:int
-org/apache/geode/internal/cache/PrimaryBucketException,true,1
-org/apache/geode/internal/cache/PutAllPartialResultException,true,2411654400733621071,result:org/apache/geode/internal/cache/PutAllPartialResultException$PutAllPartialResult
-org/apache/geode/internal/cache/PutAllPartialResultException$PutAllPartialResult,false,firstCauseOfFailure:java/lang/Exception,firstFailedKey:java/lang/Object,succeededKeys:org/apache/geode/internal/cache/tier/sockets/VersionedObjectList,totalMapSize:int
-org/apache/geode/internal/cache/RegionClearedException,true,1266503771775907997
-org/apache/geode/internal/cache/RegionQueueException,true,4159307586325821105
-org/apache/geode/internal/cache/RegionStatus,true,3442040750396350302,heapSize:long,numberOfEntries:int
-org/apache/geode/internal/cache/RemoteOperationException,true,-595988965679204903,hasHash:boolean,keyHash:int
-org/apache/geode/internal/cache/RemoteRegionOperation$Operation,false
-org/apache/geode/internal/cache/SearchLoadAndWriteProcessor$TryAgainException,false
-org/apache/geode/internal/cache/TXCommitMessage$CommitExceptionCollectingException,true,589384721273797822,cacheExceptions:java/util/Set,fatalExceptions:java/util/Map,id:org/apache/geode/internal/cache/TXId,regionExceptions:java/util/Map
-org/apache/geode/internal/cache/TXCommitMessage$RegionCommitList,true,-8910813949027683641
-org/apache/geode/internal/cache/TXFarSideCMTracker$2,false,this$0:org/apache/geode/internal/cache/TXFarSideCMTracker
-org/apache/geode/internal/cache/TXManagerImpl$1,true,-4156018226167594134,this$0:org/apache/geode/internal/cache/TXManagerImpl
-org/apache/geode/internal/cache/control/InternalResourceManager$ResourceType,false,id:int
-org/apache/geode/internal/cache/control/MemoryThresholds$MemoryState,false
-org/apache/geode/internal/cache/control/PartitionRebalanceDetailsImpl,true,5880667005758250156,bucketCreateBytes:long,bucketCreateTime:long,bucketCreatesCompleted:int,bucketRemoveBytes:long,bucketRemoveTime:long,bucketRemovesCompleted:int,bucketTransferBytes:long,bucketTransferTime:long,bucketTransfersCompleted:int,partitionMemberDetailsAfter:java/util/Set,partitionMemberDetailsBefore:java/util/Set,primaryTransferTime:long,primaryTransfersCompleted:int,time:long
-org/apache/geode/internal/cache/control/RebalanceResultsImpl,false,detailSet:java/util/Set,totalBucketCreateBytes:long,totalBucketCreateTime:long,totalBucketCreatesCompleted:int,totalBucketTransferBytes:long,totalBucketTransferTime:long,totalBucketTransfersCompleted:int,totalPrimaryTransferTime:long,totalPrimaryTransfersCompleted:int,totalTime:long
-org/apache/geode/internal/cache/execute/BucketMovedException,true,4893171227542647452
-org/apache/geode/internal/cache/execute/InternalFunctionException,false
-org/apache/geode/internal/cache/execute/InternalFunctionInvocationTargetException,false,failedIds:java/util/Set
-org/apache/geode/internal/cache/execute/MemberMappedArgument,true,-6465867775653599576,defaultArgument:java/lang/Object,memberToArgMap:java/util/Map
-org/apache/geode/internal/cache/execute/NoResult,true,-4901369422864228848
-org/apache/geode/internal/cache/execute/util/FindRestEnabledServersFunction,true,7851518767859544678
-org/apache/geode/internal/cache/ha/ThreadIdentifier$Bits,false,position:int,width:int
-org/apache/geode/internal/cache/ha/ThreadIdentifier$WanType,false
-org/apache/geode/internal/cache/lru/HeapLRUCapacityController,true,4970685814429530675,perEntryOverhead:int,sizer:org/apache/geode/cache/util/ObjectSizer
-org/apache/geode/internal/cache/lru/LRUAlgorithm,false,bucketRegion:org/apache/geode/internal/cache/BucketRegion,evictionAction:org/apache/geode/cache/EvictionAction
-org/apache/geode/internal/cache/lru/LRUCapacityController,true,-4383074909189355938,maximumEntries:int
-org/apache/geode/internal/cache/lru/MemLRUCapacityController,true,6364183985590572514,isOffHeap:boolean,limit:long,perEntryOverHead:int,sizer:org/apache/geode/cache/util/ObjectSizer
-org/apache/geode/internal/cache/partitioned/DumpB2NRegion$PrimaryInfo,true,6334695270795306178,hostToken:java/lang/String,isHosting:boolean,isPrimary:boolean
-org/apache/geode/internal/cache/partitioned/FetchEntriesMessage$FetchEntriesResponse$1,true,0,this$0:org/apache/geode/internal/cache/partitioned/FetchEntriesMessage$FetchEntriesResponse,val$bucketId:int,val$recipient:org/apache/geode/distributed/internal/membership/InternalDistributedMember
-org/apache/geode/internal/cache/partitioned/PRLocallyDestroyedException,true,-1291911181409686840
-org/apache/geode/internal/cache/partitioned/PartitionMemberInfoImpl,true,8245020687604034289,bucketCount:int,configuredMaxMemory:long,distributedMember:org/apache/geode/distributed/DistributedMember,primaryCount:int,size:long
-org/apache/geode/internal/cache/partitioned/PartitionRegionInfoImpl,true,6462414089469761476,actualRedundantCopies:int,colocatedWith:java/lang/String,configuredBucketCount:int,configuredRedundantCopies:int,createdBucketCount:int,lowRedundancyBucketCount:int,memberDetails:java/util/Set,offlineMembers:org/apache/geode/internal/cache/partitioned/OfflineMemberDetails,regionPath:java/lang/String
-org/apache/geode/internal/cache/partitioned/RedundancyAlreadyMetException,false
-org/apache/geode/internal/cache/partitioned/rebalance/PartitionedRegionLoadModel$RefusalReason,false
-org/apache/geode/internal/cache/persistence/OplogType,false,prefix:java/lang/String
-org/apache/geode/internal/cache/persistence/PersistentMemberState,false
-org/apache/geode/internal/cache/snapshot/ClientExporter$ClientArgs,true,1,options:org/apache/geode/cache/snapshot/SnapshotOptions,prSingleHop:boolean,region:java/lang/String
-org/apache/geode/internal/cache/snapshot/ClientExporter$ProxyExportFunction,true,1
-org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl$1,true,1
-org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl$ParallelArgs,true,1,file:java/io/File,format:org/apache/geode/cache/snapshot/SnapshotOptions$SnapshotFormat,options:org/apache/geode/internal/cache/snapshot/SnapshotOptionsImpl
-org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl$ParallelExportFunction,false
-org/apache/geode/internal/cache/snapshot/RegionSnapshotServiceImpl$ParallelImportFunction,false
-org/apache/geode/internal/cache/snapshot/SnapshotOptionsImpl,true,1,filter:org/apache/geode/cache/snapshot/SnapshotFilter,mapper:org/apache/geode/internal/cache/snapshot/SnapshotFileMapper,parallel:boolean
-org/apache/geode/internal/cache/snapshot/WindowedExporter$WindowedArgs,true,1,exporter:org/apache/geode/distributed/DistributedMember,options:org/apache/geode/cache/snapshot/SnapshotOptions
-org/apache/geode/internal/cache/snapshot/WindowedExporter$WindowedExportFunction,true,1
-org/apache/geode/internal/cache/tier/BatchException,true,-6707074107791305564,_index:int
-org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier$2,false,this$0:org/apache/geode/internal/cache/tier/sockets/CacheClientNotifier
-org/apache/geode/internal/cache/tier/sockets/CacheClientProxy$MessageDispatcher$1,true,0,this$0:org/apache/geode/internal/cache/tier/sockets/CacheClientProxy$MessageDispatcher
-org/apache/geode/internal/cache/tier/sockets/ClientTombstoneMessage$TOperation,false
-org/apache/geode/internal/cache/tier/sockets/MessageTooLargeException,true,-8970585803331525833
-org/apache/geode/internal/cache/tier/sockets/UnregisterAllInterest,true,5026160621257178459
-org/apache/geode/internal/cache/tx/TransactionalOperation$ServerRegionOperation,false
-org/apache/geode/internal/cache/versions/ConcurrentCacheModificationException,false
-org/apache/geode/internal/cache/wan/AsyncEventQueueConfigurationException,true,1
-org/apache/geode/internal/cache/wan/BatchException70,true,-6707074107791305564,batchId:int,exceptions:java/util/List,index:int
-org/apache/geode/internal/cache/wan/GatewayReceiverException,true,7079321411869820364
-org/apache/geode/internal/cache/wan/GatewaySenderConfigurationException,true,1
-org/apache/geode/internal/cache/wan/GatewaySenderException,true,8090143153569084886
-org/apache/geode/internal/cache/wan/parallel/BucketRegionQueueUnavailableException,false
-org/apache/geode/internal/cache/xmlcache/CacheXmlVersion,false,namespace:java/lang/String,publicId:java/lang/String,schemaLocation:java/lang/String,systemId:java/lang/String,version:java/lang/String
-org/apache/geode/internal/cache/xmlcache/DiskStoreAttributesCreation,false
-org/apache/geode/internal/cache/xmlcache/RegionAttributesCreation,true,2241078661206355376,asyncEventQueueIds:java/util/Set,cacheListeners:java/util/ArrayList,cacheLoader:org/apache/geode/cache/CacheLoader,cacheWriter:org/apache/geode/cache/CacheWriter,cloningEnabled:boolean,compressor:org/apache/geode/compression/Compressor,concurrencyChecksEnabled:boolean,concurrencyLevel:int,customEntryIdleTimeout:org/apache/geode/cache/CustomExpiry,customEntryTimeToLive:org/apache/geode/cache/CustomExpiry,dataPolicy:org/apache/geode/cache/DataPolicy,diskDirs:java/io/File[],diskSizes:int[],diskStoreName:java/lang/String,diskWriteAttributes:org/apache/geode/cache/DiskWriteAttributes,earlyAck:boolean,enableAsyncConflation:boolean,enableSubscriptionConflation:boolean,entryIdleTimeout:org/apache/geode/cache/ExpirationAttributes,entryTimeToLive:org/apache/geode/cache/ExpirationAttributes,evictionAttributes:org/apache/geode/internal/cache/EvictionAttributesImpl,gatewaySenderIds:java/util/Set,id:java/la
 ng/String,ignoreJTA:boolean,indexMaintenanceSynchronous:boolean,initialCapacity:int,isDiskSynchronous:boolean,isLockGrantor:boolean,keyConstraint:java/lang/Class,loadFactor:float,membershipAttributes:org/apache/geode/cache/MembershipAttributes,multicastEnabled:boolean,offHeap:boolean,partitionAttributes:org/apache/geode/cache/PartitionAttributes,poolName:java/lang/String,publisher:boolean,refid:java/lang/String,regionIdleTimeout:org/apache/geode/cache/ExpirationAttributes,regionTimeToLive:org/apache/geode/cache/ExpirationAttributes,scope:org/apache/geode/cache/Scope,statisticsEnabled:boolean,subscriptionAttributes:org/apache/geode/cache/SubscriptionAttributes,valueConstraint:java/lang/Class
-org/apache/geode/internal/concurrent/AtomicLong5,true,-1915700199064062938
-org/apache/geode/internal/concurrent/CompactConcurrentHashSet2,true,7249069246763182397
-org/apache/geode/internal/concurrent/CompactConcurrentHashSet2$Segment,true,2249069246763182397,loadFactor:float
-org/apache/geode/internal/concurrent/ConcurrentHashSet,true,-3338819662572203596,map:java/util/concurrent/ConcurrentHashMap
-org/apache/geode/internal/concurrent/LI,true,-6014738350371493969,className:java/lang/String,identityHashCode:int,lockedStackFrame:java/lang/StackTraceElement
-org/apache/geode/internal/datasource/AbstractDataSource,false,configProps:org/apache/geode/internal/datasource/ConfiguredDataSourceProperties,isActive:boolean,jdbcDriver:java/lang/String,loginTimeOut:int,password:java/lang/String,serverName:java/lang/String,url:java/lang/String,user:java/lang/String
-org/apache/geode/internal/datasource/AbstractPoolCache,false,INIT_LIMIT:int,MAX_LIMIT:int,activeConnections:int,configProps:org/apache/geode/internal/datasource/ConfiguredDataSourceProperties,connEventListner:java/util/EventListener,expirationTime:int,expiredConns:java/util/List,loginTimeOut:int,sleepTime:long,th:java/lang/Thread,timeOut:int,totalConnections:int
-org/apache/geode/internal/datasource/ConfiguredDataSourceProperties,true,1241739895646314739,connPoolDSClass:java/lang/String,expirationTime:int,initialPoolSize:int,jdbcDriver:java/lang/String,loginTimeOut:int,maxPoolSize:int,mcfClass:java/lang/String,password:java/lang/String,timeOut:int,txnType:java/lang/String,url:java/lang/String,user:java/lang/String,xadsClass:java/lang/String
-org/apache/geode/internal/datasource/ConnectionPoolCacheImpl,true,-3096029291871746431,m_cpds:javax/sql/ConnectionPoolDataSource
-org/apache/geode/internal/datasource/ConnectionProviderException,true,-7406652144153958227,excep:java/lang/Exception
-org/apache/geode/internal/datasource/DataSourceCreateException,true,8759147832954825309,excep:java/lang/Exception
-org/apache/geode/internal/datasource/GemFireBasicDataSource,true,-4010116024816908360
-org/apache/geode/internal/datasource/GemFireConnPooledDataSource,true,1177231744410855158,provider:org/apache/geode/internal/datasource/ConnectionProvider
-org/apache/geode/internal/datasource/GemFireConnectionPoolManager,true,23723212980453813,connPoolCache:org/apache/geode/internal/datasource/ConnectionPoolCache
-org/apache/geode/internal/datasource/GemFireTransactionDataSource,true,-3095123666092414103,provider:org/apache/geode/internal/datasource/ConnectionProvider,xaResourcesMap:java/util/Map
-org/apache/geode/internal/datasource/JCAConnectionManagerImpl,true,5281512854051120661,conReqInfo:javax/resource/spi/ConnectionRequestInfo,isActive:boolean,mannPoolCache:org/apache/geode/internal/datasource/ConnectionPoolCache,subject:javax/security/auth/Subject,xaResourcesMap:java/util/Map
-org/apache/geode/internal/datasource/ManagedPoolCacheImpl,true,1064642271736399718,connFactory:javax/resource/spi/ManagedConnectionFactory,connReqInfo:javax/resource/spi/ConnectionRequestInfo,sub:javax/security/auth/Subject
-org/apache/geode/internal/datasource/PoolException,true,-6178632158204356727
-org/apache/geode/internal/datasource/TranxPoolCacheImpl,true,3295652525163658888,m_xads:javax/sql/XADataSource
-org/apache/geode/internal/hll/CardinalityMergeException,false
-org/apache/geode/internal/hll/HyperLogLog,true,-4661220245111112301,alphaMM:double,log2m:int,registerSet:org/apache/geode/internal/hll/RegisterSet
-org/apache/geode/internal/hll/HyperLogLog$Builder,true,-979314356097156719,rsd:double
-org/apache/geode/internal/hll/HyperLogLog$HyperLogLogMergeException,false
-org/apache/geode/internal/hll/HyperLogLog$SerializationHolder,false,hyperLogLogHolder:org/apache/geode/internal/hll/HyperLogLog
-org/apache/geode/internal/hll/HyperLogLogPlus,true,7504952025744337762,alphaMM:double,format:org/apache/geode/internal/hll/HyperLogLogPlus$Format,m:int,p:int,registerSet:org/apache/geode/internal/hll/RegisterSet,sm:int,sortThreshold:int,sp:int,sparseSet:int[],sparseSetThreshold:int,tmpIndex:int,tmpSet:int[]
-org/apache/geode/internal/hll/HyperLogLogPlus$Builder,true,-1608419770500158843,p:int,sp:int
-org/apache/geode/internal/hll/HyperLogLogPlus$Format,false
-org/apache/geode/internal/hll/HyperLogLogPlus$HyperLogLogPlusMergeException,false
-org/apache/geode/internal/hll/HyperLogLogPlus$SerializationHolder,false,hyperLogLogHolder:org/apache/geode/internal/hll/HyperLogLogPlus
-org/apache/geode/internal/jta/TransactionManagerImpl,true,5033392316185449821,globalTransactionMap:java/util/Map,gtxSet:java/util/SortedSet,isActive:boolean,transactionMap:java/util/Map
-org/apache/geode/internal/jta/UserTransactionImpl,true,2994652455204901910,storedTimeOut:int,tm:javax/transaction/TransactionManager
-org/apache/geode/internal/memcached/Command,false
-org/apache/geode/internal/memcached/Command$1,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$10,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$11,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$12,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$13,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$14,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$15,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$16,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$17,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$18,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$19,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$2,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$20,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$21,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$22,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$23,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$24,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$25,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$26,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$27,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$28,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$29,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$3,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$30,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$31,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$32,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$33,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$34,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$4,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$5,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$6,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$7,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$8,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Command$9,false,processor:org/apache/geode/internal/memcached/CommandProcessor
-org/apache/geode/internal/memcached/Reply,false
-org/apache/geode/internal/memcached/Reply$1,false
-org/apache/geode/internal/memcached/Reply$2,false
-org/apache/geode/internal/memcached/Reply$3,false
-org/apache/geode/internal/memcached/Reply$4,false
-org/apache/geode/internal/memcached/Reply$5,false
-org/apache/geode/internal/memcached/Reply$6,false
-org/apache/geode/internal/memcached/Reply$7,false
-org/apache/geode/internal/memcached/Reply$8,false
-org/apache/geode/internal/memcached/Reply$9,false
-org/apache/geode/internal/memcached/ResponseStatus,false
-org/apache/geode/internal/memcached/ResponseStatus$1,false
-org/apache/geode/internal/memcached/ResponseStatus$2,false
-org/apache/geode/internal/memcached/ResponseStatus$3,false
-org/apache/geode/internal/memcached/ResponseStatus$4,false
-org/apache/geode/internal/memcached/ResponseStatus$5,false
-org/apache/geode/internal/memcached/ResponseStatus$6,false
-org/apache/geode/internal/memcached/commands/ClientError,true,-2426928000696680541
-org/apache/geode/internal/offheap/MemoryBlock$State,false
-org/apache/geode/internal/offheap/OffHeapStorage$1,false
-org/apache/geode/internal/offheap/OffHeapStorage$2,false
-org/apache/geode/internal/offheap/annotations/OffHeapIdentifier,false,id:java/lang/String
-org/apache/geode/internal/process/ConnectionFailedException,true,5622636452836752700
-org/apache/geode/internal/process/FileAlreadyExistsException,true,5471082555536094256
-org/apache/geode/internal/process/MBeanInvocationFailedException,true,7991096466859690801
-org/apache/geode/internal/process/PidUnavailableException,true,-1660269538268828059
-org/apache/geode/internal/process/signal/Signal,false,description:java/lang/String,name:java/lang/String,number:int,type:org/apache/geode/internal/process/signal/SignalType
-org/apache/geode/internal/process/signal/SignalEvent,false,signal:org/apache/geode/internal/process/signal/Signal
-org/apache/geode/internal/process/signal/SignalType,false,description:java/lang/String
-org/apache/geode/internal/sequencelog/GraphType,false
-org/apache/geode/internal/sequencelog/model/GraphID,false,graphName:java/lang/String,type:org/apache/geode/internal/sequencelog/GraphType
-org/apache/geode/internal/size/ReflectionObjectSizer,false
-org/apache/geode/internal/size/SizeClassOnceObjectSizer,false
-org/apache/geode/internal/statistics/CounterMonitor$Type,false
-org/apache/geode/internal/statistics/IgnoreResourceException,true,3371071862581873081
-org/apache/geode/internal/statistics/StatisticNotFoundException,true,-6232790142851058203
-org/apache/geode/internal/statistics/StatisticsNotification$Type,false
-org/apache/geode/internal/statistics/ValueMonitor$Type,false
-org/apache/geode/internal/tcp/ByteBufferInputStream,false,buffer:org/apache/geode/internal/tcp/ByteBufferInputStream$ByteSource
-org/apache/geode/internal/tcp/ConnectExceptions,true,-4173688946448867706,causes:java/util/List,members:java/util/List
-org/apache/geode/internal/tcp/ConnectionException,true,-1977443644277412122
-org/apache/geode/internal/tcp/ImmutableByteBufferInputStream,false
-org/apache/geode/internal/tcp/MemberShunnedException,true,-8453126202477831557,member:org/apache/geode/distributed/DistributedMember
-org/apache/geode/internal/tcp/ReenteredConnectException,false
-org/apache/geode/internal/tcp/VersionedByteBufferInputStream,false,version:org/apache/geode/internal/Version
-org/apache/geode/internal/util/Breadcrumbs$CrumbType,false
-org/apache/geode/internal/util/SingletonValue$ValueState,false
-org/apache/geode/internal/util/SunAPINotFoundException,false
-org/apache/geode/internal/util/concurrent/CopyOnWriteHashMap,false,map:java/util/Map
-org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap,true,-7056732555635108300,compareValues:boolean,entryCreator:org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap$HashEntryCreator,segmentMask:int,segmentShift:int,segments:org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap$Segment[]
-org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap$DefaultHashEntryCreator,true,3765680607280951726
-org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap$IdentitySegment,true,3086228147110819882
-org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap$Segment,true,-6972364566212065192,entryCreator:org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap$HashEntryCreator,listUpdateLock:java/util/concurrent/locks/ReentrantReadWriteLock,loadFactor:float
-org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap$SimpleReusableEntry,true,1591026397367910439,key:java/lang/Object,this$0:org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap,value:java/lang/Object
-org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap$WriteThroughEntry,true,-6364816773849437756,this$0:org/apache/geode/internal/util/concurrent/CustomEntryConcurrentHashMap
-org/apache/geode/internal/util/concurrent/ReentrantSemaphore,false,holdCount:java/lang/ThreadLocal
-org/apache/geode/internal/util/concurrent/StoppableCondition,true,-7091681525970431937,condition:java/util/concurrent/locks/Condition,stopper:org/apache/geode/CancelCriterion
-org/apache/geode/internal/util/concurrent/StoppableReentrantReadWriteLock,true,-1185707921434766946
-org/apache/geode/lang/AttachAPINotFoundException,false
-org/apache/geode/management/AlreadyRunningException,true,8947734854770335071
-org/apache/geode/management/DependenciesNotFoundException,true,9082304929238159814
-org/apache/geode/management/ManagementException,true,879398950879472121
-org/apache/geode/management/cli/CommandProcessingException,true,-1398779521639575884,errorData:java/lang/Object,errorType:int
-org/apache/geode/management/cli/CommandServiceException,true,7316102209844678329
-org/apache/geode/management/cli/Result$Status,false,code:int
-org/apache/geode/management/internal/JmxManagerLocator$StartJmxManagerFunction,true,-2860286061903069789
-org/apache/geode/management/internal/ManagementAgent$GemFireRMIClientSocketFactory,true,-7604285019188827617
-org/apache/geode/management/internal/ManagementAgent$GemFireRMIServerSocketFactory,true,-811909050641332716,bindAddr:java/net/InetAddress
-org/apache/geode/management/internal/ManagementFunction,true,1,mbeanServer:javax/management/MBeanServer,notificationHub:org/apache/geode/management/internal/NotificationHub
-org/apache/geode/management/internal/NotificationKey,false,currentTime:long,objectName:javax/management/ObjectName
-org/apache/geode/management/internal/beans/QueryDataFunction,true,1
-org/apache/geode/management/internal/beans/QueryDataFunction$LocalQueryFunction,true,1,id:java/lang/String,optimizeForWrite:boolean,regionName:java/lang/String,showMembers:boolean,this$0:org/apache/geode/management/internal/beans/QueryDataFunction
-org/apache/geode/management/internal/beans/QueryDataFunction$QueryDataFunctionResult,true,1,compressedBytes:byte[],message:java/lang/String
-org/apache/geode/management/internal/beans/stats/StatType,false
-org/apache/geode/management/internal/cli/AbstractCliAroundInterceptor$Response,false,text:java/lang/String
-org/apache/geode/management/internal/cli/CliUtil$DeflaterInflaterData,true,1104813333595216795,data:byte[],dataLength:int
-org/apache/geode/management/internal/cli/domain/AsyncEventQueueDetails,true,1,batchSize:int,diskStoreName:java/lang/String,id:java/lang/String,listener:java/lang/String,listenerProperties:java/util/Properties,maxQueueMemory:int,persistent:boolean
-org/apache/geode/management/internal/cli/domain/CacheServerInfo,true,1,bindAddress:java/lang/String,isRunning:boolean,port:int
-org/apache/geode/management/internal/cli/domain/DataCommandResult,true,1,command:java/lang/String,error:java/lang/Throwable,errorString:java/lang/String,getResult:java/lang/Object,hasResultForAggregation:boolean,infoString:java/lang/String,inputKey:java/lang/Object,inputQuery:java/lang/Object,inputValue:java/lang/Object,keyClass:java/lang/String,limit:int,locateEntryLocations:java/util/List,locateEntryResult:org/apache/geode/management/internal/cli/domain/DataCommandResult$KeyInfo,operationCompletedSuccessfully:boolean,putResult:java/lang/Object,queryTraceString:java/lang/String,removeResult:java/lang/Object,selectResult:java/util/List,valueClass:java/lang/String
-org/apache/geode/management/internal/cli/domain/DataCommandResult$KeyInfo,false,host:java/lang/String,locations:java/util/ArrayList,memberId:java/lang/String,memberName:java/lang/String,pid:int
-org/apache/geode/management/internal/cli/domain/DataCommandResult$SelectResultRow,true,1,type:int,value:java/lang/Object
-org/apache/geode/management/internal/cli/domain/DiskStoreDetails,false,allowForceCompaction:java/lang/Boolean,asyncEventQueueDetailsSet:java/util/Set,autoCompact:java/lang/Boolean,cacheServerDetailsSet:java/util/Set,compactionThreshold:java/lang/Integer,diskDirDetailsSet:java/util/Set,diskUsageCriticalPercentage:java/lang/Float,diskUsageWarningPercentage:java/lang/Float,gatewayDetailsSet:java/util/Set,id:java/util/UUID,maxOplogSize:java/lang/Long,memberId:java/lang/String,memberName:java/lang/String,name:java/lang/String,offline:java/lang/Boolean,pdxSerializationMetaDataStored:java/lang/Boolean,queueSize:java/lang/Integer,regionDetailsSet:java/util/Set,timeInterval:java/lang/Long,writeBufferSize:java/lang/Integer
-org/apache/geode/management/internal/cli/domain/DiskStoreDetails$AsyncEventQueueDetails,false,id:java/lang/String
-org/apache/geode/management/internal/cli/domain/DiskStoreDetails$CacheServerDetails,false,bindAddress:java/lang/String,hostName:java/lang/String,port:int
-org/apache/geode/management/internal/cli/domain/DiskStoreDetails$DiskDirDetails,false,absolutePath:java/lang/String,size:int
-org/apache/geode/management/internal/cli/domain/DiskStoreDetails$GatewayDetails,false,id:java/lang/String,persistent:boolean
-org/apache/geode/management/internal/cli/domain/DiskStoreDetails$RegionDetails,false,fullPath:java/lang/String,name:java/lang/String,overflowToDisk:boolean,persistent:boolean
-org/apache/geode/management/internal/cli/domain/DurableCqNamesResult,true,1,cqNames:java/util/List
-org/apache/geode/management/internal/cli/domain/EvictionAttributesInfo,true,1,evictionAction:java/lang/String,evictionAlgorithm:java/lang/String,evictionMaxValue:int,nonDefaultAttributes:java/util/Map
-org/apache/geode/management/internal/cli/domain/FixedPartitionAttributesInfo,true,1,isPrimary:boolean,numBuckets:int,partitionName:java/lang/String
-org/apache/geode/management/internal/cli/domain/IndexDetails,false,fromClause:java/lang/String,indexName:java/lang/String,indexStatisticsDetails:org/apache/geode/management/internal/cli/domain/IndexDetails$IndexStatisticsDetails,indexType:org/apache/geode/management/internal/cli/domain/IndexDetails$IndexType,indexedExpression:java/lang/String,memberId:java/lang/String,memberName:java/lang/String,projectionAttributes:java/lang/String,regionName:java/lang/String,regionPath:java/lang/String
-org/apache/geode/management/internal/cli/domain/IndexDetails$IndexStatisticsDetails,false,numberOfKeys:java/lang/Long,numberOfUpdates:java/lang/Long,numberOfValues:java/lang/Long,totalUpdateTime:java/lang/Long,totalUses:java/lang/Long
-org/apache/geode/management/internal/cli/domain/IndexDetails$IndexType,false,description:java/lang/String
-org/apache/geode/management/internal/cli/domain/IndexInfo,true,1,indexName:java/lang/String,indexType:int,indexedExpression:java/lang/String,regionPath:java/lang/String
-org/apache/geode/management/internal/cli/domain/MemberConfigurationInfo,false,cacheAttributes:java/util/Map,cacheServerAttributes:java/util/List,gfePropsRuntime:java/util/Map,gfePropsSetFromFile:java/util/Map,gfePropsSetUsingApi:java/util/Map,gfePropsSetWithDefaults:java/util/Map,jvmInputArguments:java/util/List,pdxAttributes:java/util/Map,systemProperties:java/util/Properties
-org/apache/geode/management/internal/cli/domain/MemberInformation,true,1,cacheServerList:java/util/List,cacheXmlFilePath:java/lang/String,clientCount:int,cpuUsage:double,groups:java/lang/String,heapUsage:java/lang/String,host:java/lang/String,hostedRegions:java/util/Set,id:java/lang/String,initHeapSize:java/lang/String,isServer:boolean,locatorBindAddress:java/lang/String,locatorPort:int,locators:java/lang/String,logFilePath:java/lang/String,maxHeapSize:java/lang/String,name:java/lang/String,offHeapMemorySize:java/lang/String,processId:java/lang/String,serverBindAddress:java/lang/String,statArchiveFilePath:java/lang/String,workingDirPath:java/lang/String
-org/apache/geode/management/internal/cli/domain/MemberResult,true,1,errorMessage:java/lang/String,exceptionMessage:java/lang/String,isSuccessful:boolean,memberNameOrId:java/lang/String,opPossible:boolean,successMessage:java/lang/String
-org/apache/geode/management/internal/cli/domain/PartitionAttributesInfo,true,1,colocatedWith:java/lang/String,fpaInfoList:java/util/List,localMaxMemory:int,nonDefaultAttributes:java/util/Map,partitionResolverName:java/lang/String,recoveryDelay:long,redundantCopies:int,startupRecoveryDelay:long,totalNumBuckets:int
-org/apache/geode/management/internal/cli/domain/RegionAttributesInfo,true,1,cacheListenerClassNames:java/util/List,cacheLoaderClassName:java/lang/String,cacheWriterClassName:java/lang/String,cloningEnabled:boolean,compressorClassName:java/lang/String,concurrencyChecksEnabled:boolean,concurrencyLevel:int,dataPolicy:org/apache/geode/cache/DataPolicy,diskStoreName:java/lang/String,enableAsyncConflation:boolean,enableSubscriptionConflation:boolean,entryIdleTimeout:int,entryIdleTimeoutAction:java/lang/String,entryTimeToLive:int,entryTimeToLiveAction:java/lang/String,evictionAttributesInfo:org/apache/geode/management/internal/cli/domain/EvictionAttributesInfo,ignoreJTA:boolean,indexMaintenanceSynchronous:boolean,initialCapacity:int,isLockGrantor:boolean,loadFactor:float,multicastEnabled:boolean,nonDefaultAttributes:java/util/Map,offHeap:boolean,partitionAttributesInfo:org/apache/geode/management/internal/cli/domain/PartitionAttributesInfo,poolName:java/lang/String,regionIdleTimeout:int,re
 gionIdleTimeoutAction:java/lang/String,regionTimeToLive:int,regionTimeToLiveAction:java/lang/String,scope:org/apache/geode/cache/Scope,statisticsEnabled:boolean
-org/apache/geode/management/internal/cli/domain/RegionDescription,true,1,cndEvictionAttributes:java/util/Map,cndPartitionAttributes:java/util/Map,cndRegionAttributes:java/util/Map,dataPolicy:org/apache/geode/cache/DataPolicy,haslocalDataStorage:boolean,isAccessor:boolean,isLocal:boolean,isPartition:boolean,isPersistent:boolean,isReplicate:boolean,isReplicatedProxy:boolean,name:java/lang/String,regionDescPerMemberMap:java/util/Map,scope:org/apache/geode/cache/Scope
-org/apache/geode/management/internal/cli/domain/RegionDescriptionPerMember,true,1,hostingMember:java/lang/String,isAccessor:boolean,name:java/lang/String,regionAttributesInfo:org/apache/geode/management/internal/cli/domain/RegionAttributesInfo,size:int
-org/apache/geode/management/internal/cli/domain/RegionInformation,true,1,dataPolicy:org/apache/geode/cache/DataPolicy,isRoot:boolean,name:java/lang/String,parentRegion:java/lang/String,path:java/lang/String,scope:org/apache/geode/cache/Scope,subRegionInformationSet:java/util/Set
-org/apache/geode/management/internal/cli/domain/StackTracesPerMember,true,1,memberNameOrId:java/lang/String,stackTraces:byte[]
-org/apache/geode/management/internal/cli/domain/SubscriptionQueueSizeResult,true,1,subscriptionQueueSize:long
-org/apache/geode/management/internal/cli/exceptions/CliCommandException,false,commandTarget:org/apache/geode/management/internal/cli/parser/CommandTarget,optionSet:org/apache/geode/management/internal/cli/parser/OptionSet
-org/apache/geode/management/internal/cli/exceptions/CliCommandInvalidException,false
-org/apache/geode/management/internal/cli/exceptions/CliCommandMultiModeOptionException,false,code:int,leadOptionString:java/lang/String
-org/apache/geode/management/internal/cli/exceptions/CliCommandNotAvailableException,false
-org/apache/geode/management/internal/cli/exceptions/CliCommandOptionException,false,option:org/apache/geode/management/internal/cli/parser/Option
-org/apache/geode/management/internal/cli/exceptions/CliCommandOptionHasMultipleValuesException,true,-5277268341319591711
-org/apache/geode/management/internal/cli/exceptions/CliCommandOptionInvalidException,false
-org/apache/geode/management/internal/cli/exceptions/CliCommandOptionMissingException,false
-org/apache/geode/management/internal/cli/exceptions/CliCommandOptionNotApplicableException,false
-org/apache/geode/management/internal/cli/exceptions/CliCommandOptionValueConversionException,false
-org/apache/geode/management/internal/cli/exceptions/CliCommandOptionValueException,false,value:java/lang/String
-org/apache/geode/management/internal/cli/exceptions/CliCommandOptionValueMissingException,false
-org/apache/geode/management/internal/cli/exceptions/CliException,false
-org/apache/geode/management/internal/cli/exceptions/CreateSubregionException,true,4387344870743824916
-org/apache/geode/management/internal/cli/exceptions/IndexNotFoundException,true,1,indexName:java/lang/String,message:java/lang/String
-org/apache/geode/management/internal/cli/functions/AlterRuntimeConfigFunction,true,1
-org/apache/geode/management/internal/cli/functions/AsyncEventQueueFunctionArgs,true,-6524494645663740872,asyncEventQueueId:java/lang/String,batchSize:int,batchTimeInterval:int,diskStoreName:java/lang/String,diskSynchronous:boolean,dispatcherThreads:int,enableBatchConflation:boolean,forwardExpirationDestroy:boolean,gatewayEventFilters:java/lang/String[],gatewaySubstitutionFilter:java/lang/String,isParallel:boolean,listenerClassName:java/lang/String,listenerProperties:java/util/Properties,maxQueueMemory:int,orderPolicy:java/lang/String,persistent:boolean
-org/apache/geode/management/internal/cli/functions/ChangeLogLevelFunction,true,1
-org/apache/geode/management/internal/cli/functions/CloseDurableClientFunction,true,1
-org/apache/geode/management/internal/cli/functions/CloseDurableCqFunction,true,1
-org/apache/geode/management/internal/cli/functions/ContunuousQueryFunction,true,1
-org/apache/geode/management/internal/cli/functions/ContunuousQueryFunction$ClientInfo,true,1,isDurable:java/lang/String,primaryServer:java/lang/String,secondaryServer:java/lang/String,this$0:org/apache/geode/management/internal/cli/functions/ContunuousQueryFunction
-org/apache/geode/management/internal/cli/functions/CreateAsyncEventQueueFunction,true,1
-org/apache/geode/management/internal/cli/functions/CreateDefinedIndexesFunction,true,1
-org/apache/geode/management/internal/cli/functions/CreateDiskStoreFunction,true,1
-org/apache/geode/management/internal/cli/functions/CreateIndexFunction,true,1
-org/apache/geode/management/internal/cli/functions/DataCommandFunction,true,1,optimizeForWrite:boolean
-org/apache/geode/management/internal/cli/functions/DataCommandFunction$SelectExecStep,true,1
-org/apache/geode/management/internal/cli/functions/DataCommandFunction$SelectMoveStep,true,1
-org/apache/geode/management/internal/cli/functions/DataCommandFunction$SelectQuitStep,true,1
-org/apache/geode/management/internal/cli/functions/DeployFunction,true,1
-org/apache/geode/management/internal/cli/functions/DescribeDiskStoreFunction,false
-org/apache/geode/management/internal/cli/functions/DestroyDiskStoreFunction,true,1
-org/apache/geode/management/internal/cli/functions/DestroyIndexFunction,true,1
-org/apache/geode/management/internal/cli/functions/ExportConfigFunction,true,1
-org/apache/geode/management/internal/cli/functions/ExportDataFunction,true,1
-org/apache/geode/management/internal/cli/functions/ExportSharedConfigurationFunction,true,1
-org/apache/geode/management/internal/cli/functions/FetchRegionAttributesFunction,true,4366812590788342070
-org/apache/geode/management/internal/cli/functions/FetchRegionAttributesFunction$FetchRegionAttributesFunctionResult,true,-3970828263897978845,cacheListenerClasses:java/lang/String[],cacheLoaderClass:java/lang/String,cacheWriterClass:java/lang/String,regionAttributes:org/apache/geode/cache/RegionAttributes
-org/apache/geode/management/internal/cli/functions/FetchSharedConfigurationStatusFunction,true,1
-org/apache/geode/management/internal/cli/functions/GarbageCollectionFunction,true,1
-org/apache/geode/management/internal/cli/functions/GatewayReceiverCreateFunction,true,8746830191680509335
-org/apache/geode/management/internal/cli/functions/GatewayReceiverFunctionArgs,true,-5158224572470173267,bindAddress:java/lang/String,endPort:java/lang/Integer,gatewayTransportFilters:java/lang/String[],manualStart:java/lang/Boolean,maximumTimeBetweenPings:java/lang/Integer,socketBufferSize:java/lang/Integer,startPort:java/lang/Integer
-org/apache/geode/management/internal/cli/functions/GatewaySenderCreateFunction,true,8746830191680509335
-org/apache/geode/management/internal/cli/functions/GatewaySenderFunctionArgs,true,-5158224572470173267,alertThreshold:java/lang/Integer,batchSize:java/lang/Integer,batchTimeInterval:java/lang/Integer,diskStoreName:java/lang/String,diskSynchronous:java/lang/Boolean,dispatcherThreads:java/lang/Integer,enableBatchConflation:java/lang/Boolean,enablePersistence:java/lang/Boolean,gatewayEventFilters:java/lang/String[],gatewayTransportFilters:java/lang/String[],id:java/lang/String,manualStart:java/lang/Boolean,maxQueueMemory:java/lang/Integer,orderPolicy:java/lang/String,parallel:java/lang/Boolean,remoteDSId:java/lang/Integer,socketBufferSize:java/lang/Integer,socketReadTimeout:java/lang/Integer
-org/apache/geode/management/internal/cli/functions/GetMemberConfigInformationFunction,true,1
-org/apache/geode/management/internal/cli/functions/GetMemberInformationFunction,true,1
-org/apache/geode/management/internal/cli/functions/GetRegionDescriptionFunction,true,1
-org/apache/geode/management/internal/cli/functions/GetRegionsFunction,true,1
-org/apache/geode/management/internal/cli/functions/GetStackTracesFunction,true,1
-org/apache/geode/management/internal/cli/functions/GetSubscriptionQueueSizeFunction,true,1
-org/apache/geode/management/internal/cli/functions/ImportDataFunction,true,1
-org/apache/geode/management/internal/cli/functions/ImportSharedConfigurationArtifactsFunction,true,1
-org/apache/geode/management/internal/cli/functions/ListAsyncEventQueuesFunction,true,1
-org/apache/geode/management/internal/cli/functions/ListDeployedFunction,true,1
-org/apache/geode/management/internal/cli/functions/ListDiskStoresFunction,false
-org/apache/geode/management/internal/cli/functions/ListDurableCqNamesFunction,true,1
-org/apache/geode/management/internal/cli/functions/ListFunctionFunction,true,1
-org/apache/geode/management/internal/cli/functions/ListIndexFunction,false
-org/apache/geode/management/internal/cli/functions/LoadSharedConfigurationFunction,true,1
-org/apache/geode/management/internal/cli/functions/LogFileFunction,true,1
-org/apache/geode/management/internal/cli/functions/MemberRegionFunction,true,1
-org/apache/geode/management/internal/cli/functions/MembersForRegionFunction,true,8746830191680509335
-org/apache/geode/management/internal/cli/functions/NetstatFunction,true,1
-org/apache/geode/management/internal/cli/functions/NetstatFunction$NetstatFunctionArgument,true,1,lineSeparator:java/lang/String,withlsof:boolean
-org/apache/geode/management/internal/cli/functions/NetstatFunction$NetstatFunctionResult,true,1,compressedBytes:org/apache/geode/management/internal/cli/CliUtil$DeflaterInflaterData,headerInfo:java/lang/String,host:java/lang/String
-org/apache/geode/management/internal/cli/functions/RebalanceFunction,true,1
-org/apache/geode/management/internal/cli/functions/RegionAlterFunction,true,-4846425364943216425
-org/apache/geode/management/internal/cli/functions/RegionCreateFunction,true,8746830191680509335
-org/apache/geode/management/internal/cli/functions/RegionDestroyFunction,true,9172773671865750685
-org/apache/geode/management/internal/cli/functions/RegionFunctionArgs,true,-5158224572470173267,asyncEventQueueIds:java/util/Set,cacheListeners:java/util/Set,cacheLoader:java/lang/String,cacheWriter:java/lang/String,cloningEnabled:java/lang/Boolean,compressor:java/lang/String,concurrencyChecksEnabled:java/lang/Boolean,concurrencyLevel:java/lang/Integer,diskStore:java/lang/String,diskSynchronous:java/lang/Boolean,enableAsyncConflation:java/lang/Boolean,enableSubscriptionConflation:java/lang/Boolean,entryExpirationIdleTime:org/apache/geode/management/internal/cli/functions/RegionFunctionArgs$ExpirationAttrs,entryExpirationTTL:org/apache/geode/management/internal/cli/functions/RegionFunctionArgs$ExpirationAttrs,evictionMax:java/lang/Integer,gatewaySenderIds:java/util/Set,isPartitionResolver:boolean,isSetCloningEnabled:boolean,isSetCompressor:boolean,isSetConcurrencyChecksEnabled:boolean,isSetConcurrencyLevel:boolean,isSetDiskSynchronous:boolean,isSetEnableAsyncConflation:boolean,isSetE
 nableSubscriptionConflation:boolean,isSetMcastEnabled:boolean,isSetOffHeap:boolean,isSetStatisticsEnabled:boolean,keyConstraint:java/lang/String,mcastEnabled:java/lang/Boolean,offHeap:java/lang/Boolean,partitionArgs:org/apache/geode/management/internal/cli/functions/RegionFunctionArgs$PartitionArgs,partitionResolver:java/lang/String,regionAttributes:org/apache/geode/cache/RegionAttributes,regionExpirationIdleTime:org/apache/geode/management/internal/cli/functions/RegionFunctionArgs$ExpirationAttrs,regionExpirationTTL:org/apache/geode/management/internal/cli/functions/RegionFunctionArgs$ExpirationAttrs,regionPath:java/lang/String,regionShortcut:org/apache/geode/cache/RegionShortcut,skipIfExists:java/lang/Boolean,statisticsEnabled:java/lang/Boolean,useAttributesFrom:java/lang/String,valueConstraint:java/lang/String
-org/apache/geode/management/internal/cli/functions/RegionFunctionArgs$ExpirationAttrs,true,1474255033398008062,action:org/apache/geode/cache/ExpirationAction,time:java/lang/Integer,type:org/apache/geode/management/internal/cli/functions/RegionFunctionArgs$ExpirationAttrs$ExpirationFor
-org/apache/geode/management/internal/cli/functions/RegionFunctionArgs$ExpirationAttrs$ExpirationFor,false
-org/apache/geode/management/internal/cli/functions/RegionFunctionArgs$PartitionArgs,true,5907052187323280919,hasPartitionAttributes:boolean,isPartitionResolver:boolean,isSetPRLocalMaxMemory:boolean,isSetPRRecoveryDelay:boolean,isSetPRRedundantCopies:boolean,isSetPRStartupRecoveryDelay:boolean,isSetPRTotalMaxMemory:boolean,isSetPRTotalNumBuckets:boolean,partitionResolver:java/lang/String,prColocatedWith:java/lang/String,prLocalMaxMemory:int,prRecoveryDelay:long,prRedundantCopies:int,prStartupRecoveryDelay:long,prTotalMaxMemory:long,prTotalNumBuckets:int,userSpecifiedPartitionAttributes:java/util/Set
-org/apache/geode/management/internal/cli/functions/ShowMissingDiskStoresFunction,false
-org/apache/geode/management/internal/cli/functions/ShutDownFunction,true,1
-org/apache/geode/management/internal/cli/functions/UndeployFunction,true,1
-org/apache/geode/management/internal/cli/functions/UnregisterFunction,true,1
-org/apache/geode/management/internal/cli/functions/UserFunctionExecution,true,1
-org/apache/geode/management/internal/cli/json/GfJsonException,true,36449998984143318
-org/apache/geode/management/internal/cli/multistep/CLIMultiStepHelper$RemoteStep,false,commandArguments:java/lang/Object[],name:java/lang/String
-org/apache/geode/management/internal/cli/multistep/CLIMultiStepHelper$StepExecutionException,true,1,message:java/lang/String
-org/apache/geode/management/internal/cli/multistep/CLIStepExecption,false,result:org/apache/geode/management/cli/Result
-org/apache/geode/management/internal/cli/result/CommandResultException,true,1,result:org/apache/geode/management/cli/Result
-org/apache/geode/management/internal/cli/result/ResultDataException,true,3851919811942980944
-org/apache/geode/management/internal/cli/result/TableBuilder$Align,false
-org/apache/geode/management/internal/cli/result/TableBuilderHelper$TooManyColumnsException,false
-org/apache/geode/management/internal/cli/shell/JMXConnectionException,true,3872374016604940917,exceptionType:int
-org/apache/geode/management/internal/cli/shell/JMXInvocationException,true,-4265451314790394366
-org/apache/geode/management/internal/cli/shell/jline/ANSIHandler$ANSIStyle,false
-org/apache/geode/management/internal/cli/util/DiskStoreNotFoundException,false
-org/apache/geode/management/internal/cli/util/EvictionAttributesInfo,true,1,evictionAction:java/lang/String,evictionAlgorithm:java/lang/String,evictionMaxValue:int
-org/apache/geode/management/internal/cli/util/FixedPartitionAttributesInfo,false,isPrimary:boolean,numBuckets:int,partitionName:java/lang/String
-org/apache/geode/management/internal/cli/util/JConsoleNotFoundException,false
-org/apache/geode/management/internal/cli/util/MemberInformation,true,1,cacheXmlFilePath:java/lang/String,cpuUsage:java/lang/String,groups:java/lang/String,heapUsage:java/lang/String,host:java/lang/String,id:java/lang/String,initHeapSize:java/lang/String,locatorBindAddress:java/lang/String,locatorPort:int,locators:java/lang/String,logFilePath:java/lang/String,maxHeapSize:java/lang/String,name:java/lang/String,processId:java/lang/String,serverBindAddress:java/lang/String,statArchiveFilePath:java/lang/String,workingDirPath:java/lang/String
-org/apache/geode/management/internal/cli/util/MemberNotFoundException,false
-org/apache/geode/management/internal/cli/util/VisualVmNotFoundException,false
-org/apache/geode/management/internal/configuration/domain/SharedConfigurationStatus,false
-org/apache/geode/management/internal/configuration/functions/AddJarFunction,true,1
-org/apache/geode/management/internal/configuration/functions/AddXmlEntityFunction,true,1
-org/apache/geode/management/internal/configuration/functions/DeleteJarFunction,true,1
-org/apache/geode/management/internal/configuration/functions/DeleteXmlEntityFunction,true,1
-org/apache/geode/management/internal/configuration/functions/GetAllJarsFunction,true,1
-org/apache/geode/management/internal/configuration/functions/ModifyPropertiesFunction,true,1
-org/apache/geode/management/internal/web/domain/Link,false,href:java/net/URI,method:org/apache/geode/management/internal/web/http/HttpMethod,relation:java/lang/String
-org/apache/geode/management/internal/web/domain/QueryParameterSource,true,34131123582155,objectName:javax/management/ObjectName,queryExpression:javax/management/QueryExp
-org/apache/geode/management/internal/web/http/HttpHeader,false,name:java/lang/String
-org/apache/geode/management/internal/web/http/HttpMethod,false
-org/apache/geode/management/internal/web/shell/MBeanAccessException,false
-org/apache/geode/management/internal/web/shell/RestApiCallForCommandNotFoundException,false
-org/apache/geode/memcached/GemFireMemcachedServer$Protocol,false
-org/apache/geode/pdx/FieldType,false,defaultSerializedValue:java/nio/ByteBuffer,defaultValue:java/lang/Object,isFixedWidth:boolean,name:java/lang/String,width:int
-org/apache/geode/pdx/JSONFormatter$states,false
-org/apache/geode/pdx/JSONFormatterException,true,1
-org/apache/geode/pdx/NonPortableClassException,true,-743743189068362837
-org/apache/geode/pdx/PdxConfigurationException,true,-2329989020829052537
-org/apache/geode/pdx/PdxFieldAlreadyExistsException,true,-6989799940994503713
-org/apache/geode/pdx/PdxFieldDoesNotExistException,true,1617023951410281507
-org/apache/geode/pdx/PdxFieldTypeMismatchException,true,-829617162170742740
-org/apache/geode/pdx/PdxInitializationException,true,5098737377658808834
-org/apache/geode/pdx/PdxRegistryMismatchException,true,-2329989020829052537
-org/apache/geode/pdx/PdxSerializationException,true,-3843814927034345635
-org/apache/geode/pdx/internal/AutoSerializableManager$1,false,this$0:org/apache/geode/pdx/internal/AutoSerializableManager
-org/apache/geode/pdx/internal/EnumInfo$PdxInstanceEnumInfo,true,7907582104525106416,ei:org/apache/geode/pdx/internal/EnumInfo,enumId:int
-org/apache/geode/pdx/internal/FieldNotFoundInPdxVersion,true,1292033563588485577
-org/apache/geode/pdx/internal/PdxInputStream,false
-org/apache/geode/pdx/internal/PdxInstanceEnum,true,-7417287878052772302,className:java/lang/String,enumName:java/lang/String,enumOrdinal:int
-org/apache/geode/pdx/internal/PdxInstanceImpl,true,-1669268527103938431
-org/apache/geode/pdx/internal/PdxInstanceInputStream,false
-org/apache/geode/pdx/internal/PdxReaderImpl,true,-6094553093860427759,blobType:org/apache/geode/pdx/internal/PdxType,dis:org/apache/geode/pdx/internal/PdxInputStream
-org/apache/geode/pdx/internal/WritablePdxInstanceImpl,true,7398999150097596214,dirtyFields:java/lang/Object[]
-org/apache/geode/redis/internal/RedisCommandParserException,true,4707944288714910949
-org/apache/geode/redis/internal/RedisCommandType,false
-org/apache/geode/redis/internal/RedisCommandType$1,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$10,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$100,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$101,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$102,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$103,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$104,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$105,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$106,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$107,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$108,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$109,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$11,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$110,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$111,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$112,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$113,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$12,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$13,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$14,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$15,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$16,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$17,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$18,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$19,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$2,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$20,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$21,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$22,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$23,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$24,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$25,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$26,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$27,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$28,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$29,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$3,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$30,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$31,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis/internal/Executor
-org/apache/geode/redis/internal/RedisCommandType$32,false,dataType:org/apache/geode/redis/internal/RedisDataType,executor:org/apache/geode/redis

<TRUNCATED>


[04/31] incubator-geode git commit: GEODE-2011 Removed flaky mark from test.

Posted by ab...@apache.org.
GEODE-2011 Removed flaky mark from test.


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

Branch: refs/heads/feature/GEODE-2156
Commit: 918e6cfd58c9086b11f993d2b685895d7bb67f9f
Parents: 9de8732
Author: Hitesh Khamesra <hk...@pivotal.io>
Authored: Wed Nov 30 10:58:35 2016 -0800
Committer: Hitesh Khamesra <hk...@pivotal.io>
Committed: Wed Nov 30 10:59:30 2016 -0800

----------------------------------------------------------------------
 .../test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java    | 1 -
 1 file changed, 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/918e6cfd/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
index cd927a8..7fd6cf2 100644
--- a/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
@@ -188,7 +188,6 @@ public class PdxClientServerDUnitTest extends JUnit4CacheTestCase {
   /**
    * Test of bug 47338 - what happens to the client type registry if the server is restarted.
    */
-  @Category(FlakyTest.class) // GEODE-2011
   @Test
   public void testNonPersistentServerRestartAutoSerializer() {
     Host host = Host.getHost(0);


[07/31] incubator-geode git commit: GEODE-1931: Refactored tests to use Awaitility and lambdas instead of Wait.pause and WaitCriterion

Posted by ab...@apache.org.
GEODE-1931: Refactored tests to use Awaitility and lambdas instead of Wait.pause and WaitCriterion


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

Branch: refs/heads/feature/GEODE-2156
Commit: f0e5159c2cd3b00a3d5e43e2e9b58ca8b430adea
Parents: ef7bb32
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Wed Nov 30 09:52:58 2016 -0800
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Wed Nov 30 15:31:59 2016 -0800

----------------------------------------------------------------------
 .../geode/distributed/LocatorDUnitTest.java     | 810 ++++++++-----------
 .../LocatorUDPSecurityDUnitTest.java            |  49 +-
 2 files changed, 338 insertions(+), 521 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0e5159c/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
index 10c9238..3b8c406 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
@@ -14,19 +14,36 @@
  */
 package org.apache.geode.distributed;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
-
-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 org.junit.Test;
-import org.junit.experimental.categories.Category;
-
+import static org.apache.geode.distributed.ConfigurationProperties.DISABLE_AUTO_RECONNECT;
+import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION;
+import static org.apache.geode.distributed.ConfigurationProperties.ENABLE_NETWORK_PARTITION_DETECTION;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_LEVEL;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_TTL;
+import static org.apache.geode.distributed.ConfigurationProperties.MEMBER_TIMEOUT;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_PEER_AUTHENTICATOR;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_PEER_AUTH_INIT;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_CIPHERS;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_ENABLED_COMPONENTS;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE_PASSWORD;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_KEYSTORE_TYPE;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_LOCATOR_ALIAS;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_PROTOCOLS;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_REQUIRE_AUTHENTICATION;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE;
+import static org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE_PASSWORD;
+import static org.apache.geode.distributed.ConfigurationProperties.START_LOCATOR;
+import static org.apache.geode.distributed.ConfigurationProperties.USE_CLUSTER_CONFIGURATION;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import com.jayway.awaitility.Awaitility;
 import org.apache.geode.ForcedDisconnectException;
 import org.apache.geode.GemFireConfigException;
 import org.apache.geode.LogWriter;
@@ -35,7 +52,6 @@ import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.CacheFactory;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.distributed.internal.DistributionException;
 import org.apache.geode.distributed.internal.DistributionManager;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
@@ -63,10 +79,21 @@ import org.apache.geode.test.dunit.NetworkUtils;
 import org.apache.geode.test.dunit.SerializableRunnable;
 import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.dunit.Wait;
-import org.apache.geode.test.dunit.WaitCriterion;
 import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.*;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
 import org.apache.geode.util.test.TestUtil;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+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 java.util.concurrent.TimeUnit;
 
 /**
  * Tests the ability of the {@link Locator} API to start and stop locators running in remote VMs.
@@ -190,45 +217,23 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
     service.becomeLockGrantor();
     service.lock("foo0", 0, 0);
 
-    vm1.invoke(new SerializableRunnable("get the lock service and lock something") {
-      public void run() {
-        final DistributedLockService service =
-            DistributedLockService.create("test service", system);
-        service.lock("foo1", 0, 0);
-      }
-    });
+    vm1.invoke("get the lock service and lock something",
+        () -> DistributedLockService.create("test service", system).lock("foo1", 0, 0));
 
-    vm2.invoke(new SerializableRunnable("get the lock service and lock something") {
-      public void run() {
-        final DistributedLockService service =
-            DistributedLockService.create("test service", system);
-        service.lock("foo2", 0, 0);
-      }
-    });
+    vm2.invoke("get the lock service and lock something",
+        () -> DistributedLockService.create("test service", system).lock("foo2", 0, 0));
 
     // cause elder failover. vm1 will become the lock grantor
     system.disconnect();
 
     try {
-      vm1.invoke(new SerializableRunnable("ensure grantor failover") {
-        public void run() {
-          final DistributedLockService service =
-              DistributedLockService.getServiceNamed("test service");
-          service.lock("foo3", 0, 0);
-          Wait.waitForCriterion(new WaitCriterion() {
-            @Override
-            public boolean done() {
-              return service.isLockGrantor();
-            }
-
-            @Override
-            public String description() {
-              return "waiting to become lock grantor after shutting down locator/grantor";
-            }
-
-          }, DistributionConfig.DEFAULT_MEMBER_TIMEOUT * 2, 1000, true);
-          assertTrue(service.isLockGrantor());
-        }
+      vm1.invoke("ensure grantor failover", () -> {
+        DistributedLockService serviceNamed =
+            DistributedLockService.getServiceNamed("test service");
+        serviceNamed.lock("foo3", 0, 0);
+        Awaitility.waitAtMost(10000, TimeUnit.MILLISECONDS).pollInterval(200, TimeUnit.MILLISECONDS)
+            .until(() -> serviceNamed.isLockGrantor());
+        assertTrue(serviceNamed.isLockGrantor());
       });
 
       properties.put(START_LOCATOR, locators);
@@ -248,12 +253,8 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
       service = DistributedLockService.create("test service", system);
 
       // now force a non-elder VM to get a lock. This will hang if the bug is not fixed
-      vm2.invoke(new SerializableRunnable("get the lock service and lock something") {
-        public void run() {
-          final DistributedLockService service =
-              DistributedLockService.getServiceNamed("test service");
-          service.lock("foo4", 0, 0);
-        }
+      vm2.invoke("get the lock service and lock something", () -> {
+        DistributedLockService.getServiceNamed("test service").lock("foo4", 0, 0);
       });
 
       assertFalse("should not have become lock grantor", service.isLockGrantor());
@@ -261,13 +262,8 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
       // Now demonstrate that a new member can join and use the lock service
       properties.remove(START_LOCATOR);
       vm3.invoke(startSystem);
-      vm3.invoke(new SerializableRunnable("get the lock service and lock something(2)") {
-        public void run() {
-          final DistributedLockService service =
-              DistributedLockService.create("test service", system);
-          service.lock("foo5", 0, 0);
-        }
-      });
+      vm3.invoke("get the lock service and lock something(2)",
+          () -> DistributedLockService.create("test service", system).lock("foo5", 0, 0));
 
     } finally {
       disconnectAllFromDS();
@@ -279,8 +275,6 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
    * split-brain configuration. To work around this we have always told customers that they need to
    * stagger the starting of locators. This test configures two locators to start up simultaneously
    * and shows that they find each other and form a single system.
-   * 
-   * @throws Exception
    */
   @Category(FlakyTest.class) // GEODE-1931
   @Test
@@ -308,19 +302,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
     properties.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
     properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
     addDSProps(properties);
-    try {
-      loc2.invoke("startLocator2", () -> startLocatorWithPortAndProperties(port2, properties));
-      loc1.invoke("startLocator1", () -> startLocatorWithPortAndProperties(port1, properties));
-    } finally {
-      try {
-        // verify that they found each other
-        loc2.invoke("verifyLocatorNotInSplitBrain", () -> verifyLocatorNotInSplitBrain(2));
-        loc1.invoke("verifyLocatorNotInSplitBrain", () -> verifyLocatorNotInSplitBrain(2));
-      } finally {
-        loc2.invoke("stop locator", () -> stopLocator());
-        loc1.invoke("stop locator", () -> stopLocator());
-      }
-    }
+    startVerifyAndStopLocator(loc1, loc2, port1, port2, properties);
   }
 
   private Boolean startLocatorWithPortAndProperties(final int port, final Properties properties)
@@ -384,19 +366,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
     properties.put(SSL_TRUSTSTORE_PASSWORD, "password");
     properties.put(SSL_ENABLED_COMPONENTS, SecurableCommunicationChannel.LOCATOR.getConstant());
 
-    try {
-      loc2.invoke("startLocator2", () -> startLocatorWithPortAndProperties(port2, properties));
-      loc1.invoke("startLocator1", () -> startLocatorWithPortAndProperties(port1, properties));
-    } finally {
-      try {
-        // verify that they found each other
-        loc2.invoke("verifyLocatorNotInSplitBrain", () -> verifyLocatorNotInSplitBrain(2));
-        loc1.invoke("verifyLocatorNotInSplitBrain", () -> verifyLocatorNotInSplitBrain(2));
-      } finally {
-        loc2.invoke("stop locator", () -> stopLocator());
-        loc1.invoke("stop locator", () -> stopLocator());
-      }
-    }
+    startVerifyAndStopLocator(loc1, loc2, port1, port2, properties);
   }
 
   @Test
@@ -433,7 +403,11 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
     properties.put(SSL_LOCATOR_ALIAS, "locatorkey");
     properties.put(SSL_ENABLED_COMPONENTS, SecurableCommunicationChannel.LOCATOR.getConstant());
 
+    startVerifyAndStopLocator(loc1, loc2, port1, port2, properties);
+  }
 
+  private void startVerifyAndStopLocator(VM loc1, VM loc2, int port1, int port2,
+      Properties properties) {
     try {
       loc2.invoke("startLocator2", () -> startLocatorWithPortAndProperties(port2, properties));
       loc1.invoke("startLocator1", () -> startLocatorWithPortAndProperties(port1, properties));
@@ -500,13 +474,6 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
     }
   }
 
-  private void stopLocator() {
-    Locator loc = Locator.getLocator();
-    if (loc != null) {
-      loc.stop();
-    }
-  }
-
   @Test
   public void testStartTwoLocatorsOneWithNonSSLAndTheOtherSSL() throws Exception {
     IgnoredException.addIgnoredException("Remote host closed connection during handshake");
@@ -538,7 +505,6 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
     properties.put(SSL_CIPHERS, "any");
     properties.put(SSL_PROTOCOLS, "any");
 
-
     try {
       loc1.invoke("start Locator1", () -> startLocator(port1, properties));
       loc1.invoke("verifyLocatorNotInSplitBrain", () -> verifyLocatorNotInSplitBrain(1));
@@ -691,7 +657,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
       assertLeadMember(mem1, sys, 5000);
 
       // after disconnecting the first vm, the second one should become the leader
-      vm1.invoke(getDisconnectRunnable(locators));
+      vm1.invoke(() -> disconnectDistributedSystem());
       MembershipManagerHelper.getMembershipManager(sys).waitForDeparture(mem1);
       assertLeadMember(mem2, sys, 5000);
 
@@ -699,15 +665,15 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
       mem1 = (DistributedMember) vm1.invoke(this.getClass(), "getDistributedMember", connectArgs);
       assertLeadMember(mem2, sys, 5000);
 
-      vm2.invoke(getDisconnectRunnable(locators));
+      vm2.invoke(() -> disconnectDistributedSystem());
       MembershipManagerHelper.getMembershipManager(sys).waitForDeparture(mem2);
       assertLeadMember(mem3, sys, 5000);
 
-      vm1.invoke(getDisconnectRunnable(locators));
+      vm1.invoke(() -> disconnectDistributedSystem());
       MembershipManagerHelper.getMembershipManager(sys).waitForDeparture(mem1);
       assertLeadMember(mem3, sys, 5000);
 
-      vm3.invoke(getDisconnectRunnable(locators));
+      vm3.invoke(() -> disconnectDistributedSystem());
       MembershipManagerHelper.getMembershipManager(sys).waitForDeparture(mem3);
       assertLeadMember(null, sys, 5000);
 
@@ -718,20 +684,14 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
 
   private void assertLeadMember(final DistributedMember member, final DistributedSystem sys,
       long timeout) {
-    WaitCriterion ev = new WaitCriterion() {
-      public boolean done() {
-        DistributedMember lead = MembershipManagerHelper.getLeadMember(sys);
-        if (member != null) {
-          return member.equals(lead);
-        }
-        return (lead == null);
-      }
-
-      public String description() {
-        return null;
-      }
-    };
-    Wait.waitForCriterion(ev, timeout, 200, true);
+    Awaitility.waitAtMost(timeout, TimeUnit.MILLISECONDS).pollInterval(200, TimeUnit.MILLISECONDS)
+        .until(() -> {
+          DistributedMember lead = MembershipManagerHelper.getLeadMember(sys);
+          if (member != null) {
+            return member.equals(lead);
+          }
+          return (lead == null);
+        });
   }
 
   /**
@@ -843,16 +803,12 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
 
       org.apache.geode.test.dunit.LogWriterUtils.getLogWriter()
           .info("waiting for my distributed system to disconnect due to partition detection");
-      WaitCriterion ev = new WaitCriterion() {
-        public boolean done() {
-          return !sys.isConnected();
-        }
 
-        public String description() {
-          return null;
-        }
-      };
-      Wait.waitForCriterion(ev, 12 * 2000, 200, true);
+      Awaitility.waitAtMost(24000, TimeUnit.MILLISECONDS).pollInterval(200, TimeUnit.MILLISECONDS)
+          .until(() -> {
+            return !sys.isConnected();
+          });
+
       if (sys.isConnected()) {
         fail(
             "Distributed system did not disconnect as expected - network partition detection is broken");
@@ -912,7 +868,6 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
     properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
 
     addDSProps(properties);
-    SerializableRunnable stopLocator = getStopLocatorRunnable();
 
     try {
       final String uname = getUniqueName();
@@ -962,7 +917,8 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
       // crash the lead vm. Should be okay
       vm1.invoke(crashSystem);
 
-      Wait.pause(4 * 2000); // 4 x the member-timeout
+      Awaitility.waitAtMost(4 * 2000, TimeUnit.MILLISECONDS)
+          .pollInterval(200, TimeUnit.MILLISECONDS).until(() -> isSystemConnected());
 
       assertTrue("Distributed system should not have disconnected", isSystemConnected());
 
@@ -1005,15 +961,15 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
 
       // disconnect the first vm and demonstrate that the third vm and the
       // locator notice the failure and exit
-      vm2.invoke(getDisconnectRunnable(locators));
-      locvm.invoke(stopLocator);
+      vm2.invoke(() -> disconnectDistributedSystem());
+      locvm.invoke(() -> stopLocator());
     } finally {
       MembershipManagerHelper.inhibitForcedDisconnectLogging(false);
       if (locator != null) {
         locator.stop();
       }
       try {
-        locvm.invoke(stopLocator);
+        locvm.invoke(() -> stopLocator());
       } catch (Exception e) {
         org.apache.geode.test.dunit.LogWriterUtils.getLogWriter()
             .severe("failed to stop locator in vm 3", e);
@@ -1061,21 +1017,18 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
     properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
 
     addDSProps(properties);
-    SerializableRunnable stopLocator = getStopLocatorRunnable();
 
     try {
       final String uname = getUniqueName();
       File logFile = new File("");
       locator = Locator.startLocatorAndDS(port1, logFile, properties);
       DistributedSystem sys = locator.getDistributedSystem();
-      locvm.invoke(new SerializableRunnable() {
-        public void run() {
-          File lf = new File("");
-          try {
-            Locator.startLocatorAndDS(port2, lf, properties);
-          } catch (IOException ios) {
-            org.apache.geode.test.dunit.Assert.fail("Unable to start locator2", ios);
-          }
+      locvm.invoke(() -> {
+        File lf = new File("");
+        try {
+          Locator.startLocatorAndDS(port2, lf, properties);
+        } catch (IOException ios) {
+          org.apache.geode.test.dunit.Assert.fail("Unable to start locator2", ios);
         }
       });
 
@@ -1161,7 +1114,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
       if (locator != null) {
         locator.stop();
       }
-      locvm.invoke(stopLocator);
+      locvm.invoke(() -> stopLocator());
       assertTrue("locator is not stopped", Locator.getLocators().isEmpty());
     }
   }
@@ -1199,30 +1152,14 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
     properties.put(ENABLE_CLUSTER_CONFIGURATION, "false");
 
     addDSProps(properties);
-    SerializableRunnable disconnect = new SerializableRunnable("Disconnect from " + locators) {
-      public void run() {
-        DistributedSystem sys = InternalDistributedSystem.getAnyInstance();
-        if (sys != null && sys.isConnected()) {
-          sys.disconnect();
-        }
-        MembershipManagerHelper.inhibitForcedDisconnectLogging(false);
-      }
-    };
-    SerializableRunnable expectedException = new SerializableRunnable("Add expected exceptions") {
-      public void run() {
-        MembershipManagerHelper.inhibitForcedDisconnectLogging(true);
-      }
-    };
     try {
       final String uname = getUniqueName();
-      locvm.invoke(new SerializableRunnable() {
-        public void run() {
-          File lf = new File("");
-          try {
-            Locator.startLocatorAndDS(port2, lf, properties);
-          } catch (IOException ios) {
-            org.apache.geode.test.dunit.Assert.fail("Unable to start locator1", ios);
-          }
+      locvm.invoke(() -> {
+        File lf = new File("");
+        try {
+          Locator.startLocatorAndDS(port2, lf, properties);
+        } catch (IOException ios) {
+          org.apache.geode.test.dunit.Assert.fail("Unable to start locator1", ios);
         }
       });
 
@@ -1233,39 +1170,38 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
           "<ExpectedException action=add>org.apache.geode.ForcedDisconnectException</ExpectedException>");
       Object[] connectArgs = new Object[] {properties};
 
-      SerializableRunnable crashLocator = new SerializableRunnable("Crash locator") {
-        public void run() {
-          Locator loc = Locator.getLocators().iterator().next();
-          DistributedSystem msys = loc.getDistributedSystem();
-          msys.getLogWriter()
-              .info("<ExpectedException action=add>service failure</ExpectedException>");
-          msys.getLogWriter().info(
-              "<ExpectedException action=add>org.apache.geode.ForcedDisconnectException</ExpectedException>");
-          msys.getLogWriter().info(
-              "<ExpectedException action=add>org.apache.geode.ConnectException</ExpectedException>");
-          MembershipManagerHelper.crashDistributedSystem(msys);
-          loc.stop();
-        }
-      };
-
       assertTrue(MembershipManagerHelper.getLeadMember(sys) == null);
 
       DistributedMember mem1 =
           (DistributedMember) vm1.invoke(this.getClass(), "getDistributedMember", connectArgs);
-      vm1.invoke(expectedException);
+
+      vm1.invoke(() -> MembershipManagerHelper.inhibitForcedDisconnectLogging(true));
+
       DistributedMember mem2 =
           (DistributedMember) vm2.invoke(this.getClass(), "getDistributedMember", connectArgs);
 
-      DistributedMember loc1Mbr =
-          (DistributedMember) locvm.invoke(() -> this.getLocatorDistributedMember());
+      DistributedMember loc1Mbr = locvm.invoke(() -> this.getLocatorDistributedMember());
 
       assertLeadMember(mem1, sys, 5000);
 
       assertEquals(loc1Mbr, MembershipManagerHelper.getCoordinator(sys));
 
       // crash the lead locator. Should be okay
-      locvm.invoke(crashLocator);
-      Wait.pause(10 * 1000);
+      locvm.invoke("crash locator", () -> {
+        Locator loc = Locator.getLocators().iterator().next();
+        DistributedSystem msys = loc.getDistributedSystem();
+        msys.getLogWriter()
+            .info("<ExpectedException action=add>service failure</ExpectedException>");
+        msys.getLogWriter().info(
+            "<ExpectedException action=add>org.apache.geode.ForcedDisconnectException</ExpectedException>");
+        msys.getLogWriter().info(
+            "<ExpectedException action=add>org.apache.geode.ConnectException</ExpectedException>");
+        MembershipManagerHelper.crashDistributedSystem(msys);
+        loc.stop();
+      });
+
+      Awaitility.waitAtMost(10000, TimeUnit.MILLISECONDS).pollInterval(200, TimeUnit.MILLISECONDS)
+          .until(() -> sys.isConnected());
 
       assertTrue("Distributed system should not have disconnected", sys.isConnected());
 
@@ -1277,8 +1213,10 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
 
       // disconnect the first vm and demonstrate that the non-lead vm and the
       // locator notice the failure and continue to run
-      vm1.invoke(disconnect);
-      Wait.pause(10 * 1000);
+      vm1.invoke(() -> disconnectDistributedSystem());
+
+      Awaitility.waitAtMost(10, TimeUnit.SECONDS).pollInterval(1000, TimeUnit.MILLISECONDS)
+          .until(() -> vm2.invoke(() -> LocatorDUnitTest.isSystemConnected()));
 
       assertTrue("Distributed system should not have disconnected",
           vm2.invoke(() -> LocatorDUnitTest.isSystemConnected()));
@@ -1287,12 +1225,12 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
       assertEquals(mem2, MembershipManagerHelper.getLeadMember(sys));
 
     } finally {
-      vm2.invoke(disconnect);
+      vm2.invoke(() -> disconnectDistributedSystem());
 
       if (locator != null) {
         locator.stop();
       }
-      locvm.invoke(getStopLocatorRunnable());
+      locvm.invoke(() -> stopLocator());
     }
   }
 
@@ -1371,22 +1309,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
     final String locators = NetworkUtils.getServerHostName(host) + "[" + port + "]";
     final String uniqueName = getUniqueName();
 
-    vm0.invoke(new SerializableRunnable("Start locator " + locators) {
-      public void run() {
-        File logFile = new File("");
-        try {
-          Properties locProps = new Properties();
-          locProps.setProperty(MCAST_PORT, "0");
-          locProps.setProperty(MEMBER_TIMEOUT, "1000");
-          locProps.put(ENABLE_CLUSTER_CONFIGURATION, "false");
-
-          addDSProps(locProps);
-          Locator.startLocatorAndDS(port, logFile, locProps);
-        } catch (IOException ex) {
-          org.apache.geode.test.dunit.Assert.fail("While starting locator on port " + port, ex);
-        }
-      }
-    });
+    vm0.invoke("Start locator " + locators, () -> startLocator(port));
     try {
 
       SerializableRunnable connect = new SerializableRunnable("Connect to " + locators) {
@@ -1415,34 +1338,41 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
       org.apache.geode.test.dunit.LogWriterUtils.getLogWriter()
           .info("coordinator before termination of locator is " + coord);
 
-      vm0.invoke(getStopLocatorRunnable());
+      vm0.invoke(() -> stopLocator());
 
       // now ensure that one of the remaining members became the coordinator
-      WaitCriterion ev = new WaitCriterion() {
-        public boolean done() {
-          return !coord.equals(MembershipManagerHelper.getCoordinator(system));
-        }
 
-        public String description() {
-          return "expected the coordinator to not be " + coord + " but it is "
-              + MembershipManagerHelper.getCoordinator(system);
-        }
-      };
-      Wait.waitForCriterion(ev, 15 * 1000, 200, false);
+      Awaitility.waitAtMost(15000, TimeUnit.MILLISECONDS).pollInterval(200, TimeUnit.MILLISECONDS)
+          .until(() -> !coord.equals(MembershipManagerHelper.getCoordinator(system)));
+
       DistributedMember newCoord = MembershipManagerHelper.getCoordinator(system);
-      org.apache.geode.test.dunit.LogWriterUtils.getLogWriter()
-          .info("coordinator after shutdown of locator was " + newCoord);
+      LogWriterUtils.getLogWriter().info("coordinator after shutdown of locator was " + newCoord);
       if (coord.equals(newCoord)) {
         fail("another member should have become coordinator after the locator was stopped");
       }
 
       system.disconnect();
 
-      vm1.invoke(getDisconnectRunnable(locators));
-      vm2.invoke(getDisconnectRunnable(locators));
+      vm1.invoke(() -> disconnectDistributedSystem());
+      vm2.invoke(() -> disconnectDistributedSystem());
 
     } finally {
-      vm0.invoke(getStopLocatorRunnable());
+      vm0.invoke(() -> stopLocator());
+    }
+  }
+
+  protected void startLocator(int port) {
+    File logFile = new File("");
+    try {
+      Properties locProps = new Properties();
+      locProps.setProperty(MCAST_PORT, "0");
+      locProps.setProperty(MEMBER_TIMEOUT, "1000");
+      locProps.put(ENABLE_CLUSTER_CONFIGURATION, "false");
+
+      addDSProps(locProps);
+      Locator.startLocatorAndDS(port, logFile, locProps);
+    } catch (IOException ex) {
+      org.apache.geode.test.dunit.Assert.fail("While starting locator on port " + port, ex);
     }
   }
 
@@ -1469,7 +1399,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
     DistributedTestUtils.deleteLocatorStateFile(port1);
     final String locators = NetworkUtils.getServerHostName(host) + "[" + port + "]";
 
-    vm0.invoke(getStartSBLocatorRunnable(port, getUniqueName() + "1"));
+    vm0.invoke(getUniqueName() + 1, () -> getStartSBLocatorRunnable(port));
     try {
 
       final Properties props = new Properties();
@@ -1478,15 +1408,14 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
       props.put(ENABLE_CLUSTER_CONFIGURATION, "false");
 
       addDSProps(props);
-      SerializableRunnable connect = new SerializableRunnable("Connect to " + locators) {
-        public void run() {
-          // System.setProperty("p2p.joinTimeout", "5000");
-          DistributedSystem sys = getSystem(props);
-          sys.getLogWriter().info(addExpected);
-        }
-      };
-      vm1.invoke(connect);
-      vm2.invoke(connect);
+      vm1.invoke(() -> {
+        DistributedSystem sys = getSystem(props);
+        sys.getLogWriter().info(addExpected);
+      });
+      vm2.invoke(() -> {
+        DistributedSystem sys = getSystem(props);
+        sys.getLogWriter().info(addExpected);
+      });
 
       system = (InternalDistributedSystem) getSystem(props);
 
@@ -1494,23 +1423,14 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
       org.apache.geode.test.dunit.LogWriterUtils.getLogWriter()
           .info("coordinator before termination of locator is " + coord);
 
-      vm0.invoke(getStopLocatorRunnable());
+      vm0.invoke(() -> stopLocator());
 
       // now ensure that one of the remaining members became the coordinator
-      WaitCriterion ev = new WaitCriterion() {
-        public boolean done() {
-          return !coord.equals(MembershipManagerHelper.getCoordinator(system));
-        }
+      Awaitility.waitAtMost(15000, TimeUnit.MILLISECONDS).pollInterval(200, TimeUnit.MILLISECONDS)
+          .until(() -> !coord.equals(MembershipManagerHelper.getCoordinator(system)));
 
-        public String description() {
-          return "expected the coordinator to be " + coord + " but it is "
-              + MembershipManagerHelper.getCoordinator(system);
-        }
-      };
-      Wait.waitForCriterion(ev, 15000, 200, true);
       DistributedMember newCoord = MembershipManagerHelper.getCoordinator(system);
-      org.apache.geode.test.dunit.LogWriterUtils.getLogWriter()
-          .info("coordinator after shutdown of locator was " + newCoord);
+      LogWriterUtils.getLogWriter().info("coordinator after shutdown of locator was " + newCoord);
       if (newCoord == null || coord.equals(newCoord)) {
         fail("another member should have become coordinator after the locator was stopped: "
             + newCoord);
@@ -1519,19 +1439,12 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
       // restart the locator to demonstrate reconnection & make disconnects faster
       // it should also regain the role of coordinator, so we check to make sure
       // that the coordinator has changed
-      vm0.invoke(getStartSBLocatorRunnable(port, getUniqueName() + "2"));
+      vm0.invoke(getUniqueName() + "2", () -> getStartSBLocatorRunnable(port));
 
       final DistributedMember tempCoord = newCoord;
-      ev = new WaitCriterion() {
-        public boolean done() {
-          return !tempCoord.equals(MembershipManagerHelper.getCoordinator(system));
-        }
 
-        public String description() {
-          return null;
-        }
-      };
-      Wait.waitForCriterion(ev, 5000, 200, true);
+      Awaitility.waitAtMost(5000, TimeUnit.MILLISECONDS).pollInterval(200, TimeUnit.MILLISECONDS)
+          .until(() -> !tempCoord.equals(MembershipManagerHelper.getCoordinator(system)));
 
       system.disconnect();
       LogWriter bgexecLogger = new LocalLogWriter(InternalLogWriter.ALL_LEVEL, System.out);
@@ -1539,21 +1452,32 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
 
       SerializableRunnable disconnect = new SerializableRunnable("Disconnect from " + locators) {
         public void run() {
-          DistributedSystem sys = InternalDistributedSystem.getAnyInstance();
-          if (sys != null && sys.isConnected()) {
-            sys.disconnect();
-          }
-          // connectExceptions occur during disconnect, so we need the
-          // expectedexception hint to be in effect until this point
-          LogWriter bLogger = new LocalLogWriter(InternalLogWriter.ALL_LEVEL, System.out);
-          bLogger.info(removeExpected);
+
         }
       };
-      vm1.invoke(disconnect);
-      vm2.invoke(disconnect);
-      vm0.invoke(getStopLocatorRunnable());
+      vm1.invoke(() -> {
+        DistributedSystem sys = InternalDistributedSystem.getAnyInstance();
+        if (sys != null && sys.isConnected()) {
+          sys.disconnect();
+        }
+        // connectExceptions occur during disconnect, so we need the
+        // expectedexception hint to be in effect until this point
+        LogWriter bLogger = new LocalLogWriter(InternalLogWriter.ALL_LEVEL, System.out);
+        bLogger.info(removeExpected);
+      });
+      vm2.invoke(() -> {
+        DistributedSystem sys = InternalDistributedSystem.getAnyInstance();
+        if (sys != null && sys.isConnected()) {
+          sys.disconnect();
+        }
+        // connectExceptions occur during disconnect, so we need the
+        // expectedexception hint to be in effect until this point
+        LogWriter bLogger = new LocalLogWriter(InternalLogWriter.ALL_LEVEL, System.out);
+        bLogger.info(removeExpected);
+      });
+      vm0.invoke(() -> stopLocator());
     } finally {
-      vm0.invoke(getStopLocatorRunnable());
+      vm0.invoke(() -> stopLocator());
     }
 
   }
@@ -1635,48 +1559,31 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
         addDSProps(props);
         system = (InternalDistributedSystem) DistributedSystem.connect(props);
 
-        WaitCriterion ev = new WaitCriterion() {
-          public boolean done() {
-            try {
-              return system.getDM().getViewMembers().size() >= 3;
-            } catch (Exception e) {
-              e.printStackTrace();
-              fail("unexpected exception");
-            }
-            return false; // NOTREACHED
-          }
-
-          public String description() {
-            return null;
-          }
-        };
-        Wait.waitForCriterion(ev, 10 * 1000, 200, true);
+        Awaitility.waitAtMost(10000, TimeUnit.MILLISECONDS).pollInterval(200, TimeUnit.MILLISECONDS)
+            .until(() -> system.getDM().getViewMembers().size() >= 3);
 
         // three applications plus
         assertEquals(5, system.getDM().getViewMembers().size());
 
         system.disconnect();
 
-        vm1.invoke(getDisconnectRunnable(locators));
-        vm2.invoke(getDisconnectRunnable(locators));
+        vm1.invoke(() -> disconnectDistributedSystem());
+        vm2.invoke(() -> disconnectDistributedSystem());
 
       } finally {
-        vm3.invoke(getStopLocatorRunnable());
+        vm3.invoke(() -> stopLocator());
       }
     } finally {
-      vm0.invoke(getStopLocatorRunnable());
+      vm0.invoke(() -> stopLocator());
     }
   }
 
-  SerializableRunnable getDisconnectRunnable(final String locators) {
-    return new SerializableRunnable("Disconnect from " + locators) {
-      public void run() {
-        DistributedSystem sys = InternalDistributedSystem.getAnyInstance();
-        if (sys != null && sys.isConnected()) {
-          sys.disconnect();
-        }
-      }
-    };
+  private void disconnectDistributedSystem() {
+    DistributedSystem sys = InternalDistributedSystem.getAnyInstance();
+    if (sys != null && sys.isConnected()) {
+      sys.disconnect();
+    }
+    MembershipManagerHelper.inhibitForcedDisconnectLogging(false);
   }
 
   /**
@@ -1710,9 +1617,10 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
     dsProps.setProperty(MCAST_PORT, "0");
 
     addDSProps(dsProps);
-    startLocatorSync(vm0, new Object[] {port1, dsProps});
-    startLocatorSync(vm1, new Object[] {port2, dsProps});
-    startLocatorSync(vm2, new Object[] {port3, dsProps});
+    vm0.invoke(() -> startLocatorAsync(new Object[] {port1, dsProps}));
+    vm1.invoke(() -> startLocatorAsync(new Object[] {port2, dsProps}));
+    vm2.invoke(() -> startLocatorAsync(new Object[] {port3, dsProps}));
+
     try {
       try {
         vm3.invoke(() -> {
@@ -1726,46 +1634,34 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
 
         system = (InternalDistributedSystem) DistributedSystem.connect(dsProps);
 
-        WaitCriterion waitCriterion = new WaitCriterion() {
-          public boolean done() {
-            try {
-              return system.getDM().getViewMembers().size() == 6;
-            } catch (Exception e) {
-              e.printStackTrace();
-              org.apache.geode.test.dunit.Assert.fail("unexpected exception", e);
-            }
-            return false; // NOTREACHED
-          }
-
-          public String description() {
-            return null;
-          }
-        };
-        Wait.waitForCriterion(waitCriterion, 10 * 1000, 200, true);
+        Awaitility.waitAtMost(10000, TimeUnit.MILLISECONDS).pollInterval(200, TimeUnit.MILLISECONDS)
+            .until(() -> {
+              try {
+                return system.getDM().getViewMembers().size() == 6;
+              } catch (Exception e) {
+                e.printStackTrace();
+                org.apache.geode.test.dunit.Assert.fail("unexpected exception", e);
+              }
+              return false; // NOTREACHED
+            });
 
         // three applications plus
         assertEquals(6, system.getDM().getViewMembers().size());
 
-        vm0.invoke(getStopLocatorRunnable());
-        vm1.invoke(getStopLocatorRunnable());
-        vm2.invoke(getStopLocatorRunnable());
-
-        waitCriterion = new WaitCriterion() {
-          public boolean done() {
-            try {
-              return system.getDM().getMembershipManager().getView().size() <= 3;
-            } catch (Exception e) {
-              e.printStackTrace();
-              org.apache.geode.test.dunit.Assert.fail("unexpected exception", e);
-            }
-            return false; // NOTREACHED
-          }
-
-          public String description() {
-            return null;
-          }
-        };
-        Wait.waitForCriterion(waitCriterion, 10 * 1000, 200, true);
+        vm0.invoke(() -> stopLocator());
+        vm1.invoke(() -> stopLocator());
+        vm2.invoke(() -> stopLocator());
+
+        Awaitility.waitAtMost(10000, TimeUnit.MILLISECONDS).pollInterval(200, TimeUnit.MILLISECONDS)
+            .until(() -> {
+              try {
+                return system.getDM().getMembershipManager().getView().size() <= 3;
+              } catch (Exception e) {
+                e.printStackTrace();
+                org.apache.geode.test.dunit.Assert.fail("unexpected exception", e);
+              }
+              return false; // NOTREACHED
+            });
 
         final String newLocators = host0 + "[" + port2 + "]," + host0 + "[" + port3 + "]";
         dsProps.setProperty(LOCATORS, newLocators);
@@ -1778,34 +1674,33 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
             + " and vm3's ID is " + vm3ID,
             vm3.invoke(() -> GMSJoinLeaveTestHelper.isViewCreator()));
 
-        startLocatorAsync(vm1, new Object[] {port2, dsProps});
-        startLocatorAsync(vm2, new Object[] {port3, dsProps});
-
-        waitCriterion = new WaitCriterion() {
-          public boolean done() {
-            try {
-              InternalDistributedMember c = GMSJoinLeaveTestHelper.getCurrentCoordinator();
-              if (c.equals(currentCoordinator)) {
-                // now locator should be new coordinator
-                return false;
+        vm1.invoke(() -> startLocatorAsync(new Object[] {port2, dsProps}));
+        vm2.invoke(() -> startLocatorAsync(new Object[] {port3, dsProps}));
+
+        Awaitility.waitAtMost(30000, TimeUnit.MILLISECONDS).pollInterval(200, TimeUnit.MILLISECONDS)
+            .until(() -> {
+              try {
+                InternalDistributedMember c = GMSJoinLeaveTestHelper.getCurrentCoordinator();
+                if (c.equals(currentCoordinator)) {
+                  // now locator should be new coordinator
+                  return false;
+                }
+                return system.getDM().getAllHostedLocators().size() == 2;
+              } catch (Exception e) {
+                e.printStackTrace();
+                org.apache.geode.test.dunit.Assert.fail("unexpected exception", e);
               }
-              return system.getDM().getAllHostedLocators().size() == 2;
-            } catch (Exception e) {
-              e.printStackTrace();
-              org.apache.geode.test.dunit.Assert.fail("unexpected exception", e);
-            }
-            return false; // NOTREACHED
-          }
-
-          public String description() {
-            return null;
-          }
-        };
-        Wait.waitForCriterion(waitCriterion, 30 * 1000, 1000, true);
-        waitUntilLocatorBecomesCoordinator(vm1);
-        waitUntilLocatorBecomesCoordinator(vm2);
-        waitUntilLocatorBecomesCoordinator(vm3);
-        waitUntilLocatorBecomesCoordinator(vm4);
+              return false; // NOTREACHED
+            });
+
+        vm1.invoke("waitUntilLocatorBecomesCoordinator",
+            () -> waitUntilLocatorBecomesCoordinator());
+        vm2.invoke("waitUntilLocatorBecomesCoordinator",
+            () -> waitUntilLocatorBecomesCoordinator());
+        vm3.invoke("waitUntilLocatorBecomesCoordinator",
+            () -> waitUntilLocatorBecomesCoordinator());
+        vm4.invoke("waitUntilLocatorBecomesCoordinator",
+            () -> waitUntilLocatorBecomesCoordinator());
 
         int netviewId =
             vm1.invoke("Checking ViewCreator", () -> GMSJoinLeaveTestHelper.getViewId());
@@ -1830,66 +1725,45 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
 
       } finally {
         system.disconnect();
-        vm3.invoke(getDisconnectRunnable(locators));
-        vm4.invoke(getDisconnectRunnable(locators));
-        vm2.invoke(getStopLocatorRunnable());
-        vm1.invoke(getStopLocatorRunnable());
+        vm3.invoke(() -> disconnectDistributedSystem());
+        vm4.invoke(() -> disconnectDistributedSystem());
+        vm2.invoke(() -> stopLocator());
+        vm1.invoke(() -> stopLocator());
       }
     } finally {
     }
   }
 
-  private void waitUntilLocatorBecomesCoordinator(VM vm) {
-    SerializableRunnable sr = new SerializableRunnable("waitUntilLocatorBecomesCoordinator") {
-
-      @Override
-      public void run() throws Exception {
-        final WaitCriterion waitCriterion = new WaitCriterion() {
-          public boolean done() {
-            try {
-              InternalDistributedMember c = GMSJoinLeaveTestHelper.getCurrentCoordinator();
-              return c.getVmKind() == DistributionManager.LOCATOR_DM_TYPE;
-            } catch (Exception e) {
-              e.printStackTrace();
-              org.apache.geode.test.dunit.Assert.fail("unexpected exception", e);
-            }
-            return false; // NOTREACHED
-          }
-
-          public String description() {
-            return null;
+  private void waitUntilLocatorBecomesCoordinator() {
+    Awaitility.waitAtMost(15000, TimeUnit.MILLISECONDS).pollInterval(200, TimeUnit.MILLISECONDS)
+        .until(() -> {
+          try {
+            InternalDistributedMember c = GMSJoinLeaveTestHelper.getCurrentCoordinator();
+            return c.getVmKind() == DistributionManager.LOCATOR_DM_TYPE;
+          } catch (Exception e) {
+            e.printStackTrace();
+            org.apache.geode.test.dunit.Assert.fail("unexpected exception", e);
           }
-        };
-        Wait.waitForCriterion(waitCriterion, 15 * 1000, 200, true);
-      }
-    };
-    vm.invoke(sr);
+          return false; // NOTREACHED
+        });
   }
 
-  private void startLocatorSync(VM vm, Object[] args) {
-    vm.invoke(new SerializableRunnable("Starting locator process on " + args[0], args) {
-      public void run() {
-        File logFile = new File("");
-        try {
-          Locator.startLocatorAndDS((int) args[0], logFile, (Properties) args[1]);
-        } catch (IOException ex) {
-          org.apache.geode.test.dunit.Assert.fail("While starting process on port " + args[0], ex);
-        }
-      }
-    });
+  private void startLocatorSync(Object[] args) {
+    File logFile = new File("");
+    try {
+      Locator.startLocatorAndDS((int) args[0], logFile, (Properties) args[1]);
+    } catch (IOException ex) {
+      org.apache.geode.test.dunit.Assert.fail("While starting process on port " + args[0], ex);
+    }
   }
 
-  private void startLocatorAsync(VM vm, Object[] args) {
-    vm.invokeAsync(new SerializableRunnable("Starting Locator process async on " + args[0], args) {
-      public void run() {
-        File logFile = new File("");
-        try {
-          Locator.startLocatorAndDS((int) args[0], logFile, (Properties) args[1]);
-        } catch (IOException ex) {
-          org.apache.geode.test.dunit.Assert.fail("While starting process on port " + args[0], ex);
-        }
-      }
-    });
+  private void startLocatorAsync(Object[] args) {
+    File logFile = new File("");
+    try {
+      Locator.startLocatorAndDS((int) args[0], logFile, (Properties) args[1]);
+    } catch (IOException ex) {
+      org.apache.geode.test.dunit.Assert.fail("While starting process on port " + args[0], ex);
+    }
   }
 
   /**
@@ -1899,8 +1773,8 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
   public void testMultipleMcastLocators() throws Exception {
     disconnectAllFromDS();
     IgnoredException.addIgnoredException("Could not stop  Distribution Locator"); // shutdown timing
-                                                                                  // issue in
-                                                                                  // InternalLocator
+    // issue in
+    // InternalLocator
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
     VM vm1 = host.getVM(1);
@@ -1938,8 +1812,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
         }
       }
     });
-    vm3.invoke(new SerializableRunnable("Start locator on " + port2) {
-      public void run() {
+    vm3.invoke("Start locator on " + port2,()->{
         File logFile = new File("");
         try {
           Properties props = new Properties();
@@ -1954,7 +1827,6 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
         } catch (IOException ex) {
           org.apache.geode.test.dunit.Assert.fail("While starting locator on port " + port2, ex);
         }
-      }
     });
 
     SerializableRunnable connect = new SerializableRunnable("Connect to " + locators) {
@@ -1982,29 +1854,23 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
 
       addDSProps(props);
       system = (InternalDistributedSystem) DistributedSystem.connect(props);
-      WaitCriterion ev = new WaitCriterion() {
-        public boolean done() {
-          try {
-            return system.getDM().getViewMembers().size() == 5;
-          } catch (Exception e) {
-            org.apache.geode.test.dunit.Assert.fail("unexpected exception", e);
-          }
-          return false; // NOTREACHED
-        }
 
-        public String description() {
-          return "waiting for 5 members - have " + system.getDM().getViewMembers().size();
-        }
-      };
-      Wait.waitForCriterion(ev, WAIT2_MS, 200, true);
+      Awaitility.waitAtMost(WAIT2_MS, TimeUnit.MILLISECONDS)
+          .pollInterval(200, TimeUnit.MILLISECONDS).until(() -> {
+            try {
+              return system.getDM().getViewMembers().size() == 5;
+            } catch (Exception e) {
+              org.apache.geode.test.dunit.Assert.fail("unexpected exception", e);
+            }
+            return false; // NOTREACHED
+          });
       system.disconnect();
 
-      vm1.invoke(getDisconnectRunnable(locators));
-      vm2.invoke(getDisconnectRunnable(locators));
+      vm1.invoke(() -> disconnectDistributedSystem());
+      vm2.invoke(() -> disconnectDistributedSystem());
     } finally {
-      SerializableRunnable stop = getStopLocatorRunnable();
-      vm0.invoke(stop);
-      vm3.invoke(stop);
+      vm0.invoke(() -> stopLocator());
+      vm3.invoke(() -> stopLocator());
       if (system != null) {
         system.disconnect();
       }
@@ -2045,8 +1911,6 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
   public void testHostingMultipleLocators() throws Exception {
     disconnectAllFromDS();
     Host host = Host.getHost(0);
-    // VM vm = host.getVM(0);
-    // VM vm1 = host.getVM(1);
     int[] randomAvailableTCPPorts = AvailablePortHelper.getRandomAvailableTCPPorts(2);
     port1 = randomAvailableTCPPorts[0];
     File logFile1 = new File("");
@@ -2079,12 +1943,8 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
         }
       };
       connect.run();
-      // vm1.invoke(connect);
-
-      SerializableRunnable disconnect = getDisconnectRunnable(locators);
 
-      disconnect.run();
-      // vm1.invoke(disconnect);
+      disconnectDistributedSystem();
 
     } finally {
       locator1.stop();
@@ -2117,25 +1977,15 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
     Locator locator = Locator.startLocatorAndDS(port1, logFile, p);
     try {
 
-      SerializableRunnable connect =
-          new SerializableRunnable("Connect to locator on port " + port1) {
-            public void run() {
-              DistributedSystem.connect(p);
-            }
-          };
-      vm0.invoke(connect);
+      vm0.invoke(()->DistributedSystem.connect(p));
 
-      org.apache.geode.test.dunit.LogWriterUtils.getLogWriter().info("Stopping locator");
+      LogWriterUtils.getLogWriter().info("Stopping locator");
       locator.stop();
 
-      org.apache.geode.test.dunit.LogWriterUtils.getLogWriter().info("Starting locator");
+      LogWriterUtils.getLogWriter().info("Starting locator");
       locator = Locator.startLocatorAndDS(port1, logFile, p);
 
-      vm0.invoke(new SerializableRunnable("disconnect") {
-        public void run() {
-          DistributedSystem.connect(p).disconnect();
-        }
-      });
+      vm0.invoke("disconnect",()->DistributedSystem.connect(p).disconnect());
 
     } finally {
       locator.stop();
@@ -2172,39 +2022,31 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
     return MembershipManagerHelper.getLeadMember(sys);
   }
 
-  SerializableRunnable getStopLocatorRunnable() {
-    return new SerializableRunnable("stop locator") {
-      public void run() {
-        MembershipManagerHelper.inhibitForcedDisconnectLogging(false);
-        Locator loc = Locator.getLocator();
-        if (loc != null) {
-          loc.stop();
-          assertFalse(Locator.hasLocator());
-        }
-      }
-    };
+  protected void stopLocator() {
+    MembershipManagerHelper.inhibitForcedDisconnectLogging(false);
+    Locator loc = Locator.getLocator();
+    if (loc != null) {
+      loc.stop();
+      assertFalse(Locator.hasLocator());
+    }
   }
 
-  private SerializableRunnable getStartSBLocatorRunnable(final int port, final String name) {
-    return new SerializableRunnable("Start locator on port " + port) {
-      public void run() {
-        File logFile = new File("");
-        try {
-          System.setProperty(InternalLocator.LOCATORS_PREFERRED_AS_COORDINATORS, "true");
-          System.setProperty("p2p.joinTimeout", "1000");
-          Properties locProps = new Properties();
-          locProps.put(MCAST_PORT, "0");
-          locProps.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
-          addDSProps(locProps);
-          Locator.startLocatorAndDS(port, logFile, locProps);
-        } catch (IOException ex) {
-          org.apache.geode.test.dunit.Assert.fail("While starting locator on port " + port, ex);
-        } finally {
-          System.getProperties().remove(InternalLocator.LOCATORS_PREFERRED_AS_COORDINATORS);
-          System.getProperties().remove("p2p.joinTimeout");
-        }
-      }
-    };
+  private void getStartSBLocatorRunnable(final int port) {
+    File logFile = new File("");
+    try {
+      System.setProperty(InternalLocator.LOCATORS_PREFERRED_AS_COORDINATORS, "true");
+      System.setProperty("p2p.joinTimeout", "1000");
+      Properties locProps = new Properties();
+      locProps.put(MCAST_PORT, "0");
+      locProps.put(LOG_LEVEL, LogWriterUtils.getDUnitLogLevel());
+      addDSProps(locProps);
+      Locator.startLocatorAndDS(port, logFile, locProps);
+    } catch (IOException ex) {
+      org.apache.geode.test.dunit.Assert.fail("While starting locator on port " + port, ex);
+    } finally {
+      System.getProperties().remove(InternalLocator.LOCATORS_PREFERRED_AS_COORDINATORS);
+      System.getProperties().remove("p2p.joinTimeout");
+    }
   }
 
   protected void nukeJChannel(DistributedSystem sys) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f0e5159c/geode-core/src/test/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java
index 3246f85..2539fc7 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorUDPSecurityDUnitTest.java
@@ -14,45 +14,38 @@
  */
 package org.apache.geode.distributed;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Properties;
-
-import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.MembershipTest;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
+import static org.apache.geode.distributed.ConfigurationProperties.MEMBER_TIMEOUT;
+import static org.apache.geode.distributed.ConfigurationProperties.SECURITY_UDP_DHALGO;
 
 import org.apache.geode.GemFireConfigException;
-import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.distributed.internal.membership.gms.MembershipManagerHelper;
 import org.apache.geode.internal.AvailablePort;
 import org.apache.geode.test.dunit.DistributedTestUtils;
 import org.apache.geode.test.dunit.Host;
 import org.apache.geode.test.dunit.NetworkUtils;
-import org.apache.geode.test.dunit.SerializableRunnable;
 import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.dunit.Wait;
-import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.junit.categories.DistributedTest;
 import org.apache.geode.test.junit.categories.FlakyTest;
+import org.apache.geode.test.junit.categories.MembershipTest;
+import org.junit.Assert;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import java.util.Properties;
 
 @Category({DistributedTest.class, MembershipTest.class})
 public class LocatorUDPSecurityDUnitTest extends LocatorDUnitTest {
 
   public LocatorUDPSecurityDUnitTest() {}
 
-
   @Override
   protected void addDSProps(Properties p) {
     p.setProperty(SECURITY_UDP_DHALGO, "AES:128");
   }
 
   @Override
-  @Category(FlakyTest.class)
   @Test
   public void testStartTwoLocators() throws Exception {
     super.testStartTwoLocators();
@@ -63,30 +56,12 @@ public class LocatorUDPSecurityDUnitTest extends LocatorDUnitTest {
     disconnectAllFromDS();
     Host host = Host.getHost(0);
     VM vm0 = host.getVM(0);
-    VM vm1 = host.getVM(1);
-    VM vm2 = host.getVM(2);
 
     final int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
     DistributedTestUtils.deleteLocatorStateFile(port1);
     final String locators = NetworkUtils.getServerHostName(host) + "[" + port + "]";
-    final String uniqueName = getUniqueName();
-
-    vm0.invoke(new SerializableRunnable("Start locator " + locators) {
-      public void run() {
-        File logFile = new File("");
-        try {
-          Properties locProps = new Properties();
-          locProps.setProperty(MCAST_PORT, "0");
-          locProps.setProperty(MEMBER_TIMEOUT, "1000");
-          locProps.put(ENABLE_CLUSTER_CONFIGURATION, "false");
 
-          addDSProps(locProps);
-          Locator.startLocatorAndDS(port, logFile, locProps);
-        } catch (IOException ex) {
-          org.apache.geode.test.dunit.Assert.fail("While starting locator on port " + port, ex);
-        }
-      }
-    });
+    vm0.invoke("Start locator " + locators, () -> startLocator(port));
     try {
 
       Properties props = new Properties();
@@ -99,7 +74,7 @@ public class LocatorUDPSecurityDUnitTest extends LocatorDUnitTest {
     } catch (GemFireConfigException gce) {
       Assert.assertTrue(gce.getMessage().contains("Rejecting findCoordinatorRequest"));
     } finally {
-      vm0.invoke(getStopLocatorRunnable());
+      vm0.invoke(() -> stopLocator());
     }
   }
 }


[05/31] incubator-geode git commit: GEODE-2157: Adding a serialVersionUID to PutAllPartialResultException

Posted by ab...@apache.org.
GEODE-2157: Adding a serialVersionUID to PutAllPartialResultException

Adding the serialVersionUID from the old version of this class to
PutAllPartialResultException.


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

Branch: refs/heads/feature/GEODE-2156
Commit: be1d5e31aa0aa41212e269a739cdbeada9e87310
Parents: 918e6cf
Author: Dan Smith <up...@apache.org>
Authored: Wed Nov 30 11:13:23 2016 -0800
Committer: Dan Smith <up...@apache.org>
Committed: Wed Nov 30 11:52:29 2016 -0800

----------------------------------------------------------------------
 .../apache/geode/internal/cache/PutAllPartialResultException.java   | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/be1d5e31/geode-core/src/main/java/org/apache/geode/internal/cache/PutAllPartialResultException.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/cache/PutAllPartialResultException.java b/geode-core/src/main/java/org/apache/geode/internal/cache/PutAllPartialResultException.java
index fa906cd..883b34b 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/cache/PutAllPartialResultException.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/cache/PutAllPartialResultException.java
@@ -31,6 +31,7 @@ import java.util.*;
  */
 public class PutAllPartialResultException extends GemFireException {
 
+  private static final long serialVersionUID = 2411654400733621071L;
   private PutAllPartialResult result;
 
   //////////////////// Constructors ////////////////////


[28/31] incubator-geode git commit: GEODE-2156 Remove incubating references

Posted by ab...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d798c34/geode-pulse/src/main/webapp/clusterDetail.html
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/clusterDetail.html b/geode-pulse/src/main/webapp/clusterDetail.html
index 0b1f562..b1fc1e0 100644
--- a/geode-pulse/src/main/webapp/clusterDetail.html
+++ b/geode-pulse/src/main/webapp/clusterDetail.html
@@ -1,662 +1,662 @@
-<!DOCTYPE html>
-<!--
-  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.
--->
-
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="X-UA-Compatible" content="IE=edge" />
-<meta http-equiv="CACHE-CONTROL" content="NO-CACHE,NO-STORE" />
-<meta http-equiv="PRAGMA" content="NO-CACHE" />
-<meta http-equiv="EXPIRES" content="-1">
-<title>Pulse</title>
-<link href="css/common.css" rel="stylesheet" type="text/css" />
-<link href="css/style.css" rel="stylesheet" type="text/css" />
-
-<!-- fix IE Ui issues-->
-<!--[if IE 7]>
- 	<link href="css/ie/ie7.css" type="text/css" rel="stylesheet"/>
- <![endif]-->
-<!--[if IE 8]>
- 	<link href="css/ie/ie8.css" type="text/css" rel="stylesheet"/>
- <![endif]-->
-<!--[if IE 9]>
- 	<link href="css/ie/ie9.css" type="text/css" rel="stylesheet"/>
- <![endif]-->
-<!-- IE Fix for HTML5 Tags -->
-<!--[if lt IE 9]>
-<script src='scripts/lib/html5.js'></script>
-<script type="text/javascript" src="scripts/lib/excanvas.js"></script>
-<script type="text/javascript"> if (!window.console) console = {log: function() {}}; </script>
-	<![endif]-->
-
-<script type="text/javascript" src='scripts/lib/jquery-1.7.2.js'></script>
-<script type="text/javascript" src='scripts/lib/common.js'></script>
-<script type="text/javascript" src="scripts/lib/jquery.i18n.properties.js"></script>
-<!--Custom Scroll Bar-->
-<!-- styles needed by jScrollPane - include in your own sites -->
-<link type="text/css" href="css/jquery.jscrollpane.css" rel="stylesheet"
-	media="all" />
-<!-- the mousewheel plugin -->
-<script type="text/javascript" src="scripts/lib/jquery.mousewheel.js"></script>
-<!-- the jScrollPane script -->
-<script type="text/javascript" src="scripts/lib/jquery.jscrollpane.js"></script>
-<!-- Rgraph and TreeMap-->
-<link type="text/css" href="css/base.css" rel="stylesheet" />
-<link type="text/css" href="css/Treemap.css" rel="stylesheet" />
-<script type="text/javascript" src="scripts/lib/jit.js"></script>
-<script type="text/javascript" src="scripts/lib/jquery.sparkline.js"></script>
-
-<!-- Grid view CSS and js-->
-<link rel="stylesheet" type="text/css" media="screen" href="css/grid/ui.jqgrid.css" />
-<script src="scripts/lib/grid.locale-en.js" type="text/javascript"></script>
-<script src="scripts/lib/jquery.jqGrid.src.js" type="text/javascript"></script>
-<script src="scripts/lib/jquery.tablednd.js" type="text/javascript"></script>
-<!-- -->
-<!-- jQuery plugin to support automatically updating fuzzy timestamps 
-(e.g. "4 minutes ago" or "about 1 day ago") -->
-<script type="text/javascript" src="scripts/lib/jquery.timeago.js"></script>
-
-<!-- start:Cluster widget based js files -->
-<script type="text/javascript" src="scripts/pulsescript/PulseCallbacks.js"></script>
-<script type="text/javascript" src="scripts/pulsescript/PulseFunctions.js"></script>
-<script type="text/javascript" src='scripts/pulsescript/common.js'></script>
-<script type="text/javascript" src='scripts/pulsescript/clusterRGraphMembers.js'></script>
-<script type="text/javascript" src='scripts/pulsescript/clusterDetail.js'></script>
-
-</head>
-
-
-<body onload="return checkMedia();">
-<!-- Connection lost-->
-<div class="connectionLostMasterBlock hide" id="connectionStatusDiv" >
-<div class="connectionLostInnerBlock">
-    <label id="lblConnectionErrorMsgDiv" class="left">Connecting ...</label>
-    <div class="clear"></div>
-    <div id="connectionErrorMsgDiv" class="right"></div>
-</div>
-</div>
-	<div id="canvasWidth">
-	<!--Top Links-->
-  <div class="headerTopLinksMaster">
-    <div class="right">
-      <div class="left position-relative"><a href="#."class="left headerTopLinks aboutClicked-Off">About</a> 
-        <!-- About Dropdown-->
-        <div id="detailsAbout" class="aboutBlock display-none">
-          <div class="aboutDetailsBlock">
-            <div class="left widthfull-100per marginBottom30">
-              <div class="left"><img data-prod-custom="pulse-aboutimg-custom" src="images/about-geode.png">
-                <div>
-                  <div class="aboutVersionBlock left" id="pulseVersion"></div>
-                  <div class="left termsBlock">&nbsp;<a id="pulseVersionDetailsLink" href="#dialog1" class="display-none" >Version Details</a></div>
-                </div>
-              </div>
-              <div data-prod-custom="pulse-about-custom" class="right aboutText">The Pulse tool monitors Apache Geode system in real time. It provides health information, detailed operational and configuration data, system alerts, throughput performance and statistics for system members and connected clients.</div>
-            </div>
-			<div class="left widthfull-100per copyright">
-				<p>Apache Geode (incubating)<br>
-				Copyright 2016 The Apache Software Foundation.</p>
-				<p>&nbsp;</p>
-				<p>This product includes software developed at
-				The Apache Software Foundation (http://www.apache.org/).</p>
-			</div>
-		</div>
-        </div>
-      </div>
-      <div class="left headerTopSeperator"></div>
-      <div class="left"><a data-prod-custom="pulse-help-custom" target="_blank" href="http://geode.apache.org/docs/guide/tools_modules/pulse/chapter_overview.html" class="left headerTopLinks" class="left headerTopLinks">Help</a></div>
-      <div class="left headerTopSeperator"></div>
-      <div class="left headerTopLinks welcomeLabelPRZero">Welcome</div>
-      <div class="left headerTopLinks textbold font-size12" id="userName"></div>
-      <div class="left headerTopSeperator"></div>
-      <div class="left"><a href="pulse/clusterLogout" class="left headerTopLinks">Sign Out</a></div>
-    </div>
-  </div>
-		<!-- Header block-->
-		<header>
-			<div class="left">
-				<a href="#." onclick="openClusterDetail();" class="left textbold HeaderLink HeaderLinkActive"
-					id="clusterName" ></a>
-			</div>
-			<div class="textbold right logoBlock">
-				<img src="images/apache_geode_logo.png"/>
-				<a href="#.">[LOGO]</a>
-			</div>
-		</header>
-		<div class="clear"></div>
-		<div class="subHeader">
-			<ul>
-				<li><a href="#." class="active" onclick="openClusterDetail();">Cluster View</a></li>
-				<!-- Hide Data Browser tab for gemfirexd (Pulse-Cheetah Release) -->
-				<li><a href="#."  onclick="openDataBrowser();">Data Browser</a></li>
-				<!-- Hide Query Statistics tab for gemfire -->
-				<li id="subTabQueryStatistics"><a href="#." onclick="openQueryStatistics();">Query Statistics</a></li>
-			</ul>
-		<div class="clear"></div>
-		</div>
-		<!-- Middle block-->
-		<div class="left widthfull-100per">
-			<!--Top Right Block 1-->
-			<div class="right widthfull-100per marginTB10">
-                            
-				<!-- Tab-->
-				<div id="notificationsPanel" class="right marginL10 TabTopPanel position-relative" 
-				data-role="widget" data-widgetid="CluserAlertNotification" data-active ="yes" data-timeline="5000">
-				</div>
-				<!-- <div class="right marginL10">
-					<a href="#." class="left linkButton" onclick="openDataView();">Data View</a>
-				</div> -->
-			<!-- </div> -->
-			<!--Middle Block 1-->
-			<div class="left leftBlockCanvas">
-				<!-- Status Block-->
-				<div class="statusmasterBlock left" data-role="widget" data-widgetid="CluserBasicDetails" data-active ="yes" data-timeline="5000">
-					<!--Status Block Normal-->
-					<div class="statusFirstBlock left">
-						<div class="statusMasterBlock" id="clusterStatusIcon">
-							<div class="textbold" id="clusterStatusText"></div>
-							<div class="labeltext">Cluster Status</div>
-						</div>
-					</div>
-					<!-- Deails B1-->
-					<div class="borderRightDarkBlue detailsBlock">
-						<div class="color-d2d5d7 font-size23">
-							<span id="clusterTotalHeap"></span><span
-								class="font-size17 paddingL5">GB</span>
-						</div>
-						<span class="labeltext" >Total Heap</span>
-					</div>
-					<!-- Deails B2-->
-					<div class=" detailsBlock">
-						<div class="color-d2d5d7 font-size23" id="clusterTotalMembersText"></div>
-						<span class="labeltext" >Members</span>
-					</div>
-					<!-- Deails B3-->
-					<div class="detailsBlock">
-						<div class="color-d2d5d7 font-size23" id="clusterServersText"></div>
-						<span class="labeltext" >Servers</span>
-					</div>
-					<!-- Deails B4-->
-					<div class="detailsBlock">
-						<div class="color-d2d5d7 font-size23" id="clusterClientsText"></div>
-						<span class="labeltext" >Clients</span>
-					</div>
-					<!-- Deails B5-->
-					<div class="detailsBlock">
-						<div class="color-d2d5d7 font-size23" id="clusterLocatorsText"></div>
-						<span class="labeltext" >Locators</span>
-					</div>
-					<!-- Deails B6-->
-					<div class="detailsBlock">
-						<div class="color-d2d5d7 font-size23" id="clusterTotalRegionsText"></div>
-						<span data-prod-custom="pulse-regionstableCaps-custom" class="labeltext" >Regions</span>
-					</div>
-					<!-- Deails B7-->
-					<div class="detailsBlock">
-						<div class="color-d2d5d7 font-size23" id="clusterFunctions"></div>
-						<span data-prod-custom="pulse-functionprocedureCaps-custom" class="labeltext" >Functions</span>
-					</div>
-					<!-- Deails B8-->
-					<div class="detailsBlock" id="clusterUniqueCQsContainer">
-						<div class="color-d2d5d7 font-size23" id="clusterUniqueCQs"></div>
-						<span class="labeltext" >Unique CQs</span>
-					</div>
-					<!-- Deails B9-->
-					<div class="detailsBlock" id="SubscriptionsContainer">
-						<div class="color-d2d5d7 font-size23"
-							id="clusterSubscriptionsText"></div>
-						<span class="labeltext" >Subscriptions</span>
-					</div>
-					<!-- Deails B10-->
-					<div class="detailsBlock" id="TxnCommittedContainer">
-					  <div class="color-d2d5d7 font-size23"
-					    id="clusterTxnCommittedText"></div>
-					  <span class="labeltext" >Txn. Committed</span>
-					</div>
-					<!-- Deails B11-->
-					<div class="detailsBlock" id="TxnRollbackContainer">
-					  <div class="color-d2d5d7 font-size23"
-					    id="clusterTxnRollbackText"></div>
-					  <span class="labeltext" >Txn. Rollback</span>
-					</div>
-				</div>
-				<div class="clear"></div>
-				<div>
-					<div class="middleTopologyBlock">
-						<!-- Large Block-->
-						<div class="canvasBlockLarge loaderParent marginBR10-11 left">
-							<div class="left widthfull-100per canvasBlockInnerBlock">
-								<!-- Drop Down list -->
-								<div class="left members_data" onClick="">
-									<ul class="inactive">
-										<li class="selected" id="members_data1">
-										  <a href="javascript:onChangeClusterPerspective(1);">Members</a>
-										</li>
-										<li id="members_data2">
-										  <a href="javascript:onChangeClusterPerspective(2);">Data</a>
-										</li>
-									</ul>
-								</div>
-								<!-- Expand/Collapse button -->
-								<a id="btnLargeBlock_1" class="minusIcon borderLeftToggleBlock"
-									onclick="toggleDiv(&#39;LargeBlock_1&#39;);"></a>
-								<!-- Visualization Icons -->
-								<div class="icons">
-									<!-- Members Topology default buttons -->
-									<div id="icons_member_view_option_default" style="display: block;">
-										<a id="default_grid_button" class="gridIcon"
-											onclick="openViewPanel('member', 'default','grid');"
-											data-perspective="member" data-view="default"
-											data-viewoption="grid"></a>
-										<a id="default_treemap_button" class="chartIcon" 
-										  onclick="openViewPanel('member', 'default','treemap');"
-											data-perspective="member" data-view="default"
-											data-viewoption="treemap"></a>
-										<a id="default_rgraph_button" class="graphIcon active"
-											onclick="openViewPanel('member', 'default','rgraph');"
-											data-perspective="member" data-view="default"
-											data-viewoption="rgraph"></a>
-									</div>
-									<!-- Members Server Group buttons -->
-									<div id="icons_member_view_option_servergroups" style="display: none;">
-										<a id="servergroups_grid_button" class="gridIcon"
-											onclick="openViewPanel('member', 'servergroups','grid');" 
-											data-perspective="member" data-view="servergroups" data-viewoption="grid"></a>
-										<a id="servergroups_treemap_button" class="chartIcon active"
-											onclick="openViewPanel('member', 'servergroups','treemap');"
-											data-perspective="member" data-view="servergroups" data-viewoption="treemap"></a>
-									</div>
-									<!-- Members Redundancy Zones buttons -->
-									<div id="icons_member_view_option_redundancyzones" style="display: none;">
-										<a id="redundancyzones_grid_button" class="gridIcon"
-											onclick="openViewPanel('member', 'redundancyzones','grid');"
-											data-perspective="member" data-view="redundancyzones" data-viewoption="grid"></a>
-										<a id="redundancyzones_treemap_button" class="chartIcon active"
-											onclick="openViewPanel('member', 'redundancyzones','treemap');"
-											data-perspective="member" data-view="redundancyzones" data-viewoption="treemap"></a>
-									</div>
-									<!-- Data buttons -->
-									<div id="icons_data_view" style="display: none;">
-										<a id="data_grid_button" class="gridIcon"
-											onclick="openViewPanel('data','data','grid');"
-											data-perspective="data" data-view="data" data-viewoption="grid"></a>
-										<a id="data_treemap_button" class="chartIcon active"
-											onclick="openViewPanel('data','data','treemap');"
-											data-perspective="data" data-view="data" data-viewoption="treemap"></a>
-									</div>
-								</div>
-							</div>
-							<div id="loadingSymbol" class="loader"></div>
-							<div class="left canvasInnerBlock canvasBlockLargeContent" id="LargeBlock_1">
-								<div id="member_view_options" class="left members_view" style="display: block;">
-									<ul>
-										<li id="member_view_option_default" class="selected">
-										  <LABEL class="label_radio r_on" for="radio-default">
-										    <INPUT name="radio-group" id="radio-default" value="1"
-												type="radio">Topology</LABEL>
-										</li>
-										<li id="member_view_option_servergroups">
-										  <LABEL class="label_radio" for="radio-servergroups">
-										    <INPUT name="radio-group" id="radio-servergroups" value="2"
-												type="radio">Server Groups</LABEL>
-										</li>
-										<li id="member_view_option_redundancyzones">
-										  <LABEL class="label_radio" for="radio-redundancyzones">
-										    <INPUT name="radio-group" id="radio-redundancyzones" value="3"
-												  type="radio">Redundancy Zones</LABEL>
-										</li>
-									</ul>
-								</div>
-								<!-- Hot Spot Drop down -->
-								<div id="hotspotParentContainer" class="right marginBottom10 marginR10 displayNone">
-								  <div class="left position-relative hotspotNameTopMargin">
-								    <a href="#." class="hotspotClicked-Off" id="userLink">
-								      <span id="currentHotSpot" class="hotspot_txt">Current Hot Spot</span>
-								    </a>
-								    <!-- Setting Dropdown-->
-								    <div id="hotspotSetting" class="settingBlock" style="display: none">
-								      <div id="hotspotListContainer" class="jsonSuggestScrollFilter">
-								        <div id="hotspotList"></div>
-								      </div>
-								    </div>
-								  </div>
-								</div>
-								<div data-role="widget" data-widgetid="ClusterMembers"
-									data-active="yes" data-timeline="5000">
-									<!-- Topology R-graph Block - Member - Default view -->
-									<div class="graphBlocksPanel left display-block"
-										id="default_rgraph_block" data-role="widget"
-										data-widgetid="ClusterMembersRGraph" data-active="yes"
-										data-timeline="5000">
-										<!-- R-graph -->
-										<div class="left widthfull-100per marginB10" id="rGraphDiv">
-											<div class="topologyGraph">
-												<div id="container">
-													<div id="center-container">
-														<div id="infovis" style="width: 100%;"></div>
-													</div>
-												</div>
-											</div>
-										</div>
-										<!-- R-graph legends -->
-										<div class="marginB11 left widthfull-100per" id="rGraphLegends">
-											<div class="left marginL10">
-												<span class="left colorCodeBlock managerCode"></span>
-												<span class="left marginL10 ">Managers</span>
-											</div>
-											<div class="left marginL10">
-												<span class="left colorCodeBlock locatorsCode"></span>
-												<span class="left marginL10 ">Locators</span>
-											</div>
-											<div class="left marginL10">
-												<span class="left colorCodeBlock severeCode"></span>
-												<span class="left marginL10 ">Server</span>
-											</div>
-										</div>
-									</div>
-
-									<!--Treemap Block - Member - Default view -->
-									<div class="chartBlocksPanel left" id="default_treemap_block">
-										<div class="left widthfull-100per">
-											<div class="treeViewGraphClusterView">
-												<div id="GraphTreeMap" style="height: 415px; width: 720px;"></div>
-											</div>
-										</div>
-									</div>
-
-									<!--Grid Block - Member - Default view -->
-									<div class="gridBlocksPanel left display-none" id="default_grid_block">
-										<div class="left widthfull-100per">
-											<table id="memberList"></table>
-										</div>
-									</div>
-
-									<!--Treemap Block - Member - Server Group view -->
-									<div class="chartBlocksPanel left" id="servergroups_treemap_block">
-										<div class="left widthfull-100per">
-											<div class="treeViewGraphClusterView">
-												<div id="GraphTreeMapSG" style="height: 415px; width: 720px;"></div>
-											</div>
-										</div>
-									</div>
-
-									<!--Grid Block - Member - Server Group view -->
-									<div class="chartBlocksPanel left display-none" id="servergroups_grid_block">
-										<div class="left widthfull-100per">
-											<div class="treeViewGraphClusterView">
-											  <table id="memberListSG"></table>
-											</div>
-										</div>
-									</div>
-
-									<!--Treemap Block - Member - Redundancy Zones view -->
-									<div class="chartBlocksPanel left" id="redundancyzones_treemap_block">
-										<div class="left widthfull-100per">
-											<div class="treeViewGraphClusterView">
-												<div id="GraphTreeMapRZ" style="height: 415px; width: 720px;"></div>
-											</div>
-										</div>
-									</div>
-
-									<!--Grid Block - Member - Redundancy Zones view -->
-									<div class="chartBlocksPanel left display-none" id="redundancyzones_grid_block">
-										<div class="left widthfull-100per">
-											<div class="treeViewGraphClusterView">
-												<table id="memberListRZ"></table>
-											</div>
-										</div>
-									</div>
-
-									<!--Treemap Block - Data -->
-									<div data-role="widget" data-widgetid="ClusterRegions"
-                  data-active="yes" data-timeline="5000" 
-                  class="chartBlocksPanel left" id="data_treemap_block">
-										<div class="left widthfull-100per">
-											<div class="treeViewGraphClusterView">
-												<div id="GraphTreeMapClusterData" style="height: 415px; width: 720px;"></div>
-											</div>
-										</div>
-									</div>
-
-									<!--Grid Block - Data -->
-									<div class="chartBlocksPanel left display-none" id="data_grid_block">
-										<div class="left widthfull-100per">
-											<div class="treeViewGraphClusterView">
-												<table id="regionsList"></table>
-											</div>
-										</div>
-									</div>
-								</div>
-
-							</div>
-						</div>
-						<!-- Block 4-->
-						<div class="canvasBlockKeyStats marginBR10-11 left" data-role="widget" data-widgetid="ClusterKeyStatistics" data-active ="yes" data-timeline="5000">
-							<div class="left width495 canvasBlockInnerBlock">
-								<span class="left marginL10 canvasHeading" >Key Statistics</span><a
-									id="btnSmallBlock_4" class="minusIcon"
-									onClick="toggleDiv('SmallBlock_4');" ></a>
-							</div>
-							<div class="left canvasInnerBlock canvasContentBlockKeyStats"
-								id="SmallBlock_4">
-								<div class="graphBlocksContent left">
-									<span class="marginB11 left widthfull-100per" >Last 15
-										Minutes</span>
-									<!--Line 1-->
-									<div class="left widthfull-100per marginB10">
-										<span class="left lineGraphKeyStats" id="writePerSecSparkLine"></span><span
-											class="color-d2d5d7 font-size23" id="writePerSec"></span><span data-prod-custom="pulse-writeputpersec-custom"
-											class="paddingL5" >Write/Sec</span>
-									</div>
-									<!--Line 2-->
-									<div class="left widthfull-100per marginB10">
-										<span class="left lineGraphKeyStats" id="readPerSecSparkLine"></span><span
-											class="color-d2d5d7 font-size23" id="readPerSec"></span><span data-prod-custom="pulse-readgetpersec-custom"
-											class="paddingL5" >Read/Sec</span>
-									</div>
-									<!--Line 3-->
-									<div class="left widthfull-100per marginB10" id="queriesPerSecContainer">
-										<span class="left lineGraphKeyStats" id="queriesPerSecSparkLine"></span><span
-											class="color-d2d5d7 font-size23" id="queriesPerSec"></span><span
-											class="paddingL5" >Queries/Sec</span>
-									</div>
-								</div>
-							</div>
-						</div>
-						<!-- Block 5-->
-						
-						<!-- Block 6-->
-						<div class="canvasBlock marginBR10-11 left" data-role="widget" data-widgetid="ClusterJVMPAuses" data-active ="yes" data-timeline="5000">
-							<div class="left width242 canvasBlockInnerBlock">
-								<span class="left marginL10 canvasHeading" >No. of JVM
-									Pauses</span><a id="btnSmallBlock_6" class="minusIcon"
-									onClick="toggleDiv('SmallBlock_6');" ></a>
-							</div>
-							<div class="left canvasInnerBlock canvasContentBlock"
-								id="SmallBlock_6">
-								<div class="graphBlocksContent">
-									<div class="color-d2d5d7 font-size40">
-										<span id="currentGCPauses"></span><span
-											class="font-size23 paddingL5"></span>
-									</div>
-									<span >Last 15 Minutes</span>
-								</div>
-								<div class="left graphChart">
-									<span class="left lineGraph" id="gcPauses"></span>
-								</div>
-							</div>
-						</div>
-					</div>
-					<!-- Right Block-->
-					<div class="rightBlockCanvas">
-						<!-- Block 1-->
-						<div class="canvasBlock marginB10 left" id="wanInfoWidget" data-role="widget" data-widgetid="ClusterWanInformation" data-active ="yes" data-timeline="5000">
-							<div class="left width242 canvasBlockInnerBlock">
-								<span class="left marginL10 canvasHeading">WAN
-									Information</span><a id="btnSmallBlock_1" class="minusIcon"
-									onClick="toggleDiv('SmallBlock_1');"></a>
-							</div>
-							<div class="left canvasInnerBlock canvasContentBlock"
-								id="SmallBlock_1">
-								<div class="scroll-pane_1">
-									<div id="wanInfoList"></div>
-								</div>
-							</div>
-						</div>
-						<div class="clear"></div>
-						<!-- Block 5-->
-						<div class="canvasBlock marginBR10-11 left" data-role="widget" data-widgetid="ClusterMemoryUsage" data-active ="yes" data-timeline="5000">
-							<div class="left width242 canvasBlockInnerBlock">
-								<span class="left marginL10 canvasHeading" >Memory Usage</span><a
-									id="btnSmallBlock_5" class="minusIcon"
-									onClick="toggleDiv('SmallBlock_5');"></a>
-							</div>
-							<div class="left canvasInnerBlock canvasContentBlock"
-								id="SmallBlock_5">
-								<div class="graphBlocksContent">
-									<div class="color-d2d5d7 font-size40">
-										<span id="currentMemoryUsage"></span><span
-											class="font-size23 paddingL5" id="memoryUsageMB" >MB</span>
-									</div>
-									<span >Last 15 Minutes</span>
-								</div>
-								<div class="left graphChart">
-									<span class="left lineGraph" id="memoryUsage"></span>
-								</div>
-							</div>
-						</div>
-						<!-- Block 2-->
-					<!-- 	<div class="canvasBlock marginB10 left">
-							<div class="left width242 canvasBlockInnerBlock">
-								<span class="left marginL10 canvasHeading">Disk Storage
-									Used</span><a id="btnSmallBlock_2" class="minusIcon"
-									onClick="toggleDiv('SmallBlock_2');"></a>
-							</div>
-							<div class="left canvasInnerBlock canvasContentBlock"
-								id="SmallBlock_2">
-								<div class="graphBlocksContent">
-									<div class="color-d2d5d7 font-size40">
-										<span id="currentDiskStorage"></span><span
-											class="font-size23 paddingL5" id="diskStorageMBGB">MB</span>
-									</div>
-									<span>Last 15 Minutes</span>
-								</div>
-								<div class="left graphChart">
-								  <span class="left lineGraph" id="diskStorageGraph"></span>
-								</div>
-							</div>
-						</div>
-						<div class="clear"></div> -->
-						<!-- Block 3-->
-						<div class="canvasBlock marginB10 left" data-role="widget" data-widgetid="ClusterDiskThroughput" data-active="yes" data-timeline="5000">
-							<div class="left width242 canvasBlockInnerBlock">
-								<span class="left marginL10 canvasHeading">Disk Throughput</span>
-								<a id="btnSmallBlock_3" class="minusIcon"
-									onClick="toggleDiv('SmallBlock_3');"></a>
-							</div>
-							<div class="left canvasInnerBlock canvasContentBlock"
-								id="SmallBlock_3">
-								<div class="graphBlocksContent marginB11 ">
-									<div class="left">
-										<span class="left">Last 15 Minutes</span>
-									</div>
-									<div class="right marginL10">
-										<span data-prod-custom="pulse-reads-custom" class="left">Reads</span>
-										<span class="left marginL10 colorCodeBlock diskReadsCode"></span>
-									</div>
-									<div class="right marginL10">
-										<span data-prod-custom="pulse-writes-custom" class="left">Writes</span>
-										<span class="left marginL10 colorCodeBlock diskWritesCode"></span>
-									</div>
-								</div>
-								<div class="graphBlocksContent width91Per left">
-									<div class="color-d2d5d7 font-size20">
-										<span id="diskReadsThroughput"></span>
-									</div>
-									<div class="width100Per left">
-										<span class="left">Reads</span> <span class="right"
-											id="currentDiskReadsThroughput"></span>
-									</div>
-								</div>
-								<div class="left graphChart marginB11">
-									<span class="left lineGraph" id="diskReadsThroughputTrend"></span>
-								</div>
-								<div class="graphBlocksContent width91Per left">
-									<div class="color-d2d5d7 font-size20">
-										<span id="diskWritesThroughput"></span>
-									</div>
-									<div class="width100Per left">
-										<span class="left">Writes</span> <span class="right"
-											id="currentDiskWritesThroughput"></span>
-									</div>
-								</div>
-								<div class="left graphChart">
-									<span class="left lineGraph" id="diskWritesThroughputTrend"></span>
-								</div>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-      </div>
-		</div>
-	</div>
-	<!--Popups Block-->
-<div id="boxes"> 
-  <!-- Version Details popup-->
-  <div id="dialog1" class="window width345"  data-role="widget" data-widgetid="PulseVersionDetails" data-active ="yes" data-timeline="5000">
-    <div class="popup_heading"><span>Version Details</span><a href="#" class="closePopup">&nbsp;</a></div>
-    <div class="popup_contentBlock">
-      <div class="popup-innerblock">
-        <ul class="widthfull-100per left"  >
-          <li class="left widthfull-100per"  >
-            <label class="width-40 display-inline-block"  >Pulse Version:</label>
-            <label class="width-58 display-inline-block" id="pulseVer"></label>
-          </li>
-          <li class="left widthfull-100per"  >
-            <label class="width-40 display-inline-block"  >Build Id:</label>
-            <label class="width-58 display-inline-block" id="buildId"></label>
-          </li>
-          <li class="left widthfull-100per"  >
-            <label class="width-40 display-inline-block"  >Build Date:</label>
-            <label class="width-58 display-inline-block" id="buildDate"></label>
-          </li>
-          <li class="left widthfull-100per"  >
-            <label class="width-40 display-inline-block"  >Source Date:</label>
-            <label class="width-58 display-inline-block" id="sourceDate"></label>
-          </li>
-          <li class="left widthfull-100per"  >
-            <label class="width-40 display-inline-block"  >Source Revision:</label>
-            <label class="width-58 display-inline-block" id="sourceRevision"></label>
-          </li>
-          <li class="left widthfull-100per"  >
-            <label class="width-40 display-inline-block"  >Source Repository:</label>
-            <label class="width-58 display-inline-block" id="sourceRepository"></label>
-          </li>
-        </ul>
-        <div class="clear"></div>
-      </div>
-    </div>
-  </div>
-  <!-- Mask to cover the whole screen -->
-  <div id="mask"></div>
-</div>
-<div id="tooltip" class="tooltip"></div>
-</body>
-
-
-</html>
+<!DOCTYPE html>
+<!--
+  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.
+-->
+
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="X-UA-Compatible" content="IE=edge" />
+<meta http-equiv="CACHE-CONTROL" content="NO-CACHE,NO-STORE" />
+<meta http-equiv="PRAGMA" content="NO-CACHE" />
+<meta http-equiv="EXPIRES" content="-1">
+<title>Pulse</title>
+<link href="css/common.css" rel="stylesheet" type="text/css" />
+<link href="css/style.css" rel="stylesheet" type="text/css" />
+
+<!-- fix IE Ui issues-->
+<!--[if IE 7]>
+ 	<link href="css/ie/ie7.css" type="text/css" rel="stylesheet"/>
+ <![endif]-->
+<!--[if IE 8]>
+ 	<link href="css/ie/ie8.css" type="text/css" rel="stylesheet"/>
+ <![endif]-->
+<!--[if IE 9]>
+ 	<link href="css/ie/ie9.css" type="text/css" rel="stylesheet"/>
+ <![endif]-->
+<!-- IE Fix for HTML5 Tags -->
+<!--[if lt IE 9]>
+<script src='scripts/lib/html5.js'></script>
+<script type="text/javascript" src="scripts/lib/excanvas.js"></script>
+<script type="text/javascript"> if (!window.console) console = {log: function() {}}; </script>
+	<![endif]-->
+
+<script type="text/javascript" src='scripts/lib/jquery-1.7.2.js'></script>
+<script type="text/javascript" src='scripts/lib/common.js'></script>
+<script type="text/javascript" src="scripts/lib/jquery.i18n.properties.js"></script>
+<!--Custom Scroll Bar-->
+<!-- styles needed by jScrollPane - include in your own sites -->
+<link type="text/css" href="css/jquery.jscrollpane.css" rel="stylesheet"
+	media="all" />
+<!-- the mousewheel plugin -->
+<script type="text/javascript" src="scripts/lib/jquery.mousewheel.js"></script>
+<!-- the jScrollPane script -->
+<script type="text/javascript" src="scripts/lib/jquery.jscrollpane.js"></script>
+<!-- Rgraph and TreeMap-->
+<link type="text/css" href="css/base.css" rel="stylesheet" />
+<link type="text/css" href="css/Treemap.css" rel="stylesheet" />
+<script type="text/javascript" src="scripts/lib/jit.js"></script>
+<script type="text/javascript" src="scripts/lib/jquery.sparkline.js"></script>
+
+<!-- Grid view CSS and js-->
+<link rel="stylesheet" type="text/css" media="screen" href="css/grid/ui.jqgrid.css" />
+<script src="scripts/lib/grid.locale-en.js" type="text/javascript"></script>
+<script src="scripts/lib/jquery.jqGrid.src.js" type="text/javascript"></script>
+<script src="scripts/lib/jquery.tablednd.js" type="text/javascript"></script>
+<!-- -->
+<!-- jQuery plugin to support automatically updating fuzzy timestamps 
+(e.g. "4 minutes ago" or "about 1 day ago") -->
+<script type="text/javascript" src="scripts/lib/jquery.timeago.js"></script>
+
+<!-- start:Cluster widget based js files -->
+<script type="text/javascript" src="scripts/pulsescript/PulseCallbacks.js"></script>
+<script type="text/javascript" src="scripts/pulsescript/PulseFunctions.js"></script>
+<script type="text/javascript" src='scripts/pulsescript/common.js'></script>
+<script type="text/javascript" src='scripts/pulsescript/clusterRGraphMembers.js'></script>
+<script type="text/javascript" src='scripts/pulsescript/clusterDetail.js'></script>
+
+</head>
+
+
+<body onload="return checkMedia();">
+<!-- Connection lost-->
+<div class="connectionLostMasterBlock hide" id="connectionStatusDiv" >
+<div class="connectionLostInnerBlock">
+    <label id="lblConnectionErrorMsgDiv" class="left">Connecting ...</label>
+    <div class="clear"></div>
+    <div id="connectionErrorMsgDiv" class="right"></div>
+</div>
+</div>
+	<div id="canvasWidth">
+	<!--Top Links-->
+  <div class="headerTopLinksMaster">
+    <div class="right">
+      <div class="left position-relative"><a href="#."class="left headerTopLinks aboutClicked-Off">About</a> 
+        <!-- About Dropdown-->
+        <div id="detailsAbout" class="aboutBlock display-none">
+          <div class="aboutDetailsBlock">
+            <div class="left widthfull-100per marginBottom30">
+              <div class="left"><img data-prod-custom="pulse-aboutimg-custom" src="images/about-geode.png">
+                <div>
+                  <div class="aboutVersionBlock left" id="pulseVersion"></div>
+                  <div class="left termsBlock">&nbsp;<a id="pulseVersionDetailsLink" href="#dialog1" class="display-none" >Version Details</a></div>
+                </div>
+              </div>
+              <div data-prod-custom="pulse-about-custom" class="right aboutText">The Pulse tool monitors Apache Geode system in real time. It provides health information, detailed operational and configuration data, system alerts, throughput performance and statistics for system members and connected clients.</div>
+            </div>
+			<div class="left widthfull-100per copyright">
+				<p>Apache Geode<br>
+				Copyright 2016 The Apache Software Foundation.</p>
+				<p>&nbsp;</p>
+				<p>This product includes software developed at
+				The Apache Software Foundation (http://www.apache.org/).</p>
+			</div>
+		</div>
+        </div>
+      </div>
+      <div class="left headerTopSeperator"></div>
+      <div class="left"><a data-prod-custom="pulse-help-custom" target="_blank" href="http://geode.apache.org/docs/guide/tools_modules/pulse/chapter_overview.html" class="left headerTopLinks" class="left headerTopLinks">Help</a></div>
+      <div class="left headerTopSeperator"></div>
+      <div class="left headerTopLinks welcomeLabelPRZero">Welcome</div>
+      <div class="left headerTopLinks textbold font-size12" id="userName"></div>
+      <div class="left headerTopSeperator"></div>
+      <div class="left"><a href="pulse/clusterLogout" class="left headerTopLinks">Sign Out</a></div>
+    </div>
+  </div>
+		<!-- Header block-->
+		<header>
+			<div class="left">
+				<a href="#." onclick="openClusterDetail();" class="left textbold HeaderLink HeaderLinkActive"
+					id="clusterName" ></a>
+			</div>
+			<div class="textbold right logoBlock">
+				<img src="images/apache_geode_logo.png"/>
+				<a href="#.">[LOGO]</a>
+			</div>
+		</header>
+		<div class="clear"></div>
+		<div class="subHeader">
+			<ul>
+				<li><a href="#." class="active" onclick="openClusterDetail();">Cluster View</a></li>
+				<!-- Hide Data Browser tab for gemfirexd (Pulse-Cheetah Release) -->
+				<li><a href="#."  onclick="openDataBrowser();">Data Browser</a></li>
+				<!-- Hide Query Statistics tab for gemfire -->
+				<li id="subTabQueryStatistics"><a href="#." onclick="openQueryStatistics();">Query Statistics</a></li>
+			</ul>
+		<div class="clear"></div>
+		</div>
+		<!-- Middle block-->
+		<div class="left widthfull-100per">
+			<!--Top Right Block 1-->
+			<div class="right widthfull-100per marginTB10">
+                            
+				<!-- Tab-->
+				<div id="notificationsPanel" class="right marginL10 TabTopPanel position-relative" 
+				data-role="widget" data-widgetid="CluserAlertNotification" data-active ="yes" data-timeline="5000">
+				</div>
+				<!-- <div class="right marginL10">
+					<a href="#." class="left linkButton" onclick="openDataView();">Data View</a>
+				</div> -->
+			<!-- </div> -->
+			<!--Middle Block 1-->
+			<div class="left leftBlockCanvas">
+				<!-- Status Block-->
+				<div class="statusmasterBlock left" data-role="widget" data-widgetid="CluserBasicDetails" data-active ="yes" data-timeline="5000">
+					<!--Status Block Normal-->
+					<div class="statusFirstBlock left">
+						<div class="statusMasterBlock" id="clusterStatusIcon">
+							<div class="textbold" id="clusterStatusText"></div>
+							<div class="labeltext">Cluster Status</div>
+						</div>
+					</div>
+					<!-- Deails B1-->
+					<div class="borderRightDarkBlue detailsBlock">
+						<div class="color-d2d5d7 font-size23">
+							<span id="clusterTotalHeap"></span><span
+								class="font-size17 paddingL5">GB</span>
+						</div>
+						<span class="labeltext" >Total Heap</span>
+					</div>
+					<!-- Deails B2-->
+					<div class=" detailsBlock">
+						<div class="color-d2d5d7 font-size23" id="clusterTotalMembersText"></div>
+						<span class="labeltext" >Members</span>
+					</div>
+					<!-- Deails B3-->
+					<div class="detailsBlock">
+						<div class="color-d2d5d7 font-size23" id="clusterServersText"></div>
+						<span class="labeltext" >Servers</span>
+					</div>
+					<!-- Deails B4-->
+					<div class="detailsBlock">
+						<div class="color-d2d5d7 font-size23" id="clusterClientsText"></div>
+						<span class="labeltext" >Clients</span>
+					</div>
+					<!-- Deails B5-->
+					<div class="detailsBlock">
+						<div class="color-d2d5d7 font-size23" id="clusterLocatorsText"></div>
+						<span class="labeltext" >Locators</span>
+					</div>
+					<!-- Deails B6-->
+					<div class="detailsBlock">
+						<div class="color-d2d5d7 font-size23" id="clusterTotalRegionsText"></div>
+						<span data-prod-custom="pulse-regionstableCaps-custom" class="labeltext" >Regions</span>
+					</div>
+					<!-- Deails B7-->
+					<div class="detailsBlock">
+						<div class="color-d2d5d7 font-size23" id="clusterFunctions"></div>
+						<span data-prod-custom="pulse-functionprocedureCaps-custom" class="labeltext" >Functions</span>
+					</div>
+					<!-- Deails B8-->
+					<div class="detailsBlock" id="clusterUniqueCQsContainer">
+						<div class="color-d2d5d7 font-size23" id="clusterUniqueCQs"></div>
+						<span class="labeltext" >Unique CQs</span>
+					</div>
+					<!-- Deails B9-->
+					<div class="detailsBlock" id="SubscriptionsContainer">
+						<div class="color-d2d5d7 font-size23"
+							id="clusterSubscriptionsText"></div>
+						<span class="labeltext" >Subscriptions</span>
+					</div>
+					<!-- Deails B10-->
+					<div class="detailsBlock" id="TxnCommittedContainer">
+					  <div class="color-d2d5d7 font-size23"
+					    id="clusterTxnCommittedText"></div>
+					  <span class="labeltext" >Txn. Committed</span>
+					</div>
+					<!-- Deails B11-->
+					<div class="detailsBlock" id="TxnRollbackContainer">
+					  <div class="color-d2d5d7 font-size23"
+					    id="clusterTxnRollbackText"></div>
+					  <span class="labeltext" >Txn. Rollback</span>
+					</div>
+				</div>
+				<div class="clear"></div>
+				<div>
+					<div class="middleTopologyBlock">
+						<!-- Large Block-->
+						<div class="canvasBlockLarge loaderParent marginBR10-11 left">
+							<div class="left widthfull-100per canvasBlockInnerBlock">
+								<!-- Drop Down list -->
+								<div class="left members_data" onClick="">
+									<ul class="inactive">
+										<li class="selected" id="members_data1">
+										  <a href="javascript:onChangeClusterPerspective(1);">Members</a>
+										</li>
+										<li id="members_data2">
+										  <a href="javascript:onChangeClusterPerspective(2);">Data</a>
+										</li>
+									</ul>
+								</div>
+								<!-- Expand/Collapse button -->
+								<a id="btnLargeBlock_1" class="minusIcon borderLeftToggleBlock"
+									onclick="toggleDiv(&#39;LargeBlock_1&#39;);"></a>
+								<!-- Visualization Icons -->
+								<div class="icons">
+									<!-- Members Topology default buttons -->
+									<div id="icons_member_view_option_default" style="display: block;">
+										<a id="default_grid_button" class="gridIcon"
+											onclick="openViewPanel('member', 'default','grid');"
+											data-perspective="member" data-view="default"
+											data-viewoption="grid"></a>
+										<a id="default_treemap_button" class="chartIcon" 
+										  onclick="openViewPanel('member', 'default','treemap');"
+											data-perspective="member" data-view="default"
+											data-viewoption="treemap"></a>
+										<a id="default_rgraph_button" class="graphIcon active"
+											onclick="openViewPanel('member', 'default','rgraph');"
+											data-perspective="member" data-view="default"
+											data-viewoption="rgraph"></a>
+									</div>
+									<!-- Members Server Group buttons -->
+									<div id="icons_member_view_option_servergroups" style="display: none;">
+										<a id="servergroups_grid_button" class="gridIcon"
+											onclick="openViewPanel('member', 'servergroups','grid');" 
+											data-perspective="member" data-view="servergroups" data-viewoption="grid"></a>
+										<a id="servergroups_treemap_button" class="chartIcon active"
+											onclick="openViewPanel('member', 'servergroups','treemap');"
+											data-perspective="member" data-view="servergroups" data-viewoption="treemap"></a>
+									</div>
+									<!-- Members Redundancy Zones buttons -->
+									<div id="icons_member_view_option_redundancyzones" style="display: none;">
+										<a id="redundancyzones_grid_button" class="gridIcon"
+											onclick="openViewPanel('member', 'redundancyzones','grid');"
+											data-perspective="member" data-view="redundancyzones" data-viewoption="grid"></a>
+										<a id="redundancyzones_treemap_button" class="chartIcon active"
+											onclick="openViewPanel('member', 'redundancyzones','treemap');"
+											data-perspective="member" data-view="redundancyzones" data-viewoption="treemap"></a>
+									</div>
+									<!-- Data buttons -->
+									<div id="icons_data_view" style="display: none;">
+										<a id="data_grid_button" class="gridIcon"
+											onclick="openViewPanel('data','data','grid');"
+											data-perspective="data" data-view="data" data-viewoption="grid"></a>
+										<a id="data_treemap_button" class="chartIcon active"
+											onclick="openViewPanel('data','data','treemap');"
+											data-perspective="data" data-view="data" data-viewoption="treemap"></a>
+									</div>
+								</div>
+							</div>
+							<div id="loadingSymbol" class="loader"></div>
+							<div class="left canvasInnerBlock canvasBlockLargeContent" id="LargeBlock_1">
+								<div id="member_view_options" class="left members_view" style="display: block;">
+									<ul>
+										<li id="member_view_option_default" class="selected">
+										  <LABEL class="label_radio r_on" for="radio-default">
+										    <INPUT name="radio-group" id="radio-default" value="1"
+												type="radio">Topology</LABEL>
+										</li>
+										<li id="member_view_option_servergroups">
+										  <LABEL class="label_radio" for="radio-servergroups">
+										    <INPUT name="radio-group" id="radio-servergroups" value="2"
+												type="radio">Server Groups</LABEL>
+										</li>
+										<li id="member_view_option_redundancyzones">
+										  <LABEL class="label_radio" for="radio-redundancyzones">
+										    <INPUT name="radio-group" id="radio-redundancyzones" value="3"
+												  type="radio">Redundancy Zones</LABEL>
+										</li>
+									</ul>
+								</div>
+								<!-- Hot Spot Drop down -->
+								<div id="hotspotParentContainer" class="right marginBottom10 marginR10 displayNone">
+								  <div class="left position-relative hotspotNameTopMargin">
+								    <a href="#." class="hotspotClicked-Off" id="userLink">
+								      <span id="currentHotSpot" class="hotspot_txt">Current Hot Spot</span>
+								    </a>
+								    <!-- Setting Dropdown-->
+								    <div id="hotspotSetting" class="settingBlock" style="display: none">
+								      <div id="hotspotListContainer" class="jsonSuggestScrollFilter">
+								        <div id="hotspotList"></div>
+								      </div>
+								    </div>
+								  </div>
+								</div>
+								<div data-role="widget" data-widgetid="ClusterMembers"
+									data-active="yes" data-timeline="5000">
+									<!-- Topology R-graph Block - Member - Default view -->
+									<div class="graphBlocksPanel left display-block"
+										id="default_rgraph_block" data-role="widget"
+										data-widgetid="ClusterMembersRGraph" data-active="yes"
+										data-timeline="5000">
+										<!-- R-graph -->
+										<div class="left widthfull-100per marginB10" id="rGraphDiv">
+											<div class="topologyGraph">
+												<div id="container">
+													<div id="center-container">
+														<div id="infovis" style="width: 100%;"></div>
+													</div>
+												</div>
+											</div>
+										</div>
+										<!-- R-graph legends -->
+										<div class="marginB11 left widthfull-100per" id="rGraphLegends">
+											<div class="left marginL10">
+												<span class="left colorCodeBlock managerCode"></span>
+												<span class="left marginL10 ">Managers</span>
+											</div>
+											<div class="left marginL10">
+												<span class="left colorCodeBlock locatorsCode"></span>
+												<span class="left marginL10 ">Locators</span>
+											</div>
+											<div class="left marginL10">
+												<span class="left colorCodeBlock severeCode"></span>
+												<span class="left marginL10 ">Server</span>
+											</div>
+										</div>
+									</div>
+
+									<!--Treemap Block - Member - Default view -->
+									<div class="chartBlocksPanel left" id="default_treemap_block">
+										<div class="left widthfull-100per">
+											<div class="treeViewGraphClusterView">
+												<div id="GraphTreeMap" style="height: 415px; width: 720px;"></div>
+											</div>
+										</div>
+									</div>
+
+									<!--Grid Block - Member - Default view -->
+									<div class="gridBlocksPanel left display-none" id="default_grid_block">
+										<div class="left widthfull-100per">
+											<table id="memberList"></table>
+										</div>
+									</div>
+
+									<!--Treemap Block - Member - Server Group view -->
+									<div class="chartBlocksPanel left" id="servergroups_treemap_block">
+										<div class="left widthfull-100per">
+											<div class="treeViewGraphClusterView">
+												<div id="GraphTreeMapSG" style="height: 415px; width: 720px;"></div>
+											</div>
+										</div>
+									</div>
+
+									<!--Grid Block - Member - Server Group view -->
+									<div class="chartBlocksPanel left display-none" id="servergroups_grid_block">
+										<div class="left widthfull-100per">
+											<div class="treeViewGraphClusterView">
+											  <table id="memberListSG"></table>
+											</div>
+										</div>
+									</div>
+
+									<!--Treemap Block - Member - Redundancy Zones view -->
+									<div class="chartBlocksPanel left" id="redundancyzones_treemap_block">
+										<div class="left widthfull-100per">
+											<div class="treeViewGraphClusterView">
+												<div id="GraphTreeMapRZ" style="height: 415px; width: 720px;"></div>
+											</div>
+										</div>
+									</div>
+
+									<!--Grid Block - Member - Redundancy Zones view -->
+									<div class="chartBlocksPanel left display-none" id="redundancyzones_grid_block">
+										<div class="left widthfull-100per">
+											<div class="treeViewGraphClusterView">
+												<table id="memberListRZ"></table>
+											</div>
+										</div>
+									</div>
+
+									<!--Treemap Block - Data -->
+									<div data-role="widget" data-widgetid="ClusterRegions"
+                  data-active="yes" data-timeline="5000" 
+                  class="chartBlocksPanel left" id="data_treemap_block">
+										<div class="left widthfull-100per">
+											<div class="treeViewGraphClusterView">
+												<div id="GraphTreeMapClusterData" style="height: 415px; width: 720px;"></div>
+											</div>
+										</div>
+									</div>
+
+									<!--Grid Block - Data -->
+									<div class="chartBlocksPanel left display-none" id="data_grid_block">
+										<div class="left widthfull-100per">
+											<div class="treeViewGraphClusterView">
+												<table id="regionsList"></table>
+											</div>
+										</div>
+									</div>
+								</div>
+
+							</div>
+						</div>
+						<!-- Block 4-->
+						<div class="canvasBlockKeyStats marginBR10-11 left" data-role="widget" data-widgetid="ClusterKeyStatistics" data-active ="yes" data-timeline="5000">
+							<div class="left width495 canvasBlockInnerBlock">
+								<span class="left marginL10 canvasHeading" >Key Statistics</span><a
+									id="btnSmallBlock_4" class="minusIcon"
+									onClick="toggleDiv('SmallBlock_4');" ></a>
+							</div>
+							<div class="left canvasInnerBlock canvasContentBlockKeyStats"
+								id="SmallBlock_4">
+								<div class="graphBlocksContent left">
+									<span class="marginB11 left widthfull-100per" >Last 15
+										Minutes</span>
+									<!--Line 1-->
+									<div class="left widthfull-100per marginB10">
+										<span class="left lineGraphKeyStats" id="writePerSecSparkLine"></span><span
+											class="color-d2d5d7 font-size23" id="writePerSec"></span><span data-prod-custom="pulse-writeputpersec-custom"
+											class="paddingL5" >Write/Sec</span>
+									</div>
+									<!--Line 2-->
+									<div class="left widthfull-100per marginB10">
+										<span class="left lineGraphKeyStats" id="readPerSecSparkLine"></span><span
+											class="color-d2d5d7 font-size23" id="readPerSec"></span><span data-prod-custom="pulse-readgetpersec-custom"
+											class="paddingL5" >Read/Sec</span>
+									</div>
+									<!--Line 3-->
+									<div class="left widthfull-100per marginB10" id="queriesPerSecContainer">
+										<span class="left lineGraphKeyStats" id="queriesPerSecSparkLine"></span><span
+											class="color-d2d5d7 font-size23" id="queriesPerSec"></span><span
+											class="paddingL5" >Queries/Sec</span>
+									</div>
+								</div>
+							</div>
+						</div>
+						<!-- Block 5-->
+						
+						<!-- Block 6-->
+						<div class="canvasBlock marginBR10-11 left" data-role="widget" data-widgetid="ClusterJVMPAuses" data-active ="yes" data-timeline="5000">
+							<div class="left width242 canvasBlockInnerBlock">
+								<span class="left marginL10 canvasHeading" >No. of JVM
+									Pauses</span><a id="btnSmallBlock_6" class="minusIcon"
+									onClick="toggleDiv('SmallBlock_6');" ></a>
+							</div>
+							<div class="left canvasInnerBlock canvasContentBlock"
+								id="SmallBlock_6">
+								<div class="graphBlocksContent">
+									<div class="color-d2d5d7 font-size40">
+										<span id="currentGCPauses"></span><span
+											class="font-size23 paddingL5"></span>
+									</div>
+									<span >Last 15 Minutes</span>
+								</div>
+								<div class="left graphChart">
+									<span class="left lineGraph" id="gcPauses"></span>
+								</div>
+							</div>
+						</div>
+					</div>
+					<!-- Right Block-->
+					<div class="rightBlockCanvas">
+						<!-- Block 1-->
+						<div class="canvasBlock marginB10 left" id="wanInfoWidget" data-role="widget" data-widgetid="ClusterWanInformation" data-active ="yes" data-timeline="5000">
+							<div class="left width242 canvasBlockInnerBlock">
+								<span class="left marginL10 canvasHeading">WAN
+									Information</span><a id="btnSmallBlock_1" class="minusIcon"
+									onClick="toggleDiv('SmallBlock_1');"></a>
+							</div>
+							<div class="left canvasInnerBlock canvasContentBlock"
+								id="SmallBlock_1">
+								<div class="scroll-pane_1">
+									<div id="wanInfoList"></div>
+								</div>
+							</div>
+						</div>
+						<div class="clear"></div>
+						<!-- Block 5-->
+						<div class="canvasBlock marginBR10-11 left" data-role="widget" data-widgetid="ClusterMemoryUsage" data-active ="yes" data-timeline="5000">
+							<div class="left width242 canvasBlockInnerBlock">
+								<span class="left marginL10 canvasHeading" >Memory Usage</span><a
+									id="btnSmallBlock_5" class="minusIcon"
+									onClick="toggleDiv('SmallBlock_5');"></a>
+							</div>
+							<div class="left canvasInnerBlock canvasContentBlock"
+								id="SmallBlock_5">
+								<div class="graphBlocksContent">
+									<div class="color-d2d5d7 font-size40">
+										<span id="currentMemoryUsage"></span><span
+											class="font-size23 paddingL5" id="memoryUsageMB" >MB</span>
+									</div>
+									<span >Last 15 Minutes</span>
+								</div>
+								<div class="left graphChart">
+									<span class="left lineGraph" id="memoryUsage"></span>
+								</div>
+							</div>
+						</div>
+						<!-- Block 2-->
+					<!-- 	<div class="canvasBlock marginB10 left">
+							<div class="left width242 canvasBlockInnerBlock">
+								<span class="left marginL10 canvasHeading">Disk Storage
+									Used</span><a id="btnSmallBlock_2" class="minusIcon"
+									onClick="toggleDiv('SmallBlock_2');"></a>
+							</div>
+							<div class="left canvasInnerBlock canvasContentBlock"
+								id="SmallBlock_2">
+								<div class="graphBlocksContent">
+									<div class="color-d2d5d7 font-size40">
+										<span id="currentDiskStorage"></span><span
+											class="font-size23 paddingL5" id="diskStorageMBGB">MB</span>
+									</div>
+									<span>Last 15 Minutes</span>
+								</div>
+								<div class="left graphChart">
+								  <span class="left lineGraph" id="diskStorageGraph"></span>
+								</div>
+							</div>
+						</div>
+						<div class="clear"></div> -->
+						<!-- Block 3-->
+						<div class="canvasBlock marginB10 left" data-role="widget" data-widgetid="ClusterDiskThroughput" data-active="yes" data-timeline="5000">
+							<div class="left width242 canvasBlockInnerBlock">
+								<span class="left marginL10 canvasHeading">Disk Throughput</span>
+								<a id="btnSmallBlock_3" class="minusIcon"
+									onClick="toggleDiv('SmallBlock_3');"></a>
+							</div>
+							<div class="left canvasInnerBlock canvasContentBlock"
+								id="SmallBlock_3">
+								<div class="graphBlocksContent marginB11 ">
+									<div class="left">
+										<span class="left">Last 15 Minutes</span>
+									</div>
+									<div class="right marginL10">
+										<span data-prod-custom="pulse-reads-custom" class="left">Reads</span>
+										<span class="left marginL10 colorCodeBlock diskReadsCode"></span>
+									</div>
+									<div class="right marginL10">
+										<span data-prod-custom="pulse-writes-custom" class="left">Writes</span>
+										<span class="left marginL10 colorCodeBlock diskWritesCode"></span>
+									</div>
+								</div>
+								<div class="graphBlocksContent width91Per left">
+									<div class="color-d2d5d7 font-size20">
+										<span id="diskReadsThroughput"></span>
+									</div>
+									<div class="width100Per left">
+										<span class="left">Reads</span> <span class="right"
+											id="currentDiskReadsThroughput"></span>
+									</div>
+								</div>
+								<div class="left graphChart marginB11">
+									<span class="left lineGraph" id="diskReadsThroughputTrend"></span>
+								</div>
+								<div class="graphBlocksContent width91Per left">
+									<div class="color-d2d5d7 font-size20">
+										<span id="diskWritesThroughput"></span>
+									</div>
+									<div class="width100Per left">
+										<span class="left">Writes</span> <span class="right"
+											id="currentDiskWritesThroughput"></span>
+									</div>
+								</div>
+								<div class="left graphChart">
+									<span class="left lineGraph" id="diskWritesThroughputTrend"></span>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+      </div>
+		</div>
+	</div>
+	<!--Popups Block-->
+<div id="boxes"> 
+  <!-- Version Details popup-->
+  <div id="dialog1" class="window width345"  data-role="widget" data-widgetid="PulseVersionDetails" data-active ="yes" data-timeline="5000">
+    <div class="popup_heading"><span>Version Details</span><a href="#" class="closePopup">&nbsp;</a></div>
+    <div class="popup_contentBlock">
+      <div class="popup-innerblock">
+        <ul class="widthfull-100per left"  >
+          <li class="left widthfull-100per"  >
+            <label class="width-40 display-inline-block"  >Pulse Version:</label>
+            <label class="width-58 display-inline-block" id="pulseVer"></label>
+          </li>
+          <li class="left widthfull-100per"  >
+            <label class="width-40 display-inline-block"  >Build Id:</label>
+            <label class="width-58 display-inline-block" id="buildId"></label>
+          </li>
+          <li class="left widthfull-100per"  >
+            <label class="width-40 display-inline-block"  >Build Date:</label>
+            <label class="width-58 display-inline-block" id="buildDate"></label>
+          </li>
+          <li class="left widthfull-100per"  >
+            <label class="width-40 display-inline-block"  >Source Date:</label>
+            <label class="width-58 display-inline-block" id="sourceDate"></label>
+          </li>
+          <li class="left widthfull-100per"  >
+            <label class="width-40 display-inline-block"  >Source Revision:</label>
+            <label class="width-58 display-inline-block" id="sourceRevision"></label>
+          </li>
+          <li class="left widthfull-100per"  >
+            <label class="width-40 display-inline-block"  >Source Repository:</label>
+            <label class="width-58 display-inline-block" id="sourceRepository"></label>
+          </li>
+        </ul>
+        <div class="clear"></div>
+      </div>
+    </div>
+  </div>
+  <!-- Mask to cover the whole screen -->
+  <div id="mask"></div>
+</div>
+<div id="tooltip" class="tooltip"></div>
+</body>
+
+
+</html>


[02/31] incubator-geode git commit: GEODE-2137 client membership IDs contain 17 bytes of useless information

Posted by ab...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9de8732a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
index 29d62db..844891d 100644
--- a/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
+++ b/geode-core/src/test/resources/org/apache/geode/codeAnalysis/sanctionedDataSerializables.txt
@@ -1,2136 +1,2134 @@
 org/apache/geode/admin/RegionSubRegionSnapshot,2
 fromData,62,2a2bb80023b500082a2bb900240100b5000b2a2bb80025b500052ab40005b9002601004d2cb9002701009900132cb900280100c000292ab6001ba7ffeab1
 toData,30,2ab400082bb800202b2ab4000bb9002102002ab40005c000032bb80022b1
-
+
 org/apache/geode/admin/internal/FinishBackupRequest,2
 fromData,33,2a2bb700292a2bb8002ab500022a2bb8002ab500032a2bb8002bb6002cb50004b1
 toData,33,2a2bb7002d2ab400022bb8002e2ab400032bb8002e2ab40004b8002f2bb80030b1
-
+
 org/apache/geode/admin/internal/FinishBackupResponse,2
 fromData,14,2a2bb700042a2bb80005b50003b1
 toData,14,2a2bb700062ab400032bb80007b1
-
+
 org/apache/geode/admin/internal/PrepareBackupResponse,2
 fromData,14,2a2bb700042a2bb80005b50003b1
 toData,14,2a2bb700062ab400032bb80007b1
-
+
 org/apache/geode/admin/internal/SystemMemberCacheEventProcessor$SystemMemberCacheMessage,2
 fromData,27,2a2bb7001a2a2bb8001bb5000c2a2bb9001c0100b8001db5000fb1
 toData,27,2a2bb7001e2ab4000c2bb8001f2b2ab4000fb40020b900210200b1
-
+
 org/apache/geode/admin/jmx/internal/StatAlertNotification,2
 fromData,39,2a2bb8002ab600032a2bb8002bb600072a2bb8002cc0002dc0002db600052a2bb8002eb50008b1
 toData,33,2ab600162bb800262ab600202bb800272ab6000e2bb800282ab400082bb80029b1
-
+
 org/apache/geode/cache/ExpirationAttributes,2
 fromData,22,2a2bb900120100b500022a2bb80013c00014b50004b1
 toData,19,2b2ab40002b9001502002ab400042bb80016b1
-
+
 org/apache/geode/cache/MembershipAttributes,2
 fromData,39,2a2a2bb80032b7000bb500032a2bb900330100b80034b500052a2bb900330100b80035b50007b1
 toData,89,2ab40003b9002c0100bd002d4d2ab40003b9002101004e03360415042cbea2001b2c15042db900240100c00025b90026010053840401a7ffe42c2bb8002e2b2ab40005b4002fb9003002002b2ab40007b40031b900300200b1
-
+
 org/apache/geode/cache/SubscriptionAttributes,2
 fromData,14,2a2bb9000f0100b80010b50003b1
 toData,14,2b2ab40003b4000db9000e0200b1
-
+
 org/apache/geode/cache/client/internal/CacheServerLoadMessage,2
 fromData,52,2a2bb7000d2abb000e59b7000fb500022ab400022bb800102abb001159b70012b500032ab400032bb800102a2bb80013b50004b1
 toData,30,2a2bb700142ab400022bb800152ab400032bb800152ab400042bb80016b1
-
+
 org/apache/geode/cache/client/internal/locator/ClientConnectionRequest,2
 fromData,14,2a2bb700042a2bb80005b50003b1
 toData,14,2a2bb700062ab400032bb80007b1
-
+
 org/apache/geode/cache/client/internal/locator/ClientConnectionResponse,2
 fromData,35,2a2bb80004b500022ab400029900162abb000559b70006b500032ab400032bb60007b1
 toData,31,2ab40003c6000704a70004033d1c2bb800081c99000b2ab400032bb60009b1
-
+
 org/apache/geode/cache/client/internal/locator/ClientReplacementRequest,2
 fromData,25,2a2bb700042abb000559b70006b500032ab400032bb80007b1
 toData,14,2a2bb700082ab400032bb80009b1
-
+
 org/apache/geode/cache/client/internal/locator/GetAllServersRequest,2
 fromData,6,2a2bb70003b1
 toData,6,2a2bb70004b1
-
+
 org/apache/geode/cache/client/internal/locator/GetAllServersResponse,2
 fromData,31,2a2bb80005b500032ab40003c600122ab40003b600049a00082a04b50002b1
 toData,9,2ab400032bb80006b1
-
+
 org/apache/geode/cache/client/internal/locator/LocatorListResponse,2
 fromData,43,2a2bb80006b500032a2bb900070100b500052ab40003c600142ab40003b9000401009a00082a04b50002b1
 toData,19,2ab400032bb800082b2ab40005b900090200b1
-
+
 org/apache/geode/cache/client/internal/locator/LocatorStatusResponse,2
 fromData,56,2a2bb6001f2a2bb600202a2bb600212a2bb600222a2bb600232a2bb600242a2bb600252a2bb600262a2bb600272a2bb600282a2bb60029b1
 toData,56,2a2bb600322a2bb600332a2bb600342a2bb600352a2bb600362a2bb600372a2bb600382a2bb600392a2bb6003a2a2bb6003b2a2bb6003cb1
-
+
 org/apache/geode/cache/client/internal/locator/QueueConnectionRequest,2
 fromData,40,2a2bb700072a2bb80008b500042a2bb80009b500062a2bb8000ab500052a2bb9000b0100b50002b1
 toData,40,2a2bb7000c2ab400042bb8000d2ab400062bb8000e2ab400052bb8000f2b2ab40002b900100200b1
-
+
 org/apache/geode/cache/client/internal/locator/QueueConnectionResponse,2
 fromData,41,2a2bb80006b500032a2bb80007b500042ab40004c600142ab40004b9000501009a00082a04b50002b1
 toData,17,2ab400032bb800082ab400042bb80009b1
-
+
 org/apache/geode/cache/client/internal/locator/ServerLocationRequest,2
 fromData,9,2a2bb80003b50002b1
 toData,9,2ab400022bb80004b1
-
+
 org/apache/geode/cache/query/internal/CqEntry,2
 fromData,17,2a2bb80009b500022a2bb80009b50003b1
 toData,17,2ab400022bb8000b2ab400032bb8000bb1
-
+
 org/apache/geode/cache/query/internal/CumulativeNonDistinctResults,2
 fromData,126,2bb8001dc0001e4d2abb00035912042cb70005b500012cb9001f01003e2bb90020010037042abb001a59160488b70021b5000816043706160609949e00421d9900232bb800223a082ab40008bb0023592cc000241908b70025b90026020057a700152bb8001d3a082ab400081908b9002602005716060a653706a7ffbdb1
 toData,125,2ab40001b900280100b9001f01003d2ab40001b9002801002bb80029bb002a5911040001b7002b4e2db6002c3a042ab600143a050336061905b9001501009900311905b9001601003a071c9900181907c0002db9002e01003a0819082bb8002fa7000919072db80029840601a7ffcb1904150685b600302d2bb60031b1
-
+
 org/apache/geode/cache/query/internal/LinkedResultSet,2
 fromData,40,2bb9001501003d2a2bb80016c00017b500071c3e1d9e00122a2bb80016b60018578403ffa7fff0b1
 toData,46,2b2ab60019b9001a02002ab400072bb8001b2ab6001c4d2cb9001d01009900102cb9001e01002bb8001ba7ffedb1
-
+
 org/apache/geode/cache/query/internal/LinkedStructSet,2
 fromData,68,2a2bb900300100b500022bb9003101003d2a2bb80032c00020b500071c3e1d9e00242bb80032c000333a042abb000c592ab400071904b70034b60035578403ffa7ffdeb1
 toData,66,2b2ab40002b9003702002b2ab60038b9003902002ab400072bb8003a2ab600284d2cb90029010099001a2cb9002a0100c000124e2db9003b01002bb8003aa7ffe3b1
-
+
 org/apache/geode/cache/query/internal/NWayMergeResults,2
 fromData,134,2bb8001ec0001f4d2abb00045912202cb70006b500022cb9002101003e2a2bb80022b500012bb90023010037042abb001b59160488b70024b5000916043706160609949e00421d9900232bb800253a082ab40009bb0026592cc000271908b70028b90029020057a700152bb8001e3a082ab400091908b9002902005716060a653706a7ffbdb1
 toData,133,2ab40002b9002b0100b9002101003d2ab40002b9002b01002bb8002c2ab400012bb8002dbb002e5911040001b7002f4e2db600303a042ab600153a050336061905b9001601009900311905b9001701003a071c9900181907c00031b9003201003a0819082bb80033a7000919072db8002c840601a7ffcb1904150685b600342d2bb60035b1
-
+
 org/apache/geode/cache/query/internal/NullToken,2
 fromData,1,b1
 toData,1,b1
-
+
 org/apache/geode/cache/query/internal/PRQueryTraceInfo,2
 fromData,29,2a2bb900090100b500042a2bb9000a0100b500062a2bb8000bb50003b1
 toData,29,2b2ab40004b9000502002b2ab40006b9000702002ab400032bb80008b1
-
+
 org/apache/geode/cache/query/internal/ResultsBag,2
 fromData,106,2a2bb80018c00019b5001a2a2bb9001b0100b50017b2001c9a00162ab400179c000fbb001d592ab40017b7001ebf2a2ab6001fb500042a2bb600202ab400172ab40021643d1c9e00232bb800184e2bb9001b010036042ab400042d1504b60022571c1504643da7ffdfb1
 toData,116,2ab4001a2bb800242b2ab60025b9002602002a2bb600272ab600252ab40021643d2ab40004b60028b9002901004e2db9000a010099003f1c9e003b2db9000b0100c0002a3a041904b6002b3a0519052bb800241904b6002c36061c1506a200061c36062b1506b9002602001c1506643da7ffbeb1
-
+
 org/apache/geode/cache/query/internal/ResultsCollectionWrapper,2
 fromData,55,2bb9005801003d1c99000e2a2bb80059b50002a7000e2a2bb8005ac0005bb500022a2bb8005ac0005cb5000d2a2bb900580100b50004b1
 toData,60,2ab40002c100543d2b1cb9005502001c9900112ab40002c0004e2bb80056a7000b2ab400022bb800572ab4000d2bb800572b2ab40004b900550200b1
-
+
 org/apache/geode/cache/query/internal/ResultsSet,2
 fromData,49,2bb9001801003dbb001959b7001a4e2d2bb8001b2a2db600051c360415049e00122a2bb8001cb6001d578404ffa7ffefb1
 toData,70,2b2ab6001eb9001f02002ab60020b900040100c000194d2cc6000704a70004031221b800222c2bb800232ab600244e2db9002501009900102db9002601002bb80027a7ffedb1
-
+
 org/apache/geode/cache/query/internal/SortedResultSet,2
 fromData,40,2bb9001601003d2a2bb80017c00018b500081c3e1d9e00122a2bb80017b60019578403ffa7fff0b1
 toData,46,2b2ab6001ab9001b02002ab400082bb8001c2ab6001d4d2cb9001e01009900102cb9001f01002bb8001ca7ffedb1
-
+
 org/apache/geode/cache/query/internal/SortedStructSet,2
 fromData,57,2a2bb900440100b500022bb9004501003d2a2bb80046c00034b500091c3e1d9e00192bb80046c000283a042a1904b60013578403ffa7ffe9b1
 toData,64,2b2ab40002b9004702002b2ab6002bb9004802002ab400092bb800492ab6002c4d2cb9002601009900182cb900270100c00028c000284e2d2bb8004aa7ffe5b1
-
+
 org/apache/geode/cache/query/internal/StructBag,2
 fromData,16,2a2bb700482a2bb900490100b50002b1
 toData,16,2a2bb7004a2b2ab40002b9004b0200b1
-
+
 org/apache/geode/cache/query/internal/StructImpl,2
 fromData,72,2a2bb80026c00027b500072a2bb80028b500082ab40008c600302ab400084d2cbe3e03360415041da2001f2c1504323a051905c1000999000b2a04b50002a70009840401a7ffe1b1
 toData,17,2ab400072bb800292ab400082bb8002ab1
-
+
 org/apache/geode/cache/query/internal/StructSet,2
-fromData,58,2abb000359bb000459b70005b70006b500072bb9005001003d2a2bb80051c00040b5000c1c3e1d9e00122a2bb80051b60052578403ffa7fff0b1
-toData,46,2b2ab60039b9005302002ab4000c2bb800542ab600494d2cb9001201009900102cb9001301002bb80054a7ffedb1
-
+fromData,58,2abb000359bb000459b70005b70006b500072bb9005101003d2a2bb80052c00041b5000c1c3e1d9e00122a2bb80052b60031578403ffa7fff0b1
+toData,46,2b2ab6003ab9005302002ab4000c2bb800542ab6004a4d2cb9001201009900102cb9001301002bb80054a7ffedb1
+
 org/apache/geode/cache/query/internal/Undefined,2
 fromData,1,b1
 toData,1,b1
-
+
 org/apache/geode/cache/query/internal/index/IndexCreationData,2
 fromData,106,2a2bb9000f0100b500022a2bb9000f0100b500052a2bb9000f0100b500042a2bb900100100b500082bb9001101003d031ca0000d2ab2000cb50003a70019041ca0000d2ab2000eb50003a7000a2ab20012b500032bb9001001003e1d99000d2a2bb9000f0100b50006b1
 toData,122,2b2ab40002b9000a02002b2ab40005b9000a02002b2ab40004b9000a02002b2ab40008b9000b0200b2000c2ab40003a6000d2b03b9000d0200a7001eb2000e2ab40003a6000d2b04b9000d0200a7000a2b05b9000d02002ab40006c600172b04b9000b02002b2ab40006b9000a0200a7000a2b03b9000b0200b1
-
+
 org/apache/geode/cache/query/internal/types/CollectionTypeImpl,2
 fromData,17,2a2bb700232a2bb80024c00025b50003b1
 toData,14,2a2bb700262ab400032bb80027b1
-
+
 org/apache/geode/cache/query/internal/types/MapTypeImpl,2
 fromData,17,2a2bb7001c2a2bb8001dc00015b50003b1
 toData,14,2a2bb7001e2ab400032bb8001fb1
-
+
 org/apache/geode/cache/query/internal/types/ObjectTypeImpl,2
 fromData,9,2a2bb8000ab50002b1
 toData,9,2ab400022bb8000bb1
-
+
 org/apache/geode/cache/query/internal/types/StructTypeImpl,2
 fromData,28,2a2bb700292a2bb8002ab5000b2a2bb8002bc0002cc0002cb5000db1
 toData,22,2a2bb7002d2ab4000b2bb8002e2ab4000d2bb8002fb1
-
+
 org/apache/geode/cache/server/ServerLoad,2
 fromData,41,2a2bb900070100b500022a2bb900070100b500042a2bb900070100b500032a2bb900070100b50005b1
 toData,41,2b2ab40002b9000602002b2ab40004b9000602002b2ab40003b9000602002b2ab40005b900060200b1
-
+
 org/apache/geode/cache/server/internal/ConnectionCountProbe,2
 fromData,1,b1
 toData,1,b1
-
+
 org/apache/geode/distributed/internal/DistributionAdvisor$Profile,2
 fromData,40,2abb001259b70013b500082ab400082bb800142a2bb900150100b500092a2bb900150100b50003b1
 toData,29,2ab400082bb800102b2ab40009b9001102002b2ab40003b900110200b1
-
+
 org/apache/geode/distributed/internal/DistributionMessage,2
 fromData,1,b1
 toData,1,b1
-
+
 org/apache/geode/distributed/internal/HighPriorityAckedMessage,2
 fromData,51,2a2bb700442a2bb900450100b500122ab800462bb90045010032b500092a2bb900470100b5000a2a2bb80048c00049b50007b1
 toData,47,2a2bb700402b2ab40012b9004102002b2ab40009b60024b9004102002b2ab4000ab9004202002ab400072bb80043b1
-
+
 org/apache/geode/distributed/internal/ReplyMessage,2
 fromData,101,2a2bb7003d2bb9003e01003d2a1c05b8003fb500022a1c1008b8003fb500031c04b8003f99000d2a2bb900400100b500041c07b8003f9900132a2bb80041b500062a04b50007a700141c1040b8003f99000b2a2bb80041b500062a1c1080b8003fb50039b1
 toData,132,2a2bb70038033d2ab400029900081c0580913d2ab4000799000b1c0780913da700102ab40006c600091c104080913d2ab400049900081c0480913d2ab400039900091c100880913d2ab400399900091c108080913d2b1cb9003a02002ab4000499000d2b2ab40004b9003b02002ab400079a000a2ab40006c6000b2ab400062bb8003cb1
-
+
 org/apache/geode/distributed/internal/SerialAckedMessage,2
 fromData,27,2a2bb7002c2a2bb9002d0100b500172a2bb8002ec0001fb50007b1
 toData,24,2a2bb700292b2ab40017b9002a02002ab400072bb8002bb1
-
+
 org/apache/geode/distributed/internal/ServerLocation,2
 fromData,19,2a2bb8000bb500092a2bb9000c0100b5000ab1
 toData,19,2ab400092bb8000d2b2ab4000ab9000e0200b1
-
+
 org/apache/geode/distributed/internal/ShutdownMessage,2
 fromData,27,2a2bb7000c2a2bb9000d0100b500032a2bb8000ec0000fb50002b1
 toData,24,2a2bb700092b2ab40003b9000a02002ab400022bb8000bb1
-
+
 org/apache/geode/distributed/internal/StartupMessage,3
 fromDataProblem,38,2ab40037c7000e2abb006559b70066b500372ab400372bb60067572ab400371268b6006757b1
 fromData,293,2a2bb700692a2bb8006ab500092a2bb9006b0100b5000c2a2bb9006c0100b5000d2a2bb9006c0100b500112bb9006b01003d033e1d1ca2003e2bb8006d3a042bb9006b010036051904c6000d19040301011505b8006ea700183a062ab2006f04bd00205903190653b60024b70070840301a7ffc32bb9006b01003e03360415041da200492bb8006d3a052bb8006d3a062bb9006b010036071905c600121906c6000d19051906150703b80071a700183a082ab2007204bd00205903190853b60024b70070840401a7ffb72a2bb80073c00074b500122a2bb9006b0100b500172a2bb8006ab500182a2bb9006c0100b50019bb005e59b7005f3a0419042bb600752a1904b60076b5000a2a1904b60077b5000b2a1904b60078b5000e2a1904b60079b5000fb1
 toData,318,2a2bb7004b2ab400092bb8004c2b2ab4000cb9004d02002b2ab4000db9004e02002b2ab40011b9004e0200b8004f4d2b2cbeb9004d0200033e1d2cbea2001f2c1d32b600502bb800512b2c1d32b60052b9004d0200840301a7ffe1b800534e2b2dbeb9004d020003360415042dbea200782d150432c100549900302d150432c00054b60055b600563a052d150432c00054b60057b600563a062d150432c00054b600583607a700272d150432c00059b6005a3a052d150432c00059b6005b3a062d150432c00059b6005c360719052bb8005119062bb800512b1507b9004d0200840401a7ff872ab400122bb8005d2b2ab40017b9004d02002ab400182bb8004c2b2ab40019b9004e0200bb005e59b7005f3a0419042ab4000ab6006019042ab4000bb6006119042ab4000eb6006219042ab4000fb6006319042bb60064b1
-
+
 org/apache/geode/distributed/internal/StartupResponseMessage,3
 fromDataProblem,43,2ab40026c7000e2abb003859b70039b500262ab400262bb6003a572ab40026123b123cb8003db6003a57b1
 fromData,220,2a2bb700442a2bb900450100b500202a2bb80046b500092a2bb900470100b5000a2bb9004501003d2a1cbd0013b500032a1cbc0ab50002033e1d1ca200332ab400031d2bb80048532ab400021d2bb9004501004fa700143a042ab400021d2bb9004501004f1904bf840301a7ffce2bb9004501003e2a1dbd0013b500042a1dbd0013b500052a1dbc0ab5000603360415041da2002c2ab4000415042bb80048532ab4000515042bb80048532ab4000615042bb9004501004f840401a7ffd42a2bb80049c0004ab5000c2a2bb900450100b5000e2a2bb80046b50011b1
 toData,170,2a2bb7003e2b2ab40020b9003f02002ab400092bb800402b2ab4000ab9004102002b2ab40002beb9003f0200033d1c2ab40002bea2001f2ab400031c322bb800422b2ab400021c2eb9003f0200840201a7ffde2b2ab40006beb9003f0200033d1c2ab40006bea200292ab400041c322bb800422ab400051c322bb800422b2ab400061c2eb9003f0200840201a7ffd42ab4000c2bb800432b2ab4000eb9003f02002ab400112bb80040b1
-
+
 org/apache/geode/distributed/internal/StartupResponseWithVersionMessage,2
 fromData,43,2a2bb7001f2a2bb80020b50004bb001a59b7001b4d2c2bb600212a2cb60022b500062a2cb60023b50009b1
 toData,43,2a2bb700182ab400042bb80019bb001a59b7001b4d2c2ab40006b6001c2c2ab40009b6001d2c2bb6001eb1
-
+
 org/apache/geode/distributed/internal/WaitForViewInstallation,2
 fromData,26,2a2bb7001c2a2bb9001d0100b500162a2bb9001e0100b50017b1
 toData,26,2a2bb700192b2ab40016b9001a03002b2ab40017b9001b0200b1
-
+
 org/apache/geode/distributed/internal/locks/DLockQueryProcessor$DLockQueryMessage,2
 fromData,42,2a2bb700472a2bb80048b500032a2bb80049b500432a2bb9004a0100b500322a2bb9004b0100b50002b1
 toData,42,2a2bb700412ab400032bb800422ab400432bb800442b2ab40032b9004502002b2ab40002b900460200b1
-
+
 org/apache/geode/distributed/internal/locks/DLockQueryProcessor$DLockQueryReplyMessage,2
 fromData,74,2a2bb700092a2bb9000a0100b500032ab4000304a000352bb8000bc0000c4d2cc600152abb000d592c2bb9000a0100b7000eb500042a2bb9000a0100b500062a2bb9000f0100b50007b1
 toData,83,2a2bb700102b2ab40003b9001102002ab4000304a0003e2ab40004c7000b012bb80012a7001b2ab40004b600052bb800122b2ab40004b60013b9001102002b2ab40006b9001102002b2ab40007b900140300b1
-
+
 org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor$DLockRecoverGrantorMessage,2
 fromData,55,2a2bb700122a2bb80013b500022a2bb900140100b500032a2bb900140100b500052a2bb900150100b500042a2bb80016c00017b50006b1
 toData,52,2a2bb700182ab400022bb800192b2ab40003b9001a02002b2ab40005b9001a02002b2ab40004b9001b03002ab400062bb8001cb1
-
+
 org/apache/geode/distributed/internal/locks/DLockRecoverGrantorProcessor$DLockRecoverGrantorReplyMessage,2
 fromData,30,2a2bb700052a2bb900060100b500022a2bb80007c00008c00008b50003b1
 toData,24,2a2bb700092b2ab40002b9000a02002ab400032bb8000bb1
-
+
 org/apache/geode/distributed/internal/locks/DLockReleaseProcessor$DLockReleaseMessage,2
 fromData,52,2a2bb7004e2a2bb8004fb500032a2bb80050b5002b2a2bb900510100b5002a2a2bb900520100b500022a2bb900520100b50041b1
 toData,52,2a2bb700492ab400032bb8004a2ab4002b2bb8004b2b2ab4002ab9004c02002b2ab40002b9004d02002b2ab40041b9004d0200b1
-
+
 org/apache/geode/distributed/internal/locks/DLockReleaseProcessor$DLockReleaseReplyMessage,2
 fromData,24,2a2bb700052a2bb80006b500072a2bb900080100b50003b1
 toData,24,2a2bb700092ab400072bb8000a2b2ab40003b9000b0200b1
-
+
 org/apache/geode/distributed/internal/locks/DLockRemoteToken,2
 fromData,10,bb000e59120fb70010bf
 toData,53,2ab400112bb800252ab40012b600152bb800252b2ab40012b60026b9002702002b2ab40013b9002702002b2ab40014b900280300b1
-
+
 org/apache/geode/distributed/internal/locks/DLockRequestProcessor$DLockRequestMessage,2
 fromData,134,2a2bb700a62a2bb900a70100b500242a2bb800a8b500102a2bb900a90100b500112a2bb900a90100b500122a2bb900a90100b500132a2bb900aa0100b500552a2bb900aa0100b5000e2a2bb900ab0100b5000f2a2bb900ab0100b500142a2bb900ab0100b500152a2bb900a90100b500162a2bb900ab0100b500172a2bb900ab0100b5006cb1
 toData,134,2a2bb700a02b2ab40024b900a102002ab400102bb800a22b2ab40011b900a303002b2ab40012b900a303002b2ab40013b900a303002b2ab40055b900a402002b2ab4000eb900a402002b2ab4000fb900a502002b2ab40014b900a502002b2ab40015b900a502002b2ab40016b900a303002b2ab40017b900a502002b2ab4006cb900a50200b1
-
+
 org/apache/geode/distributed/internal/locks/DLockRequestProcessor$DLockResponseMessage,2
 fromData,72,2a2bb700442a2bb900450100b500032a2bb900460100b500112a2bb80047b500122a2bb900480100b5003f2a2bb80047b500412a2bb900490100b500132a2bb900490100b50043b1
 toData,72,2a2bb7003b2b2ab40003b9003c02002b2ab40011b9003d02002ab400122bb8003e2b2ab4003fb9004003002ab400412bb8003e2b2ab40013b9004202002b2ab40043b900420200b1
-
+
 org/apache/geode/distributed/internal/locks/DLockService$SuspendLockingToken,2
 fromData,1,b1
 toData,1,b1
-
+
 org/apache/geode/distributed/internal/locks/DeposeGrantorProcessor$DeposeGrantorMessage,2
 fromData,55,2a2bb700162a2bb900170100b500092a2bb80018b500042a2bb80019c0001ab500052a2bb9001b0100b500062a2bb900170100b50007b1
 toData,52,2a2bb7001c2b2ab40009b9001d02002ab400042bb8001e2ab400052bb8001f2b2ab40006b9002003002b2ab40007b9001d0200b1
-
+
 org/apache/geode/distributed/internal/locks/ElderInitProcessor$ElderInitMessage,2
 fromData,16,2a2bb7001d2a2bb9001e0100b50005b1
 toData,16,2a2bb7001f2b2ab40005b900200200b1
-
+
 org/apache/geode/distributed/internal/locks/ElderInitProcessor$ElderInitReplyMessage,2
 fromData,38,2a2bb7000e2a2bb8000fb500042a2bb8000fb500052a2bb8000fb500062a2bb8000fb50007b1
 toData,38,2a2bb700102ab400042bb800112ab400052bb800112ab400062bb800112ab400072bb80011b1
-
+
 org/apache/geode/distributed/internal/locks/GrantorRequestProcessor$GrantorInfoReplyMessage,2
 fromData,47,2a2bb700142a2bb80015c00016b500052a2bb900170100b500092a2bb900180100b5000b2a2bb900190100b50007b1
 toData,44,2a2bb7001a2ab400052bb8001b2b2ab40009b9001c03002b2ab4000bb9001d02002b2ab40007b9001e0200b1
-
+
 org/apache/geode/distributed/internal/locks/GrantorRequestProcessor$GrantorRequestMessage,2
 fromData,73,2a2bb700292a2bb9002a0100b500052a2bb9002b0100b500062a2bb8002cb500072a2bb9002b0100b5000b2a2bb9002d0100b500092ab4000904a0000e2a2bb8002ec0002fb50008b1
 toData,70,2a2bb700302b2ab40005b9003103002b2ab40006b9003202002ab400072bb800332b2ab4000bb9003202002b2ab40009b9003402002ab4000904a0000b2ab400082bb80035b1
-
+
 org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor$NonGrantorDestroyedMessage,2
 fromData,24,2a2bb700282a2bb900290100b500082a2bb8002ab50006b1
 toData,24,2a2bb7002b2b2ab40008b9002c02002ab400062bb8002db1
-
+
 org/apache/geode/distributed/internal/locks/NonGrantorDestroyedProcessor$NonGrantorDestroyedReplyMessage,2
 fromData,16,2a2bb700172a2bb900180100b50008b1
 toData,16,2a2bb700192b2ab40008b9001a0200b1
-
-org/apache/geode/distributed/internal/membership/InternalDistributedMember,6
-fromData,33,2a2bb600a22ab4001bb20098b60079a100112ab400292bb900990200a700044db1
-fromDataPre_GFE_7_1_0_0,292,2bb800a34d2bb900a401003e2a2bb80090b500062ab2000399000e2c2ab40006b800a5a700072cb60007b500062bb900a6010036041504047e99000704a700040336051504057e99000704a700040336062a1504077e99000704a7000403b500452a2bb900a40100b500112a2bb900a40100b500022a2bb900a60100b500132a2bb80092b500202a2bb80090b500182ab40013100da0000e2a2bb80090b50019a700172bb800903a071907c6000c2a1907b800a7b500142bb800903a072bb80093b6009436082abb00955919071508b70096b5001ebb0040592ab400112ab400022ab400132ab400142ab400182ab400202ab4001eb700413a092a2c1d150515062bb800a8b600791909b80028b500292ab7000b2ab400139e000704a7000403b8004eb1
-fromDataPre_GFE_9_0_0_0,296,2bb800a34d2bb900a401003e2a2bb80090b500062ab2000399000e2c2ab40006b800a5a700072cb60007b500062bb900a6010036041504047e99000704a700040336051504057e99000704a700040336062a1504077e99000704a7000403b500452a2bb900a40100b500112a2bb900a40100b500022a2bb900a60100b500132a2bb80092b500202a2bb80090b500182ab40013100da0000e2a2bb80090b50019a700172bb800903a071907c6000c2a1907b800a7b500142bb800903a072bb80093b6009436082abb00955919071508b70096b5001e2a15042bb70097bb0040592ab400112ab400022ab400132ab400142ab400182ab400202ab4001eb700413a092a2c1d150515062ab4001b1909b80028b500292ab7000b2ab400139e000704a7000403b8004eb1
-toData,29,2a2bb6009c2ab4001bb20098b60079a1000d2ab6009d2bb9008c0200b1
-toDataPre_GFE_7_1_0_0,226,2ab400139e000704a7000403b8004e2ab6005b2bb8009e2b2ab6005ab9009f02002ab400062bb80083033d2ab40029b9008401009900071c04803d2ab40029b9007401009900071c05803d2ab400459900071c07803d2b1c1100ff7e91b900a002002b2ab40011b9009f02002b2ab40002b9009f02002b2ab40013b900a002002ab400202bb800862ab400182bb800832ab40013100da0000e2ab400192bb80083a7000e2ab40014b800a12bb800832ab4001ec700081252a7000a2ab4001eb600872bb800832ab4001ec7000911012ca7000a2ab4001eb60088b800892bb8008ab1
-toDataPre_GFE_9_0_0_0,225,2ab6005b2bb8009e2b2ab6005ab9009f02002ab400062bb80083033d2ab40029b9008401009900071c04803d2ab40029b9007401009900071c05803d2ab400459900071c07803d1c1008803d2b1c1100ff7e91b900a002002b2ab40011b9009f02002b2ab40002b9009f02002b2ab40013b900a002002ab400202bb800862ab400182bb800832ab40013100da0000e2ab400192bb80083a7000e2ab40014b800a12bb800832ab4001ec700081252a7000a2ab4001eb600872bb800832ab4001ec7000911012ca7000a2ab4001eb60088b800892bb8008a2b2ab4001b04b8008bb1
-
+
+org/apache/geode/distributed/internal/membership/InternalDistributedMember,4
+fromData,313,2bb8009f4d2bb900a001003e2a2bb8008fb500072ab2000499000e2c2ab40007b800a1a700072cb60008b500072bb900a2010036041504047e99000704a700040336051504057e99000704a700040336062a1504077e99000704a7000403b5003a2bb900a0010036072bb900a0010036082bb900a2010036092bb800913a0a02360b2bb8008f3a0c1509100da0000e2a2bb8008fb50014a700152bb8008f3a0d190dc6000a190db800a3360b2bb8008f3a0d2bb80092b60093360e190db600779e0011bb004f59190d150eb70050a70004013a0f2a15042bb700943610bb003159150715081509150b190c190a190fb700323a112a2c1d1505150615101911b80018b500012ab40001b9003e01009e000704a7000403b800471510b20095b60078a10017150410107e1010a0000d2ab400012bb900960200b1
+fromDataPre_GFE_7_1_0_0,282,2bb8009f4d2bb900a001003e2a2bb8008fb500072ab2000499000e2c2ab40007b800a1a700072cb60008b500072bb900a2010036041504047e99000704a700040336051504057e99000704a700040336062a1504077e99000704a7000403b5003a2bb900a0010036072bb900a0010036082bb900a2010036092bb800913a0a02360b2bb8008f3a0c1509100da0000e2a2bb8008fb50014a700152bb8008f3a0d190dc6000a190db800a3360b2bb8008f3a0d2bb80092b60093360e190db600779e0011bb004f59190d150eb70050a70004013a0f2a15042bb700943610bb003159150715081509150b190c190a190fb700323a112a2c1d1505150615101911b80018b500012ab40001b9003e01009e000704a7000403b80047b1
+toData,313,2ab600592bb800992b2ab60058b9009a02002ab400072bb80082033d2ab40001b9008301009900071c04803d2ab40001b9007301009900071c05803d2ab4003a9900071c07803d1c1008803d2ab40001b9009b01003e1d9900081c1010803d2b1c1100ff7e91b9009c02002b2ab40001b9003d0100b9009a02002b2ab40001b9004b0100b9009a02002ab40001b9003e010036042b1504b9009c02002ab40001b9004001002bb800852ab40001b9004c01002bb800821504100da0000e2ab400142bb80082a700132ab40001b9003f0100b8009d2bb800822ab40001b9004e01003a051905c70008124da700081905b600862bb800821905c7000911012ca700081905b60087b800882bb800892ab40001b90019010036062b150604b8008a1506b20095b60078a100111d99000d2ab6009e2bb9008b0200b1
+toDataPre_GFE_7_1_0_0,271,2ab40001b9003e01009e000704a7000403b800472ab600592bb800992b2ab60058b9009a02002ab400072bb80082033d2ab40001b9008301009900071c04803d2ab40001b9007301009900071c05803d2ab4003a9900071c07803d2b1c1100ff7e91b9009c02002b2ab40001b9003d0100b9009a02002b2ab40001b9004b0100b9009a02002b2ab40001b9003e0100b9009c02002ab40001b9004001002bb800852ab40001b9004c01002bb800822ab40001b9003e01003e1d100da0000e2ab400142bb80082a700132ab40001b9003f0100b8009d2bb800822ab40001b9004e01003a041904c70008124da700081904b600862bb800821904c7000911012ca700081904b60087b800882bb80089b1
+
 org/apache/geode/distributed/internal/membership/NetView,2
 fromData,98,2a2bb80070c0002db500132a2bb900710100b500082a2bb80072b5000bb200429a00122ab4000bc7000bbb004359b70044bf2abb000c592ab4000bb7000db5000e2a2bb80073b500102a2bb80073b500122a2bb80074b500052a2bb80075b50004b1
 toData,60,2ab400132bb8006a2b2ab40008b9006b02002a2ab4000b2bb7006c2ab400102bb8006d2ab400122bb8006d2ab400052bb8006e2ab400042bb8006fb1
-
+
 org/apache/geode/distributed/internal/membership/gms/GMSMember,2
-fromData,62,2a2bb600472a2bb900480100b500052a2bb900490100b5003b2a2bb900490100b500072a2bb900480100b500062a2bb8004ab500082a2bb8004bb50009b1
-toData,62,2a2bb6003e2b2ab40005b9003f02002b2ab4003bb9004002002b2ab40007b9004002002b2ab40006b9003f02002ab400082bb800412ab400092bb80042b1
-
+fromData,62,2a2bb600482a2bb900490100b500072a2bb9004a0100b5003c2a2bb9004a0100b500092a2bb900490100b500082a2bb8004bb5000a2a2bb8004cb5000bb1
+toData,62,2a2bb6003f2b2ab40007b9004002002b2ab4003cb9004102002b2ab40009b9004102002b2ab40008b9004002002ab4000a2bb800422ab4000b2bb80043b1
+
 org/apache/geode/distributed/internal/membership/gms/locator/FindCoordinatorRequest,2
 fromData,97,2a2bb8001dc0001ab500022bb9001e01003d2abb001f591cb70020b50005033e1d1ca2001a2ab400052bb8001dc0001ab90021020057840301a7ffe72a2bb9001e0100b500062a2bb9001e0100b500082a2bb80022b500042a2bb80023b50007b1
 toData,114,2ab400022bb800142ab40005c6003a2b2ab40005b900150100b9001602002ab40005b9001701004d2cb9001801009900152cb900190100c0001a4e2d2bb80014a7ffe8a7000a2b03b9001602002b2ab40006b9001602002b2ab40008b9001602002ab400042bb8001b2ab400072bb8001cb1
-
+
 org/apache/geode/distributed/internal/membership/gms/locator/FindCoordinatorResponse,2
 fromData,105,2a2bb80026c00027b500022a2bb80026c00027b500032a2bb80028b5000a2a2bb80029b5000c2a2bb9002a0100b500092ab400099a00342a2bb9002a0100b500042a2bb9002a0100b500072a2bb9002a0100b500082a2bb80026c0002bb500052a2bb8002cb50006b1
 toData,89,2ab400022bb800212ab400032bb800212ab4000a2bb800222ab4000c2bb800232b2ab40009b9002402002b2ab40004b9002402002b2ab40007b9002402002b2ab40008b9002402002ab400052bb800212ab400062bb80025b1
-
+
 org/apache/geode/distributed/internal/membership/gms/locator/GetViewRequest,2
 fromData,1,b1
 toData,1,b1
-
+
 org/apache/geode/distributed/internal/membership/gms/locator/GetViewResponse,2
 fromData,12,2a2bb80005c00006b50002b1
 toData,9,2ab400022bb80004b1
-
+
 org/apache/geode/distributed/internal/membership/gms/messages/HeartbeatMessage,2
 fromData,11,2a2bb900110100b50002b1
 toData,11,2b2ab40002b900100200b1
-
+
 org/apache/geode/distributed/internal/membership/gms/messages/HeartbeatRequestMessage,2
 fromData,22,2a2bb900130100b500022a2bb80014c00015b50003b1
 toData,19,2b2ab40002b9001102002ab400032bb80012b1
-
+
 org/apache/geode/distributed/internal/membership/gms/messages/InstallViewMessage,2
 fromData,49,2a2bb700112a2bb900120100b500072ab800132bb90012010032b500052a2bb80014c00015b500022a2bb80014b50006b1
 toData,45,2a2bb7000d2b2ab40007b9000e02002b2ab40005b6000fb9000e02002ab400022bb800102ab400062bb80010b1
-
+
 org/apache/geode/distributed/internal/membership/gms/messages/JoinRequestMessage,2
 fromData,48,2a2bb8001bc0001cb500042a2bb8001bb500052a2bb8001db500022a2bb9001e0100b6001f2a2bb900200100b50006b1
 toData,45,2ab400042bb800162ab400052bb800162ab400022bb800172b2ab60018b9001902002b2ab40006b9001a0200b1
-
+
 org/apache/geode/distributed/internal/membership/gms/messages/JoinResponseMessage,2
 fromData,47,2a2bb8001bc0001cb500022a2bb8001bc0001db500032a2bb8001eb500072a2bb8001fb500082a2bb8001fb50006b1
 toData,41,2ab400022bb800182ab400032bb800182ab400072bb800192ab400082bb8001a2ab400062bb8001ab1
-
+
 org/apache/geode/distributed/internal/membership/gms/messages/LeaveRequestMessage,2
 fromData,20,2a2bb8000cc0000db500032a2bb8000eb50004b1
 toData,17,2ab400032bb8000a2ab400042bb8000bb1
-
+
 org/apache/geode/distributed/internal/membership/gms/messages/RemoveMemberMessage,2
 fromData,20,2a2bb80015c00016b500032a2bb80017b50004b1
 toData,17,2ab400032bb800132ab400042bb80014b1
-
+
 org/apache/geode/distributed/internal/membership/gms/messages/SuspectMembersMessage,2
 fromData,53,2bb9001b01003d033e1d1ca20029bb0016592bb8001cc0001d2bb8001eb7001f3a042ab400031904b90020020057840301a7ffd8b1
 toData,81,2ab40003c600452b2ab40003b900110100b9001202002ab40003b9001301004d2cb9001401009900202cb900150100c000164e2db600172bb800182db600192bb8001aa7ffdda7000a2b03b900120200b1
-
+
 org/apache/geode/distributed/internal/membership/gms/messages/ViewAckMessage,2
 fromData,37,2a2bb7000e2a2bb9000f0100b500032a2bb900100100b500042a2bb80011c00012b50005b1
 toData,34,2a2bb7000a2b2ab40003b9000b02002b2ab40004b9000c02002ab400052bb8000db1
-
+
 org/apache/geode/distributed/internal/membership/gms/mgr/LocalViewMessage,2
 fromData,8,bb000859b70009bf
 toData,8,bb000859b70009bf
-
+
 org/apache/geode/distributed/internal/streaming/StreamingOperation$RequestStreamingMessage,2
 fromData,16,2a2bb700202a2bb900210100b50003b1
 toData,16,2a2bb700222b2ab40003b900230200b1
-
+
 org/apache/geode/distributed/internal/streaming/StreamingOperation$StreamingReplyMessage,2
 fromData,339,2a2bb700142bb9001501003d2a2bb900150100b500102a2bb900160100b500112a2bb900160100b500032bb800174e2db20018b600199e000704a700040336041c02a0000b2a01b50002a701082a1cb5000e2abb001a591cb7001bb500022ab4000399000704b8001c2ab40008b8001d3a051905c1001e3606013a07150699000d1905c0001eb6001f3a0703360803360915091ca20087b20020c6000cb2002006b900210200150699000fb80022990009043608a700672bb800233a0a150699004a1907c600451907b90024010099003b1504360b150b99001715099a0012190ac100259a000704a7000403360b150b990019bb0026591907c00027190ac00028c00028b700293a0a2ab40002190ab9002a020057840901a7ff7915089900172a04b50004b20020c6000cb2002005b9002102002ab4000399001a03b8001ca700133a0c2ab4000399000703b8001c190cbfb1
 toData,85,2a2bb7002b2ab4000dc7000d2b02b9002c0200a7000d2b2ab4000eb9002c02002b2ab40010b9002c02002b2ab40011b9002d02002b2ab40003b9002d02002ab4000dc600122ab4000e9e000b2ab4000d2bb6002eb1
-
+
 org/apache/geode/distributed/internal/tcpserver/InfoRequest,2
 fromData,1,b1
 toData,1,b1
-
+
 org/apache/geode/distributed/internal/tcpserver/InfoResponse,2
 fromData,9,2a2bb80003b50002b1
 toData,9,2ab400022bb80004b1
-
+
 org/apache/geode/distributed/internal/tcpserver/ShutdownRequest,2
 fromData,1,b1
 toData,1,b1
-
+
 org/apache/geode/distributed/internal/tcpserver/ShutdownResponse,2
 fromData,1,b1
 toData,1,b1
-
+
 org/apache/geode/distributed/internal/tcpserver/VersionRequest,2
 fromData,1,b1
 toData,1,b1
-
+
 org/apache/geode/distributed/internal/tcpserver/VersionResponse,2
 fromData,11,2a2bb900060100b50004b1
 toData,11,2b2ab40004b900050200b1
-
+
 org/apache/geode/internal/DSFIDFactory,2
 fromData,8,bb000259b70003bf
 toData,8,bb000259b70003bf
-
+
 org/apache/geode/internal/InternalDataSerializer$RegistrationMessage,2
 fromData,39,2a2bb700282bb800292a2bb8002ab500042a2bb9002b0100b500062a2bb8002cc00008b50009b1
 toData,32,2a2bb700242ab400042bb800252b2ab40006b9002602002ab400092bb80027b1
-
+
 org/apache/geode/internal/InternalInstantiator$RegistrationContextMessage,2
 fromData,14,2a2bb7001a2a2bb8001bb5000db1
 toData,14,2a2bb7001c2ab4000d2bb8001db1
-
+
 org/apache/geode/internal/InternalInstantiator$RegistrationMessage,3
 fromDataProblem,38,2ab4000bc7000e2abb001b59b7001cb5000b2ab4000b2bb6001d572ab4000b121eb6001d57b1
 fromData,125,2a2bb7001f2a2bb80020b500122a2bb80020b50013b80021c6004f2a2ab40012b80022b50003a7001b4d2ab2002404bd002559032c53b60026b700272a01b500032a2ab40013b80022b50005a7001b4d2ab2002804bd002559032c53b60026b700272a01b500052a2bb900290100b500072a2bb8002ac00009b5000ab1
 toData,46,2a2bb700162ab40003b600172bb800182ab40005b600172bb800182b2ab40007b9001902002ab4000a2bb8001ab1
-
+
 org/apache/geode/internal/ManagerInfo,2
 fromData,61,2a2bb900540100b500182a2bb900540100b500192a2bb900540100b5001a2bb9005501003d1c9e00161cbc084e2b2db9005602002a2db80057b5001bb1
 toData,74,2b2ab40018b9005002002b2ab40019b9005002002b2ab4001ab9005002002ab4001bc7000d2b03b900510200a7001d2ab4001bb600524d2b2cbeb9005102002b2c032cbeb900530400b1
-
+
 org/apache/geode/internal/admin/ClientMembershipMessage,2
 fromData,32,2a2bb7000d2a2bb8000eb500022a2bb8000eb500032a2bb9000f0100b50004b1
 toData,32,2a2bb7000a2ab400022bb8000b2ab400032bb8000b2b2ab40004b9000c0200b1
-
+
 org/apache/geode/internal/admin/remote/AddHealthListenerRequest,2
 fromData,17,2a2bb700102a2bb80011c00012b50007b1
 toData,14,2a2bb7000e2ab400072bb8000fb1
-
+
 org/apache/geode/internal/admin/remote/AddHealthListenerResponse,2
 fromData,16,2a2bb7000c2a2bb9000d0100b50008b1
 toData,16,2a2bb7000a2b2ab40008b9000b0200b1
-
+
 org/apache/geode/internal/admin/remote/AddStatListenerRequest,2
 fromData,26,2a2bb700112a2bb900120100b500042a2bb900130100b50006b1
 toData,26,2a2bb7000e2b2ab40004b9000f03002b2ab40006b900100200b1
-
+
 org/apache/geode/internal/admin/remote/AddStatListenerResponse,2
 fromData,16,2a2bb7000c2a2bb9000d0100b50008b1
 toData,16,2a2bb7000a2b2ab40008b9000b0200b1
-
+
 org/apache/geode/internal/admin/remote/AdminConsoleDisconnectMessage,2
 fromData,34,2a2bb7001a2a2bb9001b0100b500052a2bb9001b0100b500042a2bb8001cb50007b1
 toData,34,2a2bb700172b2ab40005b9001802002b2ab40004b9001802002ab400072bb80019b1
-
+
 org/apache/geode/internal/admin/remote/AdminConsoleMessage,2
 fromData,16,2a2bb7000f2a2bb900100100b50005b1
 toData,16,2a2bb7000d2b2ab40005b9000e0200b1
-
+
 org/apache/geode/internal/admin/remote/AdminFailureResponse,2
 fromData,17,2a2bb700092a2bb8000ac0000bb50005b1
 toData,14,2a2bb700072ab400052bb80008b1
-
+
 org/apache/geode/internal/admin/remote/AdminRequest,2
 fromData,24,2a2bb7002b2a2bb9002c0100b500052a2bb8002db50003b1
 toData,24,2a2bb700282b2ab40005b9002902002ab400032bb8002ab1
-
+
 org/apache/geode/internal/admin/remote/AdminResponse,2
 fromData,16,2a2bb700062a2bb900070100b50002b1
 toData,16,2a2bb700042b2ab40002b900050200b1
-
+
 org/apache/geode/internal/admin/remote/AlertLevelChangeMessage,2
 fromData,16,2a2bb700132a2bb900140100b50004b1
 toData,16,2a2bb700112b2ab40004b900120200b1
-
+
 org/apache/geode/internal/admin/remote/AlertListenerMessage,2
 fromData,69,2a2bb7001f2a2bb900200100b500062a2bb80021c00022b500072a2bb80023b500082a2bb80023b5000a2a2bb900240100b5000b2a2bb80023b5000c2a2bb80023b5000db1
 toData,66,2a2bb7001a2b2ab40006b9001b02002ab400072bb8001c2ab400082bb8001d2ab4000a2bb8001d2b2ab4000bb9001e03002ab4000c2bb8001d2ab4000d2bb8001db1
-
+
 org/apache/geode/internal/admin/remote/AlertsNotificationMessage,2
 fromData,20,2a2bb700052a2bb80006c00007c00007b50003b1
 toData,14,2a2bb700022ab400032bb80004b1
-
+
 org/apache/geode/internal/admin/remote/AppCacheSnapshotMessage,2
 fromData,16,2a2bb700122a2bb900130100b50005b1
 toData,16,2a2bb700102b2ab40005b900110200b1
-
+
 org/apache/geode/internal/admin/remote/BridgeServerRequest,2
 fromData,47,2a2bb700182a2bb900190100b500052a2bb900190100b500062a2bb8001ac0001bb5000a2a2bb900190100b5000fb1
 toData,44,2a2bb700152b2ab40005b9001602002b2ab40006b9001602002ab4000a2bb800172b2ab4000fb900160200b1
-
+
 org/apache/geode/internal/admin/remote/BridgeServerResponse,2
 fromData,28,2a2bb700282a2bb80029c0000fb5000b2a2bb80029c00023b50024b1
 toData,22,2a2bb700262ab4000b2bb800272ab400242bb80027b1
-
+
 org/apache/geode/internal/admin/remote/CacheConfigRequest,2
 fromData,36,2a2bb700112a2bb900120100b500032a2bb900130100b500042a2bb900130100b50006b1
 toData,36,2a2bb7000e2b2ab40003b9000f02002b2ab40004b9001002002b2ab40006b900100200b1
-
+
 org/apache/geode/internal/admin/remote/CacheConfigResponse,2
 fromData,28,2a2bb7001c2a2bb8001dc00014b500092a2bb8001dc00017b50018b1
 toData,22,2a2bb7001a2ab400092bb8001b2ab400182bb8001bb1
-
+
 org/apache/geode/internal/admin/remote/CacheInfoRequest,2
 fromData,6,2a2bb7000bb1
 toData,6,2a2bb7000ab1
-
+
 org/apache/geode/internal/admin/remote/CacheInfoResponse,2
 fromData,17,2a2bb7000f2a2bb80010c00008b5000ab1
 toData,14,2a2bb7000d2ab4000a2bb8000eb1
-
+
 org/apache/geode/internal/admin/remote/CancelStatListenerRequest,2
 fromData,16,2a2bb7000d2a2bb9000e0100b50003b1
 toData,16,2a2bb7000b2b2ab40003b9000c0200b1
-
+
 org/apache/geode/internal/admin/remote/CancelStatListenerResponse,2
 fromData,6,2a2bb7000ab1
 toData,6,2a2bb70009b1
-
+
 org/apache/geode/internal/admin/remote/CancellationMessage,2
 fromData,16,2a2bb7000c2a2bb9000d0100b50004b1
 toData,16,2a2bb7000a2b2ab40004b9000b0200b1
-
+
 org/apache/geode/internal/admin/remote/ChangeRefreshIntervalMessage,2
 fromData,16,2a2bb700072a2bb900080100b50003b1
 toData,16,2a2bb700052b2ab40003b900060300b1
-
+
 org/apache/geode/internal/admin/remote/ClientHealthStats,4
 fromData,73,2a2bb80011b500052a2bb80011b500062a2bb80011b500072a2bb80011b500082a2bb80011b500092a2bb80011b5000b2a2bb80012b5000a2a2bb80013b5000c2a2bb80014b50004b1
 fromDataPre_GFE_8_0_0_0,65,2a2bb80011b500052a2bb80011b500062a2bb80011b500072a2bb80011b500082a2bb80011b500092a2bb80011b5000b2a2bb80012b5000a2a2bb80013b5000cb1
 toData,73,2ab400052bb8000d2ab400062bb8000d2ab400072bb8000d2ab400082bb8000d2ab400092bb8000d2ab4000b2bb8000d2ab4000a2bb8000e2ab4000c2bb8000f2ab400042bb80010b1
 toDataPre_GFE_8_0_0_0,65,2ab400052bb8000d2ab400062bb8000d2ab400072bb8000d2ab400082bb8000d2ab400092bb8000d2ab4000b2bb8000d2ab4000a2bb8000e2ab4000c2bb8000fb1
-
+
 org/apache/geode/internal/admin/remote/CompactRequest,2
 fromData,6,2a2bb70027b1
 toData,6,2a2bb70028b1
-
+
 org/apache/geode/internal/admin/remote/CompactResponse,2
 fromData,14,2a2bb700042a2bb80005b50003b1
 toData,14,2a2bb700062ab400032bb80007b1
-
+
 org/apache/geode/internal/admin/remote/DestroyEntryMessage,2
 fromData,25,2a2bb7001b2a2bb8001cc0001db500042a2bb8001cb50005b1
 toData,22,2a2bb700192ab400042bb8001a2ab400052bb8001ab1
-
+
 org/apache/geode/internal/admin/remote/DestroyRegionMessage,2
 fromData,17,2a2bb7001a2a2bb8001bc0001cb50004b1
 toData,14,2a2bb700182ab400042bb80019b1
-
+
 org/apache/geode/internal/admin/remote/DurableClientInfoRequest,2
 fromData,28,2a2bb7000c2a2bb8000db500032a2bb9000e0100b500042ab80005b1
 toData,24,2a2bb700092ab400032bb8000a2b2ab40004b9000b0200b1
-
+
 org/apache/geode/internal/admin/remote/DurableClientInfoResponse,2
 fromData,16,2a2bb700172a2bb900180100b50002b1
 toData,16,2a2bb700152b2ab40002b900160200b1
-
+
 org/apache/geode/internal/admin/remote/FetchDistLockInfoRequest,2
 fromData,6,2a2bb7000bb1
 toData,6,2a2bb7000ab1
-
+
 org/apache/geode/internal/admin/remote/FetchDistLockInfoResponse,2
 fromData,20,2a2bb7001e2a2bb8001fc00018c00018b50019b1
 toData,14,2a2bb7001c2ab400192bb8001db1
-
+
 org/apache/geode/internal/admin/remote/FetchHealthDiagnosisRequest,2
 fromData,27,2a2bb7000d2bb9000e01003d2bb8000fc000104e2a1c2db70003b1
 toData,24,2a2bb7000a2b2ab40005b9000b02002ab400062bb8000cb1
-
+
 org/apache/geode/internal/admin/remote/FetchHealthDiagnosisResponse,2
 fromData,14,2a2bb7000c2a2bb8000db50008b1
 toData,14,2a2bb7000a2ab400082bb8000bb1
-
+
 org/apache/geode/internal/admin/remote/FetchHostRequest,2
 fromData,6,2a2bb7000bb1
 toData,6,2a2bb7000ab1
-
+
 org/apache/geode/internal/admin/remote/FetchHostResponse,2
 fromData,67,2a2bb700342a2bb80035b500132a2bb80036c00037b5000e2a2bb80036c00014b500262a2bb80036c00014b500192a2bb900380100b5002d2a2bb900390100b50002b1
 toData,58,2a2bb7002f2ab400132bb800302ab4000e2bb800312ab400262bb800312ab400192bb800312b2ab4002db9003203002b2ab40002b900330200b1
-
+
 org/apache/geode/internal/admin/remote/FetchResourceAttributesRequest,2
 fromData,16,2a2bb7000d2a2bb9000e0100b50003b1
 toData,16,2a2bb7000b2b2ab40003b9000c0300b1
-
+
 org/apache/geode/internal/admin/remote/FetchResourceAttributesResponse,2
 fromData,20,2a2bb7000f2a2bb80010c00011c00011b50009b1
 toData,14,2a2bb7000d2ab400092bb8000eb1
-
+
 org/apache/geode/internal/admin/remote/FetchStatsRequest,2
 fromData,14,2a2bb7000c2a2bb8000db50003b1
 toData,14,2a2bb7000a2ab400032bb8000bb1
-
+
 org/apache/geode/internal/admin/remote/FetchStatsResponse,2
 fromData,20,2a2bb700152a2bb80016c00011c00011b5000fb1
 toData,14,2a2bb700132ab4000f2bb80014b1
-
+
 org/apache/geode/internal/admin/remote/FetchSysCfgRequest,2
 fromData,6,2a2bb7000bb1
 toData,6,2a2bb7000ab1
-
+
 org/apache/geode/internal/admin/remote/FetchSysCfgResponse,2
 fromData,17,2a2bb7000d2a2bb8000ec0000fb50009b1
 toData,14,2a2bb7000b2ab400092bb8000cb1
-
+
 org/apache/geode/internal/admin/remote/FlushAppCacheSnapshotMessage,2
 fromData,6,2a2bb70006b1
 toData,6,2a2bb70005b1
-
+
 org/apache/geode/internal/admin/remote/HealthListenerMessage,2
 fromData,27,2a2bb7000e2a2bb9000f0100b500042a2bb80010c00011b50005b1
 toData,24,2a2bb7000b2b2ab40004b9000c02002ab400052bb8000db1
-
+
 org/apache/geode/internal/admin/remote/LicenseInfoRequest,2
 fromData,6,2a2bb7000bb1
 toData,6,2a2bb7000ab1
-
+
 org/apache/geode/internal/admin/remote/LicenseInfoResponse,2
 fromData,17,2a2bb7000b2a2bb8000cc00005b50007b1
 toData,14,2a2bb700092ab400072bb8000ab1
-
+
 org/apache/geode/internal/admin/remote/MissingPersistentIDsRequest,1
 fromData,6,2a2bb7002eb1
-
+
 org/apache/geode/internal/admin/remote/MissingPersistentIDsResponse,2
 fromData,124,2a2bb700072bb9000801003d2abb0009591cb7000ab50002033e1d1ca20024bb000b59b7000c3a0419042bb8000d2ab400021904b9000e020057840301a7ffdd2bb9000801003d2abb0009591cb7000ab50003033e1d1ca20024bb000b59b7000c3a0419042bb8000d2ab400031904b9000e020057840301a7ffddb1
 toData,110,2a2bb7000f2b2ab40002b900100100b9001102002ab40002b9001201004d2cb9001301009900152cb900140100c000154e2d2bb80016a7ffe82b2ab40003b900100100b9001102002ab40003b9001201004d2cb9001301009900152cb900140100c000154e2d2bb80016a7ffe8b1
-
+
 org/apache/geode/internal/admin/remote/ObjectDetailsRequest,2
 fromData,24,2a2bb700182a2bb80019b500032a2bb9001a0100b50004b1
 toData,24,2a2bb700152ab400032bb800162b2ab40004b900170200b1
-
+
 org/apache/geode/internal/admin/remote/ObjectDetailsResponse,2
 fromData,33,2a2bb700192a2bb8001ab5000b2a2bb8001ab5000d2a2bb8001ac0000eb50011b1
 toData,30,2a2bb700172ab4000b2bb800182ab4000d2bb800182ab400112bb80018b1
-
+
 org/apache/geode/internal/admin/remote/ObjectNamesRequest,2
 fromData,6,2a2bb70014b1
 toData,6,2a2bb70013b1
-
+
 org/apache/geode/internal/admin/remote/ObjectNamesResponse,2
 fromData,17,2a2bb700162a2bb80017c00008b5000ab1
 toData,14,2a2bb700142ab4000a2bb80015b1
-
+
 org/apache/geode/internal/admin/remote/PrepareRevokePersistentIDRequest,2
 fromData,35,2a2bb700282abb002959b7002ab500022ab400022bb8002b2a2bb9002c0100b50003b1
 toData,24,2a2bb7002d2ab400022bb8002e2b2ab40003b9002f0200b1
-
+
 org/apache/geode/internal/admin/remote/RefreshMemberSnapshotRequest,2
 fromData,6,2a2bb70009b1
 toData,6,2a2bb70008b1
-
+
 org/apache/geode/internal/admin/remote/RefreshMemberSnapshotResponse,2
 fromData,17,2a2bb7000e2a2bb8000fc00008b5000ab1
 toData,14,2a2bb7000c2ab4000a2bb8000db1
-
+
 org/apache/geode/internal/admin/remote/RegionAdminMessage,2
 fromData,14,2a2bb700072a2bb80008b50002b1
 toData,14,2a2bb700052ab400022bb80006b1
-
+
 org/apache/geode/internal/admin/remote/RegionAdminRequest,2
 fromData,14,2a2bb7000d2a2bb8000eb50002b1
 toData,14,2a2bb7000b2ab400022bb8000cb1
-
+
 org/apache/geode/internal/admin/remote/RegionAttributesRequest,2
 fromData,6,2a2bb7000db1
 toData,6,2a2bb7000cb1
-
+
 org/apache/geode/internal/admin/remote/RegionAttributesResponse,2
 fromData,17,2a2bb7000c2a2bb8000dc00005b50008b1
 toData,14,2a2bb7000a2ab400082bb8000bb1
-
+
 org/apache/geode/internal/admin/remote/RegionRequest,2
 fromData,57,2a2bb700142a2bb900150100b500032a2bb900150100b500052a2bb80016b500062a2bb80016b500082a2bb80017c00018b5000b2ab80007b1
 toData,50,2a2bb700102b2ab40003b9001102002b2ab40005b9001102002ab400062bb800122ab400082bb800122ab4000b2bb80013b1
-
+
 org/apache/geode/internal/admin/remote/RegionResponse,2
 fromData,33,2a2bb700262a2bb80027b500162a2bb80027b5001b2a2bb80028c0001db5001eb1
 toData,30,2a2bb700232ab400162bb800242ab4001b2bb800242ab4001e2bb80025b1
-
+
 org/apache/geode/internal/admin/remote/RegionSizeRequest,2
 fromData,6,2a2bb70015b1
 toData,6,2a2bb70014b1
-
+
 org/apache/geode/internal/admin/remote/RegionSizeResponse,2
 fromData,26,2a2bb7000e2a2bb9000f0100b500082a2bb9000f0100b5000ab1
 toData,26,2a2bb7000c2b2ab40008b9000d02002b2ab4000ab9000d0200b1
-
+
 org/apache/geode/internal/admin/remote/RegionStatisticsRequest,2
 fromData,6,2a2bb7000db1
 toData,6,2a2bb7000cb1
-
+
 org/apache/geode/internal/admin/remote/RegionStatisticsResponse,2
 fromData,17,2a2bb7000c2a2bb8000dc00005b50008b1
 toData,14,2a2bb7000a2ab400082bb8000bb1
-
+
 org/apache/geode/internal/admin/remote/RegionSubRegionSizeRequest,2
 fromData,6,2a2bb70010b1
 toData,6,2a2bb7000fb1
-
+
 org/apache/geode/internal/admin/remote/RegionSubRegionsSizeResponse,2
 fromData,27,2a2bb700212a2bb900220100b500062a2bb80023c0000ab50002b1
 toData,24,2a2bb7001e2b2ab40006b9001f02002ab400022bb80020b1
-
+
 org/apache/geode/internal/admin/remote/RemoteBridgeServer,2
 fromData,217,2a2bb900420100b500032a2bb900430100b5000a2a2bb900430100b500102a2bb900420100b500122a2bb900420100b500162a2bb900420100b5000e2a2bb900420100b500182a2bb900420100b5001a2a2bb900420100b500142a2bb80044b600452a2bb80046b600472a2bb80044b600482a2bb80049c0004ab6004b2a2bb8004cb6004d2a2bb900420100b5000c2a2bb900430100b500232ab600412bb900420100b9002902002ab600412bb80044b9002702002bb800444d2cc600102ab600412cb9002b0200a700102ab600412bb80044b9002d0200b1
 toData,217,2b2ab40003b9003b02002b2ab4000ab9003c02002b2ab40010b9003c02002b2ab40012b9003b02002b2ab40016b9003b02002b2ab4000eb9003b02002b2ab40018b9003b02002b2ab4001ab9003b02002b2ab40014b9003b02002ab400052bb8003d2ab4001c2bb8003e2ab400072bb8003d2ab4001f2bb8003f2ab400212bb800402b2ab4000cb9003b02002b2ab40023b9003c02002b2ab60041b900280100b9003b02002ab60041b9002601002bb8003d2ab60041b9002a01002bb8003d2ab60041b9002a0100c700102ab60041b9002c01002bb8003db1
-
+
 org/apache/geode/internal/admin/remote/RemoteCacheInfo,2
 fromData,106,2a2bb80030b500032a2bb900310100b500052a2bb900320100b500072a2bb900310100b500092a2bb900310100b5000b2a2bb900310100b5000d2a2bb900310100b5000f2a2bb80033b500102a2bb80034c00020b500112a2bb80035b500122a2bb900320100b50029b1
 toData,103,2ab400032bb8002a2b2ab40005b9002b02002b2ab40007b9002c02002b2ab40009b9002b02002b2ab4000bb9002b02002b2ab4000db9002b02002b2ab4000fb9002b02002ab400102bb8002d2ab400112bb8002e2ab400122bb8002f2b2ab40029b9002c0200b1
-
+
 org/apache/geode/internal/admin/remote/RemoteCacheStatistics,2
 fromData,51,2a2bb900100100b500032a2bb900100100b500052a2bb900100100b500072a2bb900100100b500092a2bb900110100b5000bb1
 toData,51,2b2ab40003b9000e03002b2ab40005b9000e03002b2ab40007b9000e03002b2ab40009b9000e03002b2ab4000bb9000f0200b1
-
+
 org/apache/geode/internal/admin/remote/RemoteDLockInfo,2
 fromData,76,2a2bb80017b500022a2bb80017b500052a2bb80017b500032a2bb900180100b500062a2bb900190100b500092a2bb8001ac0001bb500072a2bb9001c0100b5000c2a2bb9001c0100b5000bb1
 toData,73,2ab400022bb800122ab400052bb800122ab400032bb800122b2ab40006b9001302002b2ab40009b9001402002ab400072bb800152b2ab4000cb9001603002b2ab4000bb900160300b1
-
+
 org/apache/geode/internal/admin/remote/RemoteEntrySnapshot,2
 fromData,36,2a2bb80023b500052a2bb80023b500112a2bb80023c00014b500172a2bb80023b50013b1
 toData,33,2ab400052bb800222ab400112bb800222ab400172bb800222ab400132bb80022b1
-
+
 org/apache/geode/internal/admin/remote/RemoteObjectName,2
 fromData,27,2a2bb80013b500042a2bb80013b500062a2bb900140100b50008b1
 toData,27,2ab400042bb800112ab400062bb800112b2ab40008b900120200b1
-
+
 org/apache/geode/internal/admin/remote/RemoteRegionAttributes,2
 fromData,404,2a2bb80080b500082a2bb80080b5000a2a2bb80081b5000d2a2bb80080b5007a2a2bb80082c00083b5000f2a2bb80082c00083b500112a2bb80082c00084b500132a2bb80082c00084b500152a2bb80082c00084b500172a2bb80080b500192a2bb80082c00084b5001b2a2bb80080b5001d2a2bb80082c00085b5001f2a2bb80082c00086b500212a2bb900870100b500232a2bb900870100b500252a2bb900880100b500272a2bb900890100b5002b2a2bb900880100b5002d2a2bb900870100b5002f2a2bb900870100b500312a2bb900870100b500332a2bb900870100b500352a2bb900870100b500372a2bb80082c0008ab5003b2a2bb80082c0008bc0008bb5003d2a2bb80082c0008cc0008cb5003f2a2bb900870100b5007f2a2bb80082c0008db500412a2bb80082c0008eb500432a2bb80082c0008fb500452a2bb80082c00002b500042a2bb900870100b500472a2bb80080b500392a2bb900870100b5004b2a2bb80081b5004e2a2bb900870100b500052a2bb900870100b500292a2bb80080b500522a2bb900870100b50054b1
 toData,353,2ab400082bb800782ab4000a2bb800782ab4000d2bb800792ab4007a2bb800782ab4000f2bb8007b2ab400112bb8007b2ab400132bb8007b2ab400152bb8007b2ab400172bb8007b2ab400192bb800782ab4001b2bb8007b2ab4001d2bb800782ab4001f2bb8007b2ab400212bb8007b2b2ab40023b9007c02002b2ab40025b9007c02002b2ab40027b9007d02002b2ab4002bb9007e02002b2ab4002db9007d02002b2ab4002fb9007c02002b2ab40031b9007c02002b2ab40033b9007c02002b2ab40035b9007c02002b2ab40037b9007c02002ab4003b2bb8007b2ab4003d2bb8007b2ab4003f2bb8007b2b2ab4007fb9007c02002ab400412bb8007b2ab400432bb8007b2ab400452bb8007b2ab400042bb8007b2b2ab40047b9007c02002ab400392bb800782b2ab4004bb9007c02002ab4004e2bb800792b2ab40005b9007c02002b2ab40029b9007c02002ab400522bb800782b2ab40054b9007c0200b1
-
+
 org/apache/geode/internal/admin/remote/RemoteRegionSnapshot,2
 fromData,59,2a2bb80029b500032a2bb8002ac00009b5000c2a2bb8002ac00005b500072a2bb9002b0100b500102a2bb9002b0100b500122a2bb8002ab5001cb1
 toData,53,2ab400032bb800262ab4000c2bb800272ab400072bb800272b2ab40010b9002802002b2ab40012b9002802002ab4001c2bb80027b1
-
+
 org/apache/geode/internal/admin/remote/RemoteStat,2
 fromData,66,2a2bb8002ab500052a2bb9002b0100b5000e2a2bb9002c0100b500032a2bb8002ab500072a2bb8002ab5000b2a2bb8002dc0002eb500102a2bb9002f0100b50009b1
 toData,63,2ab400052bb800252b2ab4000eb9002602002b2ab40003b9002702002ab400072bb800252ab4000b2bb800252ab400102bb800282b2ab40009b900290200b1
-
+
 org/apache/geode/internal/admin/remote/RemoteStatResource,2
 fromData,45,2a2bb9001a0100b500032a2bb9001a0100b500052a2bb8001bb500072a2bb8001bb5000a2a2bb8001bb5000cb1
 toData,45,2b2ab40003b9001803002b2ab40005b9001803002ab400072bb800192ab4000a2bb800192ab4000c2bb80019b1
-
+
 org/apache/geode/internal/admin/remote/RemoveHealthListenerRequest,2
 fromData,16,2a2bb7000d2a2bb9000e0100b50003b1
 toData,16,2a2bb7000b2b2ab40003b9000c0200b1
-
+
 org/apache/geode/internal/admin/remote/RemoveHealthListenerResponse,2
 fromData,6,2a2bb70008b1
 toData,6,2a2bb70007b1
-
+
 org/apache/geode/internal/admin/remote/ResetHealthStatusRequest,2
 fromData,16,2a2bb7000d2a2bb9000e0100b50003b1
 toData,16,2a2bb7000b2b2ab40003b9000c0200b1
-
+
 org/apache/geode/internal/admin/remote/ResetHealthStatusResponse,2
 fromData,6,2a2bb7000ab1
 toData,6,2a2bb70009b1
-
+
 org/apache/geode/internal/admin/remote/RevokePersistentIDRequest,2
 fromData,25,2a2bb7001c2abb001d59b7001eb500022ab400022bb8001fb1
 toData,14,2a2bb700202ab400022bb80021b1
-
+
 org/apache/geode/internal/admin/remote/RootRegionRequest,2
 fromData,6,2a2bb7000bb1
 toData,6,2a2bb7000ab1
-
+
 org/apache/geode/internal/admin/remote/RootRegionResponse,2
 fromData,34,2a2bb700232a2bb80024c00019c00019b5001a2a2bb80024c00019c00019b5001bb1
 toData,22,2a2bb700212ab4001a2bb800222ab4001b2bb80022b1
-
+
 org/apache/geode/internal/admin/remote/ShutdownAllGatewayHubsRequest,2
 fromData,16,2a2bb700072a2bb900080100b50005b1
 toData,16,2a2bb700092b2ab40005b9000a0200b1
-
+
 org/apache/geode/internal/admin/remote/ShutdownAllRequest,2
 fromData,6,2a2bb70044b1
 toData,6,2a2bb70045b1
-
+
 org/apache/geode/internal/admin/remote/ShutdownAllResponse,2
 fromData,16,2a2bb700072a2bb900080100b50002b1
 toData,16,2a2bb700052b2ab40002b900060200b1
-
+
 org/apache/geode/internal/admin/remote/SnapshotResultMessage,2
 fromData,27,2a2bb7000e2a2bb8000fc00010b500062a2bb900110100b50007b1
 toData,24,2a2bb7000b2ab400062bb8000c2b2ab40007b9000d0200b1
-
+
 org/apache/geode/internal/admin/remote/StatAlertsManagerAssignMessage,2
 fromData,30,2a2bb700102a2bb900110100b500052a2bb80012c00013c00013b50002b1
 toData,24,2a2bb7000d2b2ab40005b9000e03002ab400022bb8000fb1
-
+
 org/apache/geode/internal/admin/remote/StatListenerMessage,2
 fromData,86,2a2bb700112a2bb900120100b500042a2bb900130100b500052a2ab40005bc0ab500062a2ab40005bc07b50007033d1c2ab40005a200212ab400061c2bb9001301004f2ab400071c2bb90014010052840201a7ffddb1
 toData,66,2a2bb7000d2b2ab40004b9000e03002b2ab40005b9000f0200033d1c2ab40005a200212b2ab400061c2eb9000f02002b2ab400071c31b900100300840201a7ffddb1
-
+
 org/apache/geode/internal/admin/remote/StoreSysCfgRequest,2
 fromData,17,2a2bb7000d2a2bb8000ec0000fb50003b1
 toData,14,2a2bb7000b2ab400032bb8000cb1
-
+
 org/apache/geode/internal/admin/remote/StoreSysCfgResponse,2
 fromData,6,2a2bb7000eb1
 toData,6,2a2bb7000db1
-
+
 org/apache/geode/internal/admin/remote/SubRegionRequest,2
 fromData,6,2a2bb7000db1
 toData,6,2a2bb7000cb1
-
+
 org/apache/geode/internal/admin/remote/SubRegionResponse,2
 fromData,34,2a2bb7001f2a2bb80020c00013c00013b500142a2bb80020c00013c00013b50015b1
 toData,22,2a2bb7001d2ab400142bb8001e2ab400152bb8001eb1
-
+
 org/apache/geode/internal/admin/remote/TailLogRequest,2
 fromData,6,2a2bb7000bb1
 toData,6,2a2bb7000ab1
-
+
 org/apache/geode/internal/admin/remote/TailLogResponse,2
 fromData,22,2a2bb7001a2a2bb8001bb5000d2a2bb8001bb5000ab1
 toData,22,2a2bb700182ab4000d2bb800192ab4000a2bb80019b1
-
+
 org/apache/geode/internal/admin/remote/UpdateAlertDefinitionMessage,2
 fromData,30,2a2bb700092a2bb9000a0100b500042a2bb8000bc0000cc0000cb50003b1
 toData,24,2a2bb700062b2ab40004b9000702002ab400032bb80008b1
-
+
 org/apache/geode/internal/admin/remote/VersionInfoRequest,2
 fromData,6,2a2bb7000bb1
 toData,6,2a2bb7000ab1
-
+
 org/apache/geode/internal/admin/remote/VersionInfoResponse,2
 fromData,14,2a2bb7000a2a2bb8000bb50006b1
 toData,14,2a2bb700082ab400062bb80009b1
-
+
 org/apache/geode/internal/admin/statalerts/BaseDecoratorImpl,2
 fromData,12,2a2bb8002bc0002cb50002b1
 toData,9,2ab400022bb8002ab1
-
+
 org/apache/geode/internal/admin/statalerts/DummyStatisticInfoImpl,2
 fromData,31,2a2bb900100100b500022a2bb900100100b500032a2bb900100100b50004b1
 toData,31,2b2ab40002b9000f02002b2ab40003b9000f02002b2ab40004b9000f0200b1
-
+
 org/apache/geode/internal/admin/statalerts/FunctionDecoratorImpl,2
 fromData,14,2a2bb700212a2bb80022b50002b1
 toData,14,2a2bb7001f2ab400022bb80020b1
-
+
 org/apache/geode/internal/admin/statalerts/GaugeThresholdDecoratorImpl,2
 fromData,28,2a2bb700252a2bb80026c00027b500032a2bb80026c00027b50004b1
 toData,22,2a2bb700232ab400032bb800242ab400042bb80024b1
-
+
 org/apache/geode/internal/admin/statalerts/MultiAttrDefinitionImpl,2
 fromData,31,2a2bb8002fb500032a2bb80030b500072a2bb80031c00032c00032b50009b1
 toData,25,2ab400032bb8002c2ab400072bb8002d2ab400092bb8002eb1
-
+
 org/apache/geode/internal/admin/statalerts/NumberThresholdDecoratorImpl,2
 fromData,25,2a2bb700262a2bb80027c00028b500032a2bb80029b50004b1
 toData,22,2a2bb700232ab400032bb800242ab400042bb80025b1
-
+
 org/apache/geode/internal/admin/statalerts/SingleAttrDefinitionImpl,2
 fromData,28,2a2bb80031b500032a2bb80032b500072a2bb80033c00020b50002b1
 toData,25,2ab400032bb8002e2ab400072bb8002f2ab400022bb80030b1
-
+
 org/apache/geode/internal/admin/statalerts/StatisticInfoImpl,2
 fromData,1,b1
 toData,1,b1
-
+
 org/apache/geode/internal/cache/AbstractRegion,2
 toData,6,2a2bb80176b1
 fromData,8,bb017759b70178bf
-
+
 org/apache/geode/internal/cache/AbstractUpdateOperation$AbstractUpdateMessage,2
 fromData,16,2a2bb700182a2bb900190100b5000cb1
 toData,16,2a2bb7001a2b2ab4000cb9001b0300b1
-
+
 org/apache/geode/internal/cache/AddCacheServerProfileMessage,2
 fromData,16,2a2bb7002f2a2bb900300100b50008b1
 toData,16,2a2bb7002d2b2ab40008b9002e0200b1
-
+
 org/apache/geode/internal/cache/BucketAdvisor$BucketProfile,2
 fromData,36,2a2bb700132a2bb900140100b500042a2bb900140100b500062a2bb900140100b50012b1
 toData,36,2a2bb700152b2ab40004b9001602002b2ab40006b9001602002b2ab40012b900160200b1
-
+
 org/apache/geode/internal/cache/BucketAdvisor$ServerBucketProfile,2
 fromData,22,2a2bb700162a2bb80017b500052a2bb80018b50004b1
 toData,22,2a2bb700192ab400052bb8001a2ab400042bb8001bb1
-
+
 org/apache/geode/internal/cache/BucketServerLocation,2
 fromData,39,2a2bb700062a2bb80007b60008b500032a2bb80009b6000ab500042a2bb8000bb6000cb50005b1
 toData,39,2a2bb7000d2ab40003b8000e2bb8000f2ab40004b800102bb800112ab40005b800122bb80013b1
-
+
 org/apache/geode/internal/cache/BucketServerLocation66,2
 fromData,93,2a2bb7000a2a2bb8000bb6000cb500032a2bb8000db6000eb500042a2bb8000fb60010b500052a2bb900110100b500092a2ab40009bd0006b500072ab400099e001d033d1c2ab40009a200132ab400071c2bb8001253840201a7ffebb1
 toData,91,2a2bb700132ab40003b800142bb800152ab40004b800162bb800172ab40005b800182bb800192b2ab40009b9001a02002ab400099e00262ab400074d2cbe3e03360415041da200152c1504323a0519052bb8001b840401a7ffebb1
-
+
 org/apache/geode/internal/cache/CacheDistributionAdvisor$CacheProfile,2
 fromData,113,2a2bb700692bb9006a01003d2a1cb6001e2a1cb7006b9900162abb006c59b7006db500282ab400282bb8006e2a1cb7006f99000e2a2bb80070c00071b5000e2a1cb7007299000e2a2bb80070c00071b5000f2a2bb80070c00073b500192a1cb7007499000e2a2bb80070c00075b50018b1
 toData,101,2a2bb700612b2ab6001db9006202002ab40028c6000b2ab400282bb800632ab4000eb9002e01009a000c2a2ab4000e2bb700642ab4000fb9002e01009a000c2a2ab4000f2bb700642ab400192bb800652ab40018b9003201009a000b2ab400182bb80065b1
-
+
 org/apache/geode/internal/cache/CacheServerAdvisor$CacheServerProfile,2
 fromData,53,2a2bb700112a2bb80012b500042a2bb900130100b500062abb001459b70015b500052ab400052bb800162a2bb900170100b60018b1
 toData,42,2a2bb7000b2ab400042bb8000c2b2ab40006b9000d02002ab400052bb8000e2b2ab6000fb900100300b1
-
+
 org/apache/geode/internal/cache/ClientRegionEventImpl,2
 fromData,14,2a2bb700142a2bb80015b60003b1
 toData,14,2a2bb700122ab6000d2bb80013b1
-
+
 org/apache/geode/internal/cache/CloseCacheMessage,2
 fromData,16,2a2bb700172a2bb900180100b50002b1
 toData,16,2a2bb700192b2ab40002b9001a0200b1
-
+
 org/apache/geode/internal/cache/ControllerAdvisor$ControllerProfile,2
 fromData,6,2a2bb70007b1
 toData,6,2a2bb70006b1
-
+
 org/apache/geode/internal/cache/CreateRegionProcessor$CreateRegionMessage,2
 fromData,45,2a2bb700962a2bb80097b5000a2a2bb80098c00055b500432a2bb900990100b500032a2bb9009a0100b50065b1
 toData,42,2a2bb7009c2ab4000a2bb8009d2ab400432bb8009e2b2ab40003b9009f02002b2ab40065b900a00200b1
-
+
 org/apache/geode/internal/cache/CreateRegionProcessor$CreateRegionReplyMessage,2
 fromData,161,2a2bb700062bb90007010099000e2a2bb80008c00009b5000a2bb9000b01003d1c9a000b2a01b5000ca700352abb000d591cb7000eb5000c033e1d1ca20022bb000f59b700103a0419042bb800112ab4000c1904b6001257840301a7ffdf2bb90007010099000c2a2b03b80013b500142bb9000701009900162abb001559b70016b500172ab400172bb800112a2bb900070100b500182a2bb900190100b50004b1
 toData,191,2a2bb7001a2b2ab4000ac6000704a7000403b9001b02002ab4000ac6000b2ab4000a2bb8001c2ab4000cc7000d2b03b9001d0200a700322ab4000cb6001e3d2b1cb9001d0200033e1d1ca2001c2ab4000c1db6001fc0000f3a0419042bb80020840301a7ffe52ab40014c600192b04b9001b02002b2ab40014c0002103b80022a7000a2b03b9001b02002ab40017c600152b04b9001b02002ab400172bb80020a7000a2b03b9001b02002b2ab40018b9001b02002b2ab40004b900230300b1
-
+
 org/apache/geode/internal/cache/DestroyOperation$DestroyMessage,2
 fromData,45,2a2bb700322a2bb80033c00034b500022a2bb80033b500272bb800354d2cb6003699000b2a2bb80037b50005b1
 toData,118,2a2bb700382ab400022bb800392ab400272bb800392ab40003b6003ac000084d2cc1003b99002e2cb6003c4e2db6003d990018b2003e2bb8003f2ab40003b600402bb80041a7000ab200422bb8003fa700262cb60043990018b2003e2bb8003f2ab40003b600402bb80041a7000ab200422bb8003fb1
-
+
 org/apache/geode/internal/cache/DestroyOperation$DestroyWithContextMessage,2
 fromData,14,2a2bb700102a2bb80011b50008b1
 toData,14,2a2bb700122ab400082bb80013b1
-
+
 org/apache/geode/internal/cache/DestroyPartitionedRegionMessage,2
 fromData,76,2a2bb700442a2bb80045b500062a2bb900460100b80047b500082a2bb900480100b5000a2bb9004801003d2a1cbc0ab5000d033e1d1ca200152ab4000d1d2bb9004801004f840301a7ffecb1
 toData,77,2a2bb700492ab400062bb8004a2b2ab40008b4004bb9004c02002b2ab4000ab9004d02002b2ab4000dbeb9004d0200033d1c2ab4000dbea200152b2ab4000d1c2eb9004d0200840201a7ffe8b1
-
+
 org/apache/geode/internal/cache/DestroyRegionOperation$DestroyRegionMessage,2
 fromData,41,2a2bb700582a2bb80059c0005ab500082a2bb8005bb500112a2bb8005cb5001f2a2bb8005db50029b1
 toData,38,2a2bb7005e2ab400082bb8005f2ab400112bb800602ab4001f2bb800612ab400292bb80062b1
-
+
 org/apache/geode/internal/cache/DestroyRegionOperation$DestroyRegionWithContextMessage,2
 fromData,14,2a2bb7000e2a2bb8000fb50006b1
 toData,14,2a2bb700102ab400062bb80011b1
-
+
 org/apache/geode/internal/cache/DistTXCommitMessage,2
 fromData,14,2a2bb700302a2bb80031b50003b1
 toData,14,2a2bb700322ab400032bb80033b1
-
+
 org/apache/geode/internal/cache/DistTXCommitMessage$DistTXCommitReplyMessage,2
 fromData,17,2a2bb700192a2bb8001ac0001bb50004b1
 toData,14,2a2bb700172ab400042bb80018b1
-
+
 org/apache/geode/internal/cache/DistTXPrecommitMessage,2
 fromData,14,2a2bb700332a2bb80034b5000ab1
 toData,14,2a2bb700312ab4000a2bb80032b1
-
+
 org/apache/geode/internal/cache/DistTXPrecommitMessage$DistTXPrecommitReplyMessage,2
 fromData,17,2a2bb700192a2bb8001ac0001bb50004b1
 toData,14,2a2bb700172ab400042bb80018b1
-
+
 org/apache/geode/internal/cache/DistTXPrecommitMessage$DistTxPrecommitResponse,2
 fromData,17,2a2bb80008b500032a2bb80009b50004b1
 toData,17,2ab400032bb800062ab400042bb80007b1
-
+
 org/apache/geode/internal/cache/DistTXRollbackMessage,2
 fromData,6,2a2bb70015b1
 toData,6,2a2bb70016b1
-
+
 org/apache/geode/internal/cache/DistTXRollbackMessage$DistTXRollbackReplyMessage,2
 fromData,14,2a2bb700192a2bb8001ab50004b1
 toData,14,2a2bb700172ab400042bb80018b1
-
+
 org/apache/geode/internal/cache/DistributedCacheOperation$CacheOperationMessage,2
 fromData,291,2bb9009501003d2bb9009501003e2a1cb500962a1c2bb600972a2bb80098b500232a2bb900990100b8009ab500092a1c1100807e99000704a7000403b500042a1c10087e99000704a7000403b500581c1102007e99000b2a2bb8009bb500882a1c1104007e99000704a7000403b500072a1c10407e99000704a7000403b5001d2ab4001d9900382bb900990100360415049a000b2a03b5001ea7001b150404a0000b2a04b5001ea7000dbb009c59129db7009ebf2a2bb8009fb5001f1c1101007e99000704a700040336042a1c1108007e99000704a7000403b500a015049900162abb00a159b700a2b5000e2ab4000e2bb800a31c1110007e99001c1c1120007e99000704a700040336052a15052bb800a4b5000a1d1104007e9900082a04b5000fb1
 toData,202,033d033e2a1cb600a53d2a1db600a63e2b1cb900a702002b1db900a702002ab4000d9e000d2b2ab4000db900a802002ab400232bb800a92b2ab40009b400aab900ab02002ab40088c6000b2ab400882bb800ac2ab4001d9900542b2ab4001e99000704a7000403b900ab02002ab4001eb800ad36042ab4001e9a001f2ab4001fc10020990015013a052ab4001fc00020c000203a06a7000c2ab4001f3a05013a061504190519062bb800ae2ab4000ec6000b2ab4000e2bb800af2ab4000ac6000b2ab4000a2bb800afb1
-
+
 org/apache/geode/internal/cache/DistributedClearOperation$ClearRegionMessage,2
 fromData,53,2a2bb700212ab800222bb90023010032b500022a2bb80024c00025b500062a2bb80024c00026b500172a2bb80024c00027b50011b1
 toData,43,2a2bb700282b2ab40002b60016b9002902002ab400062bb8002a2ab400172bb8002a2ab400112bb8002ab1
-
+
 org/apache/geode/internal/cache/DistributedClearOperation$ClearRegionWithContextMessage,2
 fromData,14,2a2bb7000e2a2bb8000fb50006b1
 toData,14,2a2bb700102ab400062bb80011b1
-
+
 org/apache/geode/internal/cache/DistributedPutAllOperation$EntryVersionsList,2
 fromData,268,2bb9002201003d1c077e07a0000704a70004033e1c10207e1020a0000704a70004033604b80012b20013b900140200990011b8001212231cb80016b9002403001d9900ca2bb80025883605b80012b20013b900140200990015b80012b2001312261505b80027b900280400bb0029591505b700023a0603360715071505a2008e2bb90022010036081508aa000000007b00000000000000030000001e0000002700000035000000542a01b6000757a700572a15042bb8002ab6000757a7004915042bb8002a3a0919061909b6001cb9002b0200572a1909b6000757a7002a15042bb8002a3a092bb8002588360a19091906150ab9002c0200c0002db600212a1909b6000757840701a7ff71b1
 toData,289,033d033e2ab600089e003d1c07803d043e2ab6000b3a041904b9000c01009900271904b9000d0100c0000a3a051905c600131905c1001199000e1c1020803da70006a7ffd5b80012b20013b900140200990015b80012b2001312152a1cb80016b9001705002b1cb9001802001d9900b32ab60008852bb80019bb001a592ab60008b7001b3a040336052ab6000b3a061906b9000c010099008a1906b9000d0100c0000a3a071907c7000d2b03b900180200a7006c1907b6001c3a081908c700132b04b90018020019072bb8001da7005019041908b6001e360915099a00242b05b90018020084050115053609190419081509b6001f5719072bb8001da700212b06b90018020019072b03b6002019071908b6002115090464852bb80019a7ff72b1
-
+
 org/apache/geode/internal/cache/DistributedPutAllOperation$PutAllEntryData,1
 toData,229,2ab4000a4d2ab4000c4e2c2bb8003d2dc1003e9a00072dc700182b03b9003f02002dc0003ec0003e2bb80040a700312dc1004199001e2dc000413a042b04b9003f02001904b9004201002bb80040a7000f2b04b9003f02002d2bb800432b2ab40012b40044b9003f02002ab4000636042ab40026c6000a150407809136042ab40017c6001d15041008809136042ab40017c1004599000b150410208091360415041080809136042b1504b9003f02002ab40026c6000b2ab400262bb8003d2ab40017c6000b2ab400172bb800462ab6002899000b2ab400142bb800462ab400082bb80047b1
-
+
 org/apache/geode/internal/cache/DistributedPutAllOperation$PutAllMessage,2
 fromData,197,2a2bb7003a2a2bb8003bc0003cb500062a2bb8003d88b500162a2ab40016bd003eb500072ab400169e00722bb8003f4dbb004059b700414e03360415042ab40016a200202ab400071504bb003e592b2ab4000615042c2db7004253840401a7ffdd2bb9004301003604150499002f2bb800443a0503360615062ab40016a2001d2ab4000715063219051506b60045c00046b5002c840601a7ffe02ab400471140007e99000e2a2bb8003bc00048b5000c2a2ab400471180007e99000704a7000403b5001bb1
 toData,165,2a2bb700492ab400062bb8004a2ab40016852bb8004b2ab400169e007bbb004c592ab40016b7004d4d033e03360415042ab40016a200511d9a00122ab40007150432b4002cc60005043e2ab40007150432b4002c3a052c1905b6004e572ab4000715043201b5002c2ab400071504322bb6004f2ab400071504321905b5002c840401a7ffac2b1db9005002001d9900082c2bb800512ab4000cc6000b2ab4000c2bb8004ab1
-
+
 org/apache/geode/internal/cache/DistributedRegionFunctionStreamingMessage,2
 fromData,171,2a2bb700632bb9006401003d1c047e9900142a2bb900650100b500092ab40009b800661c077e99000d2a2bb900650100b500061c057e99000e2a2bb80067c00068b500072bb800674e2dc100699900252a03b5000e2a2dc00069b8006ab500082ab40008c7001b2a2dc00069b5004ea700102a2dc0006bb500082a04b5000e2a2bb80067c0006cb5000a2a2bb8006db5000c2a2bb8006eb5000b2a1c10407e99000704a7000403b5000db1
 toData,173,2a2bb70070033d2ab400099900081c0480933d2ab40006029f00081c0780933d2ab40007c600081c0580933d2ab4000d9900091c104080933d2b1cb9007102002ab4000999000d2b2ab40009b9007202002ab40006029f000d2b2ab40006b9007202002ab40007c6000b2ab400072bb800732ab4000e99000e2ab400082bb80073a700102ab40008b9005901002bb800732ab4000a2bb800732ab4000cc000742bb800752ab4000b2bb80076b1
-
+
 org/apache/geode/internal/cache/DistributedRemoveAllOperation$RemoveAllEntryData,1
 toData,136,2ab4000a4d2c2bb8003f2b2ab40010b40040b9004102002ab400063e2ab40022c600081d0780913e2ab40015c600191d100880913e2ab40015c100429900091d102080913e1d108080913e2b1db9004102002ab40022c6000b2ab400222bb8003f2ab40015c6000b2ab400152bb800432ab6002499000b2ab400122bb800432ab400082bb80044b1
-
+
 org/apache/geode/internal/cache/DistributedRemoveAllOperation$RemoveAllMessage,2
 fromData,197,2a2bb700382a2bb80039c0003ab500052a2bb8003b88b500152a2ab40015bd003cb500062ab400159e00722bb8003d4dbb003e59b7003f4e03360415042ab40015a200202ab400061504bb003c592b2ab4000515042c2db7004053840401a7ffdd2bb9004101003604150499002f2bb800423a0503360615062ab40015a2001d2ab4000615063219051506b60043c00044b5002b840601a7ffe02ab400451140007e99000e2a2bb80039c00046b5000b2a2ab400451180007e99000704a7000403b5001ab1
 toData,165,2a2bb700472ab400052bb800482ab40015852bb800492ab400159e007bbb004a592ab40015b7004b4d033e03360415042ab40015a200511d9a00122ab40006150432b4002bc60005043e2ab40006150432b4002b3a052c1905b6004c572ab4000615043201b5002b2ab400061504322bb6004d2ab400061504321905b5002b840401a7ffac2b1db9004e02001d9900082c2bb8004f2ab4000bc6000b2ab4000b2bb80048b1
-
+
 org/apache/geode/internal/cache/DistributedTombstoneOperation$TombstoneMessage,2
 fromData,125,2a2bb700162ab800172bb90018010032b500192bb9001a01003d2abb001b591cb7001cb500112bb9001d01003e03360415041ca2003e1d990019bb001e59b7001f3a0619062bb8002019063a05a700092bb800213a052ab4001119052bb900220100b80023b90024030057840401a7ffc22a2bb80025c00026b50003b1
 toData,193,2a2bb700272b2ab40019b60028b9002902002b2ab40011b9002a0100b9002b0200033d2ab40011b9002c01009a00232ab40011b9002d0100b9002e0100b9002f0100c000304e2dc1001e990005043d2b1cb9003102002ab40011b900320100b9002e01004e2db90033010099004d2db9002f0100c000343a041904b900350100c000303a051905c1001e99000f1905c0001e2bb80036a7000c1905c000372bb600382b1904b900390100c0003ab6003bb9003c0300a7ffb02ab400032bb8003db1
-
+
 org/apache/geode/internal/cache/DynamicRegionAttributes,2
 fromData,17,2a2bb80005b500022a2bb80005b50003b1
 toData,17,2ab400022bb800042ab400032bb80004b1
-
+
 org/apache/geode/internal/cache/EntryEventImpl,2
 fromData,216,2a2bb80016c00017b500182bb800164d2bb800164e2abb0019592c2d01b7001ab5001b2a2bb9001c0100b8001db5001e2a2bb9001f0100b500082ab4001b2bb80016b600202a2bb80016c00021b500092bb900220100990013b200239a003cbb0024591225b70026bf2bb9002201009900212a2bb80027b500282a2ab40028b500062a2ab40028b80029b50005a7000b2a2bb80016b500052bb9002201009900192a2bb80027b5002a2a2ab4002ab80029b50007a7000b2a2bb80016b500072a2bb8002bb5002c2a2bb8002db5000a2a2bb8002eb50013b1
 toData,279,2ab400182bb801482ab600892bb801482ab4001bb601752bb801482b2ab4001eb40176b9017702002b2ab4000811c03f7eb9017802002ab600492bb801482ab400092bb801482b03b9017902002ab6003f4d2cc100803e1d99000d2cc00080b900a901003e2b1db9017902001d99003b2ab40028c6000e2ab400282bb8017aa7002e2ab40006c6000e2ab400062bb8017aa7001c2cc000803a041904b900b701002bb8017ba700082c2bb801482ab700414d2cc100803e1d99000d2cc00080b900a901003e2b1db9017902001d9900292ab4002ac6000e2ab4002a2bb8017aa7001c2cc000803a041904b900b701002bb8017ba700082c2bb801482ab4002cc0017c2bb8017d2ab600572bb801482ab400132bb8017eb1
-
+
 org/apache/geode/internal/cache/EntrySnapshot,2
 fromData,50,2a03b500052bb9004101003d1c9900112abb000759b70042b50004a7000e2abb000359b70043b500042ab400042bb60044b1
 toData,22,2b2ab40004c10007b9003f02002ab400042bb60040b1
-
+
 org/apache/geode/internal/cache/EventID,4
 fromData,53,2a2bb80038b500042bb80038b800394d2a2cb8003ab500092a2cb8003ab5000b2a2bb9003b0100b5000c2a2bb9003c0100b50001b1
 fromDataPre_GFE_8_0_0_0,33,2a2bb80038b500042bb80038b800394d2a2cb8003ab500092a2cb8003ab5000bb1
 toData,44,2ab400042bb800352ab400092ab4000bb800332bb800352b2ab4000cb9003602002b2ab40001b900370200b1
 toDataPre_GFE_8_0_0_0,24,2ab400042bb800352ab400092ab4000bb800332bb80035b1
-
+
 org/apache/geode/internal/cache/EventTracker$EventSeqnoHolder,2
 fromData,22,2a2bb9000e0100b500042a2bb8000fc00010b50005b1
 toData,19,2b2ab40004b9001103002ab400052bb80012b1
-
+
 org/apache/geode/internal/cache/EvictionAttributesImpl,2
 fromData,33,2a2bb9001b0100b500072a2bb8001cc0001db500052a2bb8001cc0001eb50003b1
 toData,27,2b2ab40007b9001902002ab400052bb8001a2ab400032bb8001ab1
-
+
 org/apache/geode/internal/cache/FilterProfile,2
 fromData,210,bb013159b701324d2c2bb801332a2cb500202ab4000d2bb80134b900300200572ab400052bb80135b9007802002ab400072bb80135b9007802002ab400092bb80135b9007802002ab4000e2bb80134b900300200572ab400062bb80135b9007802002ab400082bb80135b9007802002ab4000a2bb80135b9007802002bb801363e1d9e004f05b80138360403360515051da2002c2bb801393a062bb8013a3a072a1906190703b6013b2ab4000f19061907b90054030057840501a7ffd41504b8013857a7000e3a081504b80138571908bfb1
 toData,181,2ab40020c001312bb8013d2ab4000d2ab40023b401182bb8013e2ab400052bb8013f2ab400072bb8013f2ab400092bb8013f2ab4000e2ab40023b401182bb8013e2ab400062bb8013f2ab400082bb8013f2ab4000a2bb8013f2ab4000f4d2cb900b901003e1d2bb801402cb900ae0100b900af01003a041904b900b001009900361904b900b10100c000b23a051905b9011b0100c0003c3a061905b900b30100c000843a0719062bb8014119072bb8013da7ffc6b1
-
+
 org/apache/geode/internal/cache/FilterProfile$OperationMessage,2
 fromData,129,2a2bb700512a2bb900520100b500092a2bb900530100b500402ab800542bb90055010032b500222a2bb900560100b500282a2bb900570100b500492ab40022b8004b99002c2a2bb900530100b500312ab40022b2004da5000d2ab40022b2004ea600202a2bb80058b50032a700152a2bb900570100b500242a2bb80059b50026b1
 toData,133,2a2bb700442b2ab40009b9004502002b2ab40040b9004602002b2ab40022b60023b9004702002b2ab40028b9004802002b2ab40049b9004a03002ab40022b8004b9900312b2ab40032b9004c0100b9004602002ab40022b2004da5000d2ab40022b2004ea600202ab400322bb8004fa700152b2ab40024b9004a03002ab400262bb80050b1
-
+
 org/apache/geode/internal/cache/FilterRoutingInfo,4
 fromData,86,014db8001e4e2dc600082db6001f4d2bb900200100360403360515051504a200372bb800213a06bb000859b700093a0719072bb800222cc6000c2c1906b6002399000f2ab4000619061907b6001057840501a7ffc8b1
 fromDataPre_GFE_7_1_0_0,95,014db8001e4e2dc600082db6001f4d2bb900200100360403360515051504a20040bb002559b700293a0619062bb80022bb000859b700093a0719072bb800222cc6000c2c1906b6002399000f2ab4000619061907b6001057840501a7ffbfb1
 toData,88,2ab40006b600113d2b1cb9002402002ab40006b60016b9001701004e2db9001801009900352db900190100c0001a3a041904b9001b0100c000253a0519052bb600261904b9001c0100c000083a0619062bb80027a7ffc8b1
 toDataPre_GFE_7_1_0_0,88,2ab40006b600113d2b1cb9002402002ab40006b60016b9001701004e2db9001801009900352db900190100c0001a3a041904b9001b0100c000253a0519052bb800271904b9001c0100c000083a0619062bb80027a7ffc8b1
-
+
 org/apache/geode/internal/cache/FilterRoutingInfo$FilterInfo,4
 fromData,9,2a2bb80014b50015b1
 fromDataPre_GFE_8_0_0_0,50,b800259900162a2bb80026b500272a2bb80014b50015a7001b2a2bb80028b500012a2bb80029b5000e2a2bb80029b50012b1
 toData,235,10093e1d2ab4000ec7000707a700112ab4000eb9001601001008680860603e1d2ab40012c7000707a700112ab40012b9001601001008680860603e1d2ab40001c7000703a7000d2ab40001b60017100c68603ebb0018591d01b700194d2ab40001c7000b2c03b6001aa7005d2c04b6001a2ab40001b600172cb8001b2ab40001b60006b9000701003a041904b9000801009900351904b900090100c0000a3a051905b9000b0100c0001cb6001d2cb8001e1905b9000c0100c0001fb60020852cb8001ea7ffc72ab4000e2ab400212cb800222ab400122ab400212cb800222cb600233a0419042bb80024b1
 toDataPre_GFE_8_0_0_0,193,b8002599009dbb0018591103e82bb8002ab700194d2ab40001c7000b2c03b6001aa7005a2c04b6001a2ab40001b600172cb8001b2ab40001b60006b9000701004e2db9000801009900342db900090100c0000a3a041904b9000b0100c0001cb6001d2cb8001e1904b9000c0100c0001fb60020852cb8001ea7ffc92ab4000e2ab400212cb800222ab400122ab400212cb800222cb600234e2d2bb80024a700232ab400012bb8002b2ab4000e2ab400212bb800222ab400122ab400212bb80022b1
-
+
 org/apache/geode/internal/cache/FindDurableQueueProcessor$FindDurableQueueMessage,2
 fromData,24,2a2bb7001e2a2bb9001f0100b500052a2bb80020b50006b1
 toData,24,2a2bb700212b2ab40005b9002202002ab400062bb80023b1
-
+
 org/apache/geode/internal/cache/FindDurableQueueProcessor$FindDurableQueueReply,2
 fromData,14,2a2bb700042a2bb80005b50002b1
 toData,14,2a2bb700062ab400022bb80007b1
-
+
 org/apache/geode/internal/cache/FindRemoteTXMessage,2
 fromData,27,2a2bb700452a2bb80046c00047b500032a2bb900480100b50004b1
 toData,24,2a2bb700422ab400032bb800432b2ab40004b900440200b1
-
+
 org/apache/geode/internal/cache/FindRemoteTXMessage$FindRemoteTXMessageReply,2
 fromData,46,2a2bb7000a2a2bb9000b0100b500042bb9000b01009900182a2bb9000b0100b500072a2bb8000cc0000db50006b1
 toData,66,2a2bb700032b2ab40004b9000502002ab40006c6000704a70004033d2b1cb9000502001c99001d2b2ab40007b9000502002ab4000601b600082ab400062bb80009b1
-
+
 org/apache/geode/internal/cache/FindVersionTagOperation$FindVersionTagMessage,2
 fromData,55,2a2bb700232a2bb900240100b500032a2bb900250100b500042abb002659b70027b500052ab400052bb800282a2bb900290100b50006b1
 toData,44,2a2bb7001e2b2ab40003b9001f02002b2ab40004b9002002002ab400052bb800212b2ab40006b900220200b1
-
+
 org/apache/geode/internal/cache/FindVersionTagOperation$VersionTagReply,2
 fromData,17,2a2bb7000c2a2bb8000dc0000eb50002b1
 toData,14,2a2bb7000a2ab400022bb8000bb1
-
+
 org/apache/geode/internal/cache/FixedPartitionAttributesImpl,2
 fromData,39,2a2bb80007b500062a2bb900080100b500022a2bb900090100b500032a2bb900090100b50005b1
 toData,39,2ab400062bb8000a2b2ab40002b9000b02002b2ab40003b9000c02002b2ab40005b9000c0200b1
-
+
 org/apache/geode/internal/cache/FunctionStreamingReplyMessage,2
 fromData,64,2a2bb700102a2bb900110100b5000b2a2bb900120100b5000c2a2bb900110100b500042a2bb80013b5000da700144dbb001559b700164e2d2cb60017572dbfb1
 toData,90,2a2bb700182b2ab4000bb9001902002b2ab4000cb9001a02002b2ab40004b9001902002ab4000d2bb8001ba7002e4d2cc1001c99000cbb001d592cb7001ebfbb0015592ab4000db6001fb60020b700214e2d2cb60017572dbfb1
-
+
 org/apache/geode/internal/cache/GridAdvisor$GridProfile,2
 fromData,26,2a2bb7001e2a2bb8001fb500052a2bb80020b500062ab60007b1
 toData,22,2a2bb7001b2ab400052bb8001c2ab400062bb8001db1
-
+
 org/apache/geode/internal/cache/HARegion$HARegionAdvisor$HAProfile,2
 fromData,47,2a2bb700032bb9000401003d2a1cb200057e99000704a7000403b500062a1cb200077e99000704a7000403b50008b1
 toData,45,2a2bb70009033d2ab400069900091cb20005803d2ab400089900091cb20007803d2b1c1100ff7eb9000a0200b1
-
+
 org/apache/geode/internal/cache/InitialImageFlowControl$FlowControlPermitMessage,2
 fromData,16,2a2bb7000d2a2bb9000e0100b50002b1
 toData,16,2a2bb7000f2b2ab40002b900100200b1
-
+
 org/apache/geode/internal/cache/InitialImageOperation$Entry,2
 fromData,89,2a2bb900150100b500032bb9001501003d2a2bb80016b5000f2ab40003b8001199000d2ab20017b50002a7000b2a2bb80018b500022a2bb900190100b500041c047e9900162a1c057e99000704a70004032bb8001ab5000ab1
 toData,101,2b2ab40003b9000c02002ab4000ac6000704a70004033d1c2ab4000ac1000e99000705a700040380913d2b1cb9000c02002ab4000f2bb800102ab40003b800119a000b2ab400022bb800122b2ab40004b9001303002ab4000ac6000b2ab4000a2bb80014b1
-
+
 org/apache/geode/internal/cache/InitialImageOperation$FilterInfoMessage,2
 fromData,230,2a2bb7008f2a2bb80090b5001f2ab4000403322bb80090b5003e2ab4000403322bb80090b500412ab4000403322bb80090b500432ab4000403322bb80090b500452ab4000403322bb80090b500472ab4000403322bb80090b500492ab4000403322bb80090b5004b2ab4000403322bb80090b5004d2ab4000404322bb80090b5003e2ab4000404322bb80090b500412ab4000404322bb80090b500432ab4000404322bb80090b500452ab4000404322bb80090b500472ab4000404322bb80090b500492ab4000404322bb80090b5004b2ab4000404322bb80090b5004d2a2bb80090b50033b1
 toData,284,2a2bb7008d2ab4001fc000312bb8008e2ab400040332b4003ec000312bb8008e2ab400040332b40041c000312bb8008e2ab400040332b40043c000312bb8008e2ab400040332b40045c000312bb8008e2ab400040332b40047c000312bb8008e2ab400040332b40049c000312bb8008e2ab400040332b4004bc000312bb8008e2ab400040332b4004dc000312bb8008e2ab400040432b4003ec000312bb8008e2ab400040432b40041c000312bb8008e2ab400040432b40043c000312bb8008e2ab400040432b40045c000312bb8008e2ab400040432b40047c000312bb8008e2ab400040432b40049c000312bb8008e2ab400040432b4004bc000312bb8008e2ab400040432b4004dc000312bb8008e2ab40033c000312bb8008eb1
-
+
 org/apache/geode/internal/cache/InitialImageOperation$ImageReplyMessage,2
 fromData,224,2a2bb7001c2bb8001d4d014e2cc600102cb6001e9e00092c03b6001f4e2dc1002099000e2a2dc00021b5000fa700082a2cb5000f2a2bb900220100b500102a2bb900220100b500112a2bb900220100b500122a2bb900230100b500132a2bb900220100b500142a2bb80024b500042a2bb900230100b500032a2bb900230100b500152ab4001599000f2abb0025592bb70026b500022bb900270100360415049b00102abb0028591504b70029b5000103360515051504a200292bb8002ac0002b3a062bb8002c37072ab4000119061607b8002db9002e030057840501a7ffd6b1
 toData,234,2a2bb7002f2ab4000fc1002099001dbb00305904b700314d2c2ab4000fb60032572c2bb80033a7000e2ab4000fc000302bb800332b2ab40010b9003402002b2ab40011b9003402002b2ab40012b9003402002b2ab40013b9003502002b2ab40014b9003402002b2ab40003b9003502002b2ab40015b9003502002ab4001599000b2ab400022bb800362b2ab40001c7000702a7000c2ab40001b900370100b9003802002ab40001c600422ab40001b900390100b9003a01004d2cb9003b010099002a2cb9003c0100c0003d4e2db9003e01002bb8003f2db900400100c00041b600422bb80043a7ffd3b1
-
+
 org/apache/geode/internal/cache/InitialImageOperation$InitialImageVersionedEntryList,2
 fromData,406,b80022b20023b9002402003d2bb9003601003e1d057e05a0000704a700040336041d077e07a0000704a700040336052a1d10087e1008a0000704a7000403b500021d10207e1020a0000704a700040336061c990014b80022b2002312371db80026b900380400150499003c2bb800398836071c990015b80022b20023123a1507b80031b90038040003360815081507a200152a2bb8003bc00014b7001257840801a7ffea15059900e42bb800398836071c990015b80022b20023123c1507b80031b9003804002abb0003591507b70005b50004bb0003591507b700053a0803360915091507a200a22bb900360100360a150aaa000000008f00000000000000030000001e0000002c0000003f000000632ab4000401b90011020057a700662ab4000415062bb8003db90011020057a7005315062bb8003d3a0b1908190bb6002db900110200572ab40004190bb90011020057a7002f15062bb8003d3a0b2bb8003988360c190b1908150cb900160200c0003eb600342ab40004190bb90011020057840901a7ff5da7000e2abb000359b70001b50004b1
 toData,396,033d033e0336042ab700209a00091c05803d043e2ab40004b9000d01009e00431c07803d0436042ab40004b9001a01003a051905b9001b01009900271905b9001c0100c000173a061906c600131906c1002199000e1c1020803da70006a7ffd52ab400029900081c1008803db80022b20023b900240200990015b80022b2002312252a1cb80026b9002705002b1cb9002802001d9900282ab7000e852bb8002903360515052ab7000ea200132a1505b700132bb8002a840501a7ffea15049900cd2ab40004b9000d0100852bb80029bb002b592ab40004b9000d0100b7002c3a050336062ab40004b9001a01003a071907b9001b01009900951907b9001c0100c000173a081908c7000d2b03b900280200a700771908b6002d3a091909c700132b04b90028020019082bb8002ea7005b19051909b9002f0200c000303a0a190ac700292b05b9002802001506840601b800313a0a19051909190ab9003203005719082bb8002ea700222b06b90028020019082b03b6003319081909b60034190ab60035852bb80029a7ff67b1
-
+
 org/apache/geode/internal/cache/InitialImageOperation$RVVReplyMessage,2
 fromData,33,2a2bb700162bb9001701003d1c9900132bb9001701003e2a1d2bb80018b50004b1
 toData,51,2a2bb700092ab40004c600222b04b9000a02002b2ab40004c1000bb9000a02002ab400042bb6000ca7000a2b03b9000a0200b1
-
+
 org/apache/geode/internal/cache/InitialImageOperation$RegionStateMessage,2
 fromData,66,2a2bb7001c2a2bb9001d0100b500052bb9001d01003d1c99000f2a2b2ab40005b8001eb500042bb9001d01003d1c9900132bb9001d01003e2a1d2bb8001fb50006b1
 toData,97,2a2bb7000b2b2ab40005b9000c02002ab40004c600192b04b9000c02002b2ab400042ab40005b8000da7000a2b03b9000c02002ab40006c600222b04b9000c02002b2ab40006c1000eb9000c02002ab400062bb8000fa7000a2b03b9000c0200b1
-
+
 org/apache/geode/internal/cache/InitialImageOperation$RequestFilterInfoMessage,2
 fromData,24,2a2bb7001e2a2bb8001fb500042a2bb900200100b50002b1
 toData,24,2a2bb700212ab400042bb800222b2ab40002b900230200b1
-
+
 org/apache/geode/internal/cache/InitialImageOperation$RequestImageMessage,2
 fromData,98,2a2bb700b42a2bb800b5b500172a2bb900b60100b500022a2bb900b70100b500552a2bb900b70100b500032a2bb900b70100b5004b2a2bb800b8c000b9b5003a2a2bb800b8c000bab500262a2bb800b8c000bbb5003b2a2bb800b8c000bcb50030b1
 toData,86,2a2bb700bd2ab400172bb800be2b2ab40002b900bf02002b2ab40055b900c002002b2ab40003b900c002002b2ab4004bb900c002002ab4003a2bb800c12ab400262bb800c12ab4003b2bb800c12ab400302bb800c1b1
-
+
 org/apache/geode/internal/cache/InitialImageOperation$RequestRVVMessage,2
 fromData,34,2a2bb7001e2a2bb8001fb500052a2bb900200100b500022a2bb900210100b50003b1
 toData,34,2a2bb700222ab400052bb800232b2ab40002b9002402002b2ab40003b900250200b1
-
+
 org/apache/geode/internal/cache/InitialImageOperation$RequestSyncMessage,2
 fromData,73,2a2bb700222a2bb80023b500022bb9002401003d2bb9002501003e2a1dbd0026b5000a03360415041da2001f2ab4000a15041c99000a2bb80027a700072bb8002853840401a7ffe1b1
 toData,77,2a2bb7001c2ab400022bb8001d2b2ab4000a0332c1001eb9001f02002b2ab4000abeb9002002002ab4000a4d2cbe3e03360415041da200172c1504323a0519052bb900210200840401a7ffe9b1
-
+
 org/apache/geode/internal/cache/InterestRegistrationEventImpl,2
 fromData,33,2a2bb80010b500052a2bb80011b500062a2bb80012b500072a2bb80013b50008b1
 toData,36,2ab400052bb8000b2ab40006c0000c2bb8000d2ab400072bb8000e2ab400082bb8000fb1
-
+
 org/apache/geode/internal/cache/InvalidateOperation$InvalidateMessage,2
 fromData,25,2a2bb700282a2bb80029c0002ab500022a2bb80029b50015b1
 toData,22,2a2bb7002b2ab400022bb8002c2ab400152bb8002cb1
-
+
 org/apache/geode/internal/cache/InvalidateOperation$InvalidateWithContextMessage,2
 fromData,14,2a2bb7000c2a2bb8000db50004b1
 toData,14,2a2bb7000e2ab400042bb8000fb1
-
+
 org/apache/geode/internal/cache/InvalidatePartitionedRegionMessage,2
 fromData,14,2a2bb700152a2bb80016b50004b1
 toData,14,2a2bb700172ab400042bb80018b1
-
+
 org/apache/geode/internal/cache/InvalidateRegionOperation$InvalidateRegionMessage,2
 fromData,17,2a2bb700122a2bb80013c00014b50007b1
 toData,14,2a2bb700152ab400072bb80016b1
-
+
 org/apache/geode/internal/cache/JtaAfterCompletionMessage,2
 fromData,26,2a2bb700232a2bb900240100b500042a2bb900240100b50002b1
 toData,26,2a2bb700212b2ab40004b9002202002b2ab40002b900220200b1
-
+
 org/apache/geode/internal/cache/MemberFunctionStreamingMessage,2
 fromData,163,2a2bb700512bb9005201003d1c047e9900142a2bb900530100b500082ab40008b800541c077e99000d2a2bb900530100b500051c057e99000e2a2bb80055c00056b500062bb800554e2dc1002a9900252a03b5000a2a2dc0002ab80057b500072ab40007c7001b2a2dc0002ab5001aa700102a2dc00058b500072a04b5000a2a2bb80055b500092a2bb80055c00059b500102a1c10407e99000704a7000403b5000bb1
 toData,162,2a2bb7005b033d2ab400089900081c0480933d2ab40005029f00081c0780933d2ab40006c600081c0580933d2ab4000b9900091c104080933d2b1cb9005c02002ab4000899000d2b2ab40008b9005d02002ab40005029f000d2b2ab40005b9005d02002ab40006c6000b2ab400062bb8005e2ab4000a99000e2ab400072bb8005ea700102ab40007b9001f01002bb8005e2ab400092bb8005e2ab400102bb8005eb1
-
+
 org/apache/geode/internal/cache/Node,2
 fromData,60,2abb001c59b7001db500052ab400052bb8001e2a2bb9001f0100b500032a2bb900200100b500042a2bb900210100b500152a2bb9001f0100b50006b1
 toData,49,2ab400052bb800182b2ab40003b9001902002b2ab40004b9001a02002b2ab40015b9001b02002b2ab40006b900190200b1
-
+
 org/apache/geode/internal/cache/NonLocalRegionEntry,2
 fromData,48,2a2bb80027b500032a2bb80027b500062a2bb900280100b5000c2a2bb900290100b5000e2a2bb80027c0002ab50011b1
 toData,45,2ab400032bb800242ab400062bb800242b2ab4000cb9002503002b2ab4000eb9002602002ab400112bb80024b1
-
+
 org/apache/geode/internal/cache/NonLocalRegionEntryWithStats,2
 fromData,36,2a2bb700132a2bb900140100b500032a2bb900140100b500052a2bb900140100b50007b1
 toData,36,2a2bb700112b2ab40003b9001203002b2ab40005b9001203002b2ab40007b900120300b1
-
+
 org/apache/geode/internal/cache/PRQueryProcessor$EndOfBucket,2
 fromData,11,2a2bb9000b0100b50002b1
 toData,11,2b2ab40002b9000c0200b1
-
+
 org/apache/geode/internal/cache/PartitionAttributesImpl,2
 fromData,102,2a2bb900580100b5001b2a2bb900590100b500082a2bb900580100b5000c2a2bb900580100b500012a2bb8005ab500142a2bb8005bc0001eb5000d2a2bb8005bc0001eb500022a2bb900590100b500162a2bb900590100b500182a2bb8005bc0005cb5002fb1
 toData,97,2ab7002b2b2ab4001bb9005402002b2ab40008b9005503002b2ab60047b9005402002b2ab40001b9005402002ab400142bb800562ab4000d2bb800572ab400022bb800572b2ab40016b9005503002b2ab40018b9005503002ab4002f2bb80057b1
-
+
 org/apache/geode/internal/cache/PartitionRegionConfig,2
 fromData,207,2a2bb900500100b500162a2bb900510100b80052b500032a2bb80053b500182a2bb900540100b500052a2bb900540100b5001f2abb001959b7001ab500042ab400042bb800552a2bb80056b500082a2bb80056b500092a2bb80056b500072a2bb80057b5000c2a2bb80058b5000e2a2bb80058b5000d2a2bb80058b500102a2bb80058b5000f2a2bb900540100b500062a2bb80059c0005ab500112ab40011c7000e2abb002159b70022b500112a2bb8005bb500142a2bb80059c0005ab500012ab40001c7000a2ab80015b50001b1
 toData,178,2b2ab40016b9004702002b2ab40003b40048b9004902002ab400182bb8004a2b2ab40005b9004b02002b2ab4001fb9004b02002ab400042bb8004a2ab400082bb8004c2ab400092bb8004c2ab400072bb8004c2ab4000c2bb8004a2ab4000e2bb8004a2ab4000d2bb8004a2ab400102bb8004a2ab4000f2bb8004a2b2ab40006b9004b02002ab400112bb8004d2ab400142bb8004e2ab40001b9004f010099000b012bb8004da7000b2ab400012bb8004db1
-
+
 org/apache/geode/internal/cache/PoolFactoryImpl$PoolAttributes,2
 fromData,145,2a2bb80032b500032a2bb80032b500052a2bb80032b50007

<TRUNCATED>


[29/31] incubator-geode git commit: GEODE-2156 Remove incubating references

Posted by ab...@apache.org.
GEODE-2156 Remove incubating references

- Remove DISCLAIMER files
- Remove "(incubating)" from project name references
- Remove .incubator from website references


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

Branch: refs/heads/feature/GEODE-2156
Commit: 7d798c3468ceaef1d61071049e8f243c07577fd4
Parents: 50320dc
Author: Anthony Baker <ab...@apache.org>
Authored: Tue Nov 29 19:31:20 2016 -0800
Committer: Anthony Baker <ab...@apache.org>
Committed: Thu Dec 1 17:35:15 2016 -0800

----------------------------------------------------------------------
 BUILDING.md                                     |    4 +-
 DISCLAIMER                                      |    6 -
 NOTICE                                          |    2 +-
 README.md                                       |    6 +-
 dev-tools/docker/base/Dockerfile                |    2 +-
 dev-tools/docker/compile/Dockerfile             |    2 +-
 dev-tools/docker/docs/Dockerfile                |    2 +-
 docker/Dockerfile                               |    2 +-
 geode-assembly/src/main/dist/DISCLAIMER         |    6 -
 geode-assembly/src/main/dist/NOTICE             |    2 +-
 geode-pulse/src/main/webapp/DataBrowser.html    |    2 +-
 geode-pulse/src/main/webapp/Login.html          |    2 +-
 geode-pulse/src/main/webapp/META-INF/NOTICE     |    2 +-
 geode-pulse/src/main/webapp/MemberDetails.html  | 1206 ++++++++--------
 .../src/main/webapp/QueryStatistics.html        |    2 +-
 geode-pulse/src/main/webapp/clusterDetail.html  | 1324 +++++++++---------
 geode-pulse/src/main/webapp/regionDetail.html   | 1104 +++++++--------
 geode-web-api/src/main/webapp/META-INF/NOTICE   |    2 +-
 geode-web/src/main/webapp/META-INF/NOTICE       |    2 +-
 gradle.properties                               |    2 +-
 gradle/publish.gradle                           |    6 +-
 gradle/sonar.gradle                             |    2 +-
 22 files changed, 1839 insertions(+), 1851 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d798c34/BUILDING.md
----------------------------------------------------------------------
diff --git a/BUILDING.md b/BUILDING.md
index f2eeb62..5e1e793 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -11,7 +11,7 @@ All platforms require a Java installation, with JDK 1.8 or more recent version.
     JAVA_HOME=/usr/java/jdk1.8.0_60
     export JAVA_HOME
     ```
-2. Download the project source from the Releases page at [Apache Geode (incubating)] (http://geode.incubator.apache.org), and unpack the source code.
+2. Download the project source from the Releases page at [Apache Geode] (http://geode.apache.org), and unpack the source code.
 3. Within the directory containing the unpacked source code, build without the tests:
     
     ```
@@ -40,7 +40,7 @@ or the `gfsh` script can be found in
     $ set JAVA_HOME="C:\Program Files\Java\jdk1.8.0_60"
     ```
 2. Install Gradle, version 2.12 or a more recent version.
-3. Download the project source from the Releases page at [Apache Geode (incubating)] (http://geode.incubator.apache.org), and unpack the source code.
+3. Download the project source from the Releases page at [Apache Geode] (http://geode.apache.org), and unpack the source code.
 4. Within the folder containing the unpacked source code, build without the tests:
 
     ```

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d798c34/DISCLAIMER
----------------------------------------------------------------------
diff --git a/DISCLAIMER b/DISCLAIMER
deleted file mode 100644
index 43c734d..0000000
--- a/DISCLAIMER
+++ /dev/null
@@ -1,6 +0,0 @@
-Apache Geode is an effort undergoing incubation at The Apache Software Foundation (ASF),
-sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until
-a further review indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects. While incubation
-status is not necessarily a reflection of the completeness or stability of the code, it does
-indicate that the project has yet to be fully endorsed by the ASF.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d798c34/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index df53e0e..4801b2a 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,4 +1,4 @@
-Apache Geode (incubating) 
+Apache Geode
 Copyright 2016 The Apache Software Foundation.
 
 This product includes software developed at

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d798c34/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index a633f67..d0b6de5 100644
--- a/README.md
+++ b/README.md
@@ -3,13 +3,13 @@
 **[Location of Directions for Building from Source](#building)**  
 **[Geode in 5 minutes](#started)**  
 **[Application Development](#development)**  
-**[Documentation](http://geode.incubator.apache.org/docs/)**  
+**[Documentation](http://geode.apache.org/docs/)**
 **[wiki](https://cwiki.apache.org/confluence/display/GEODE/Index)**  
 **Continuous Integration** [![Build Status](https://travis-ci.org/apache/incubator-geode.svg?branch=develop)](https://travis-ci.org/apache/incubator-geode)  
 
 ## <a name="overview"></a>Overview
 
-[Apache Geode] (http://geode.incubator.apache.org/) is a data management platform that provides real-time, consistent access to data-intensive applications throughout widely distributed cloud architectures.
+[Apache Geode] (http://geode.apache.org/) is a data management platform that provides real-time, consistent access to data-intensive applications throughout widely distributed cloud architectures.
 
 Apache Geode pools memory, CPU, network resources, and optionally local disk across multiple processes to manage application objects and behavior. It uses dynamic replication and data partitioning techniques to implement high availability, improved performance, scalability, and fault tolerance. In addition to being a distributed data container, Apache Geode is an in-memory data management system that provides reliable asynchronous event notifications and guaranteed message delivery.
 
@@ -41,7 +41,7 @@ Apache Geode includes the following features:
 
 ## <a name="building"></a>Building this Release from Source
 
-Directions to build Apache Geode (incubating) from source are in the source distribution, file `BUILDING.md`.
+Directions to build Apache Geode from source are in the source distribution, file `BUILDING.md`.
 
 ## <a name="started"></a>Geode in 5 minutes
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d798c34/dev-tools/docker/base/Dockerfile
----------------------------------------------------------------------
diff --git a/dev-tools/docker/base/Dockerfile b/dev-tools/docker/base/Dockerfile
index 513811c..523ae57 100644
--- a/dev-tools/docker/base/Dockerfile
+++ b/dev-tools/docker/base/Dockerfile
@@ -17,7 +17,7 @@
 FROM centos:centos7
 MAINTAINER Geode Community <de...@geode.incubator.apache.org>
 
-LABEL Vendor="Apache Geode (incubating)"
+LABEL Vendor="Apache Geode"
 LABEL version=unstable
 
 # download JDK 8

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d798c34/dev-tools/docker/compile/Dockerfile
----------------------------------------------------------------------
diff --git a/dev-tools/docker/compile/Dockerfile b/dev-tools/docker/compile/Dockerfile
index bab74d4..d1199bb 100644
--- a/dev-tools/docker/compile/Dockerfile
+++ b/dev-tools/docker/compile/Dockerfile
@@ -17,5 +17,5 @@
 FROM geode/base:0.1
 MAINTAINER Geode Community <de...@geode.incubator.apache.org>
 
-LABEL Vendor="Apache Geode (incubating)"
+LABEL Vendor="Apache Geode"
 LABEL version=unstable

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d798c34/dev-tools/docker/docs/Dockerfile
----------------------------------------------------------------------
diff --git a/dev-tools/docker/docs/Dockerfile b/dev-tools/docker/docs/Dockerfile
index 67a31f4..f124483 100644
--- a/dev-tools/docker/docs/Dockerfile
+++ b/dev-tools/docker/docs/Dockerfile
@@ -17,7 +17,7 @@
 FROM ruby:2.3.0
 MAINTAINER Geode Community <de...@geode.incubator.apache.org>
 
-LABEL Vendor="Apache Geode (incubating)"
+LABEL Vendor="Apache Geode"
 LABEL version=unstable
 
 ADD Gemfile Gemfile

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d798c34/docker/Dockerfile
----------------------------------------------------------------------
diff --git a/docker/Dockerfile b/docker/Dockerfile
index e68d5d4..8896a4d 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -17,7 +17,7 @@
 FROM geode/base:0.1
 MAINTAINER Geode Community <de...@geode.incubator.apache.org>
 
-LABEL Vendor="Apache Geode (incubating)"
+LABEL Vendor="Apache Geode"
 LABEL version=unstable
 
 # download JDK 8

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d798c34/geode-assembly/src/main/dist/DISCLAIMER
----------------------------------------------------------------------
diff --git a/geode-assembly/src/main/dist/DISCLAIMER b/geode-assembly/src/main/dist/DISCLAIMER
deleted file mode 100644
index 43c734d..0000000
--- a/geode-assembly/src/main/dist/DISCLAIMER
+++ /dev/null
@@ -1,6 +0,0 @@
-Apache Geode is an effort undergoing incubation at The Apache Software Foundation (ASF),
-sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until
-a further review indicates that the infrastructure, communications, and decision making process
-have stabilized in a manner consistent with other successful ASF projects. While incubation
-status is not necessarily a reflection of the completeness or stability of the code, it does
-indicate that the project has yet to be fully endorsed by the ASF.

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d798c34/geode-assembly/src/main/dist/NOTICE
----------------------------------------------------------------------
diff --git a/geode-assembly/src/main/dist/NOTICE b/geode-assembly/src/main/dist/NOTICE
index 412774d..83d0f33 100644
--- a/geode-assembly/src/main/dist/NOTICE
+++ b/geode-assembly/src/main/dist/NOTICE
@@ -1,4 +1,4 @@
-Apache Geode (incubating) 
+Apache Geode
 Copyright 2016 The Apache Software Foundation.
 
 This product includes software developed at

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d798c34/geode-pulse/src/main/webapp/DataBrowser.html
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/DataBrowser.html b/geode-pulse/src/main/webapp/DataBrowser.html
index 1695a83..a01df6b 100644
--- a/geode-pulse/src/main/webapp/DataBrowser.html
+++ b/geode-pulse/src/main/webapp/DataBrowser.html
@@ -127,7 +127,7 @@
 	              <div class="right aboutText">The Pulse tool monitors Apache Geode system in real time. It provides health information, detailed operational and configuration data, system alerts, throughput performance and statistics for system members and connected clients.</div>
 	            </div>
 				  <div class="left widthfull-100per copyright">
-					  <p>Apache Geode (incubating)<br>
+					  <p>Apache Geode<br>
 						  Copyright 2016 The Apache Software Foundation.</p>
 					  <p>&nbsp;</p>
 					  <p>This product includes software developed at

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d798c34/geode-pulse/src/main/webapp/Login.html
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/Login.html b/geode-pulse/src/main/webapp/Login.html
index 2ca512f..f093e38 100644
--- a/geode-pulse/src/main/webapp/Login.html
+++ b/geode-pulse/src/main/webapp/Login.html
@@ -98,7 +98,7 @@ $(function(){
     </div>
     <br>
     <div class="left widthfull-100per copyright">
-      <p>Apache Geode (incubating)<br>
+      <p>Apache Geode<br>
         Copyright 2016 The Apache Software Foundation.</p>
       <p>&nbsp;</p>
       <p>This product includes software developed at

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d798c34/geode-pulse/src/main/webapp/META-INF/NOTICE
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/META-INF/NOTICE b/geode-pulse/src/main/webapp/META-INF/NOTICE
index 5ee5073..706eda2 100644
--- a/geode-pulse/src/main/webapp/META-INF/NOTICE
+++ b/geode-pulse/src/main/webapp/META-INF/NOTICE
@@ -1,4 +1,4 @@
-Apache Geode (incubating) 
+Apache Geode
 Copyright 2016 The Apache Software Foundation.
 
 This product includes software developed at

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d798c34/geode-pulse/src/main/webapp/MemberDetails.html
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/MemberDetails.html b/geode-pulse/src/main/webapp/MemberDetails.html
index 1ce2a4c..bc946da 100644
--- a/geode-pulse/src/main/webapp/MemberDetails.html
+++ b/geode-pulse/src/main/webapp/MemberDetails.html
@@ -1,603 +1,603 @@
-<!DOCTYPE HTML>
-<!--
-  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.
--->
-
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv="X-UA-Compatible" content="IE=edge" />
-<meta http-equiv="CACHE-CONTROL" content="NO-CACHE,NO-STORE" />
-<meta http-equiv="PRAGMA" content="NO-CACHE" />
-<meta http-equiv="EXPIRES" content="-1">
-<title>Pulse</title>
-<link href="css/common.css" rel="stylesheet" type="text/css" />
-<link href="css/style.css" rel="stylesheet" type="text/css" />
-
-<!-- fix IE Ui issues-->
-
-<!--[if IE 7]>
-  <link href="css/ie/ie7.css" type="text/css" rel="stylesheet"/>
- <![endif]-->
-<!--[if IE 8]>
-  <link href="css/ie/ie8.css" type="text/css" rel="stylesheet"/>
- <![endif]-->
-<!--[if IE 9]>
-  <link href="css/ie/ie9.css" type="text/css" rel="stylesheet"/>
- <![endif]-->
-<!-- IE Fix for HTML5 Tags -->
-<!--[if lt IE 9]>
-<script src='scripts/lib/html5.js'></script>
-  <script type="text/javascript" src="scripts/lib/excanvas.js"></script>
-  <script type="text/javascript"> if (!window.console) console = {log: function() {}}; </script>
-  <![endif]-->
-  
-<!-- Rgraph and TreeMap-->
-<link type="text/css" href="css/base.css" rel="stylesheet" />
-<link type="text/css" href="css/Treemap.css" rel="stylesheet" />
-
-<!--Custom Scroll Bar-->
-<!-- styles needed by jScrollPane - include in your own sites -->
-<link type="text/css" href="css/jquery.jscrollpane.css" rel="stylesheet" media="all" />
-<!--Grid View-->
-<link rel="stylesheet" type="text/css" media="screen" href="css/grid/ui.jqgrid.css" />
-
-<!-- JavaScripts -->
-
-  <!-- Start: JQuery plugins JS -->
-  <script type="text/javascript" src='scripts/lib/jquery-1.7.2.js'></script>
-  <script type="text/javascript" src="scripts/lib/jit.js"></script>
-  <script type="text/javascript" src="scripts/lib/jquery.sparkline.js"></script>
-  <script type="text/javascript" src="scripts/lib/jquery.i18n.properties.js"></script>
-  <!-- End: JQuery plugins JS -->
-  
-  <!-- Start: Common JS -->
-  <script type="text/javascript" src='scripts/lib/common.js'></script>
-  <!-- End: Common JS -->
-
-	<!-- the mousewheel plugin -->
-	<script type="text/javascript" src="scripts/lib/jquery.mousewheel.js"></script>
-	<!-- the jScrollPane script -->
-	<script type="text/javascript" src="scripts/lib/jquery.jscrollpane.js"></script>
-	<!--Place Holder tag-->
-	<script type="text/javascript" src="scripts/lib/jquery.placeholder.js"></script>
-	<!--Grid View-->
-  <script src="scripts/lib/grid.locale-en.js" type="text/javascript"></script>
-  <script src="scripts/lib/jquery.jqGrid.src.js" type="text/javascript"></script>
-  <script src="scripts/lib/jquery.tablednd.js" type="text/javascript"></script>
-  
-  <!-- jQuery plugin to support automatically updating fuzzy timestamps 
-  (e.g. "4 minutes ago" or "about 1 day ago") -->
-  <script type="text/javascript" src="scripts/lib/jquery.timeago.js"></script>
-  
-  <!-- Start: Members Widgets JS -->
-  <script type="text/javascript" src="scripts/pulsescript/PulseCallbacks.js"></script>
-<script type="text/javascript" src="scripts/pulsescript/PulseFunctions.js"></script>
-<script type="text/javascript" src='scripts/pulsescript/common.js'></script>
-  <script type="text/javascript" src="scripts/pulsescript/MemberDetails.js"></script>
-</head>
-
-<body onload="return checkMedia();">
-<!-- Connection lost-->
-<div class="connectionLostMasterBlock hide" id="connectionStatusDiv" >
-<div class="connectionLostInnerBlock">
-    <label class="left">Connecting ...</label>
-    <div class="clear"></div>
-    <div id="connectionErrorMsgDiv"></div>
-</div>
-</div>
-	<div id="canvasWidth">
-	<!--Top Links-->
-  <div class="headerTopLinksMaster">
-    <div class="right">
-      <div class="left position-relative"><a href="#."class="left headerTopLinks aboutClicked-Off">About</a> 
-        <!-- About Dropdown-->
-        <div id="detailsAbout" class="aboutBlock display-none">
-          <div class="aboutDetailsBlock">
-            <div class="left widthfull-100per marginBottom30">
-              <div class="left"><img data-prod-custom="pulse-aboutimg-custom" src="images/about-geode.png">
-                <div>
-                 <div class="aboutVersionBlock left" id="pulseVersion"></div>
-                 <div class="left termsBlock">&nbsp;<a id="pulseVersionDetailsLink" href="#dialog1" class="display-none" >Version Details</a></div>
-                </div>
-              </div>
-              <div data-prod-custom="pulse-about-custom" class="right aboutText">The Pulse tool monitors Apache Geode system in real time. It provides health information, detailed operational and configuration data, system alerts, throughput performance and statistics for system members and connected clients.</div>
-            </div>
-			  <div class="left widthfull-100per copyright">
-				  <p>Apache Geode (incubating)<br>
-					  Copyright 2016 The Apache Software Foundation.</p>
-				  <p>&nbsp;</p>
-				  <p>This product includes software developed at
-					  The Apache Software Foundation (http://www.apache.org/).</p>
-			  </div>
-            </div>
-        </div>
-      
-      </div>
-      <div class="left headerTopSeperator"></div>
-      <div class="left"><a data-prod-custom="pulse-help-custom" target="_blank" href="http://geode.apache.org/docs/guide/tools_modules/pulse/chapter_overview.html" class="left headerTopLinks" class="left headerTopLinks">Help</a></div>
-      <div class="left headerTopSeperator"></div>
-      <div class="left headerTopLinks welcomeLabelPRZero">Welcome</div>
-      <div class="left headerTopLinks textbold font-size12" id="userName"></div>
-      <div class="left headerTopSeperator"></div>
-      <div class="left"><a href="pulse/clusterLogout" class="left headerTopLinks">Sign Out</a></div>
-    </div>
-  </div>
-		<!-- Header block-->
-		<header>
-			<div class="left">
-				<a id="clusterNameLink" href="#." class="left textbold HeaderLink HeaderLinkActive" onclick="openClusterDetail();"></a>
-			</div>
-			<div class="textbold right logoBlock">
-				<img src="images/apache_geode_logo.png"/><a href="#.">[LOGO]</a>
-			</div>
-		</header>
-		<div class="clear"></div>
-		<div class="subHeader">
-			<ul>
-				<li><a href="#." class="active" onclick="openClusterDetail();">Cluster View</a></li>
-				<!-- Hide Data Browser tab for gemfirexd (Pulse-Cheetah Release) -->
-				<li><a href="#."  onclick="openDataBrowser();">Data Browser</a></li>
-				<!-- Hide Query Statistics tab for gemfire -->
-				<li id="subTabQueryStatistics"><a href="#." onclick="openQueryStatistics();">Query Statistics</a></li>
-			</ul>
-		<div class="clear"></div>
-		</div>
-		<!-- Middle block-->
-		<div class="left widthfull-100per">
-			<!--Top Right Block 1-->
-			<div class="right widthfull-100per marginTB10">
-				<!-- Tab-->
-				  <div id="notificationsPanel" class="right marginL10 TabTopPanel position-relative" 
-				  data-role="widget" data-widgetid="CluserAlertNotification" data-active ="yes" data-timeline="5000">
-				  </div>
-				<!-- <div class="right marginL10">
-					<a href="#." class="left linkButton" onclick="openDataView();">Data View</a>
-				</div> -->
-				<div class="left position-relative membersNameTopMargin" data-role="widget" data-widgetid="MembersList" data-active ="yes" data-timeline="5000">
-					<a href="#." class="memberClicked-Off" id="userLink">
-					 <span id="memberName" class="member_txt">Member Name</span>
-				  </a>
-					<!-- Setting Dropdown-->
-					<div id="setting" class="settingBlock" style="display: none">
-						<div class="memeberNameSearch position-relative">
-							<div class="searchBlockMaster">
-								<input type="button" class="searchButton">
-								<input type="text" class="searchBox" placeholder="Search"
-								id="filterMembersBox" >
-							</div>
-						</div>
-						<div id="clusterMembersList" class="jsonSuggestScrollFilter">
-						  <div id="clusterMembersContainer"> </div>
-						</div>  
-					</div>
-				</div>
-			</div>
-			<!--Middle Block 1-->
-			<div class="left leftBlockCanvas">
-				<!-- Status Block-->
-				<div class="statusmasterBlock left" data-role="widget" data-widgetid="MemberDetails" data-active ="yes" data-timeline="5000">
-					<!--Status Block Normal-->
-					<div class="statusFirstBlock left">
-						<div class="statusMasterBlock" id="memberStatusIcon">
-							<div id="memberStatus" class="textbold"> </div>
-							<div class="labeltext">Member Status</div>
-						</div>
-					</div>
-					<!-- Deails B1-->
-					<!-- <div class="borderRightDarkBlue detailsBlock">
-						<div id="memberDiskStorageUsed" class="color-d2d5d7 font-size23"> </div>
-						<span class="labeltext">Disk Storage Used</span>
-					</div> -->
-					<!-- Deails B2-->
-					<div class=" detailsBlock">
-						<div id="memberRegionsCount" class="color-d2d5d7 font-size23"> </div>
-						<span data-prod-custom="pulse-regionstableCaps-custom" class="labeltext">Regions</span>
-					</div>
-					<!-- Deails B3-->
-					<div class=" detailsBlock">
-						<div id="threads" class="color-d2d5d7 font-size23"></div>
-						<span class="labeltext">Threads</span>
-					</div>
-					<!-- Deails B4-->
-					<div class=" detailsBlock">
-						<div id="sockets" class="color-d2d5d7 font-size23"></div>
-						<span class="labeltext">Sockets</span>
-					</div>
-					<!-- Deails B5-->
-					<div class=" detailsBlock">
-						<div id="loadAverage" class="color-d2d5d7 font-size23"></div>
-						<span class="labeltext">Load Avg.</span>
-					</div>
-					<!-- Deails B6-->
-					<div class=" detailsBlock display-none">
-					  <div id="offHeapFreeSize" class="color-d2d5d7 font-size23"></div>
-					  <span class="labeltext">Off-Heap Free Size</span>
-					</div>
-					<!-- Deails B7-->
-					<div class=" detailsBlock display-none">
-					  <div id="offHeapUsedSize" class="color-d2d5d7 font-size23"></div>
-					  <span class="labeltext">Off-Heap Used Size</span>
-					</div>
-					<!-- Deails B8-->
-					<div class=" detailsBlock">
-					  <div id="numClients" class="color-d2d5d7 font-size23"></div>
-					  <span class="labeltext">Clients</span>
-					</div>
-				</div>
-				<div class="clear"></div>
-				<div>
-					<div class="middleTopologyBlock">
-						<!-- Large Block-->
-						<div class="canvasBlockLarge marginBR10-11 left">
-							<div class="left widthfull-100per canvasBlockInnerBlock">
-								<span data-prod-custom="pulse-memberRegionsTables-custom" class="left marginL10 canvasHeading">Member Regions</span>
-								<a id="btnLargeBlock_1" class="minusIcon borderLeftToggleBlock" onClick="toggleDiv('LargeBlock_1');"></a>
-								<a id="btngridIcon" class="gridIcon " onClick="tabGridNew('gview_memberRegionsList');"></a>
-								<a id="btnchartIcon" class="chartIconActive " onClick="tabChart();"></a>
-							</div>
-							<div class="left canvasInnerBlock" id="LargeBlock_1">
-							<div class="left widthfull-100per canvasBlockInnerBlock regionHeading">
-							   <!-- Search-->
-							   <div class="left marginBottom6 marginL10 marginTop6">
-							     <div class="searchBlockMaster">
-							       <input type="button" class="searchButton">
-							       <input type="text" placeholder="Search"
-							         onkeyup="applyFilterOnMemberRegions();" class="searchBox"
-							         id="filterMemberRegionsBox">
-							     </div>
-							   </div>
-							</div>
-								<!--Grid  Block-->
-								<div class="gridBlocksPanel left display-none canvasBlockLargeGridContent"
-									id="gridBlocks_Panel">
-									<div class="left widthfull-100per">
-										<table id="memberRegionsList">
-										</table>
-									</div>
-								</div>
-								<!--chart  Block-->
-								<div class="chartBlocksPanel left canvasBlockLargeContent membersTreeViewHeight" id="chartBlocks_Panel">
-									<div class="left widthfull-100per" >
-										<div class="marginB11 left widthfull-100per" >
-											<!-- <div class="left marginL10">
-												<span class="left colorCodeBlock managerCode"></span><span
-													class="left marginL10">Managers</span>
-											</div>
-											<div class="left marginL10">
-												<span class="left colorCodeBlock colorCode-ffae00"></span><span
-													class="left marginL10">Locators</span>
-											</div> -->
-										<!-- 	<div class="searchBlockMaster">
-												<input type="button" class="searchButton"> <input
-													type="text" class="searchBox" id="searchRegionName" 
-													placeholder="Search" onKeydown="Javascript: if (event.keyCode==13) searchName();">
-											</div>-->
-										</div>
-										<div class="treeViewGraph position-relative" data-role="widget" data-widgetid="MemberRegionSummary" data-active ="yes" data-timeline="5000">
-											<!-- tree view Control-->
-											<div id="center-containerTree">
- 												<!-- <div id="TreeMap"></div> -->
-												<div id="memberRegionSummary" style="width:100%; height:410px; overflow:hidden;"></div>
-											</div>
-										</div>
-									</div>
-								</div>
-							</div>
-						</div>
-						<!-- Member Clients -->
-						<div class="canvasBlockLarge marginBR10-11 left" id="memberClientsWidget" data-role="widget" data-widgetid="MemberClients" data-active ="yes" data-timeline="5000">
-              <div class="left widthfull-100per canvasBlockInnerBlock">
-                <span class="left marginL10 canvasHeading">Member Clients</span>
-                <a id="btnLargeBlock_2" class="minusIcon borderLeftToggleBlock" onClick="toggleDiv('LargeBlock_2');"></a>
-              </div>
-              <div
-                class="left canvasInnerBlock canvasBlockLargeGridContent"
-                id="LargeBlock_2" >
-                <!--Grid  Block-->
-                <div class="gridBlocksPanel left"
-                  id="gridBlocks_Panel" >
-                  <div class="left widthfull-100per" >
-                    <table id="memberClientsList">
-                    </table>
-                  </div>
-                </div>
-              </div>
-            </div>
-						<!-- Block 4-->
-						<div class="canvasBlockKeyStats marginBR10-11 left" data-role="widget" data-widgetid="MemberKeyStatistics" data-active ="yes" data-timeline="5000">
-							<div class="left width495 canvasBlockInnerBlock" >
-								<span class="left marginL10 canvasHeading">Key Statistics</span><a
-									id="btnSmallBlock_4" class="minusIcon"
-									onClick="toggleDiv('SmallBlock_4');"></a>
-							</div>
-							<div class="left canvasInnerBlock canvasContentBlockKeyStats"
-								id="SmallBlock_4" >
-								<div class="graphBlocksContent left" >
-									<span class="marginB11 left widthfull-100per">Last 15
-										Minutes</span>
-									<!--Line 1-->
-									<div class="left widthfull-100per marginB10" >
-										<span id="memberCPUUsageSparkLine" class="left lineGraphKeyStats"> </span>
-										<span id="memberCPUUsageValue" class="color-d2d5d7 font-size23"> </span>
-										<span class="paddingL5">% CPU Usage</span>
-									</div>
-                  <!--Line 2-->
-                  <!-- <div class="left widthfull-100per ">
-                    <span id="memberMemoryUsageSparkLine" class="left lineGraphKeyStats"> </span>
-                    <span id="memberMemoryUsageValue" class="color-d2d5d7 font-size23"> </span>
-                    <span class="paddingL5">MB</span>
-                  </div> -->
-									<!--Line 3-->
-									<div class="left widthfull-100per marginB10" >
-										<span id="memberGetsPerSecSparkLine" class="left lineGraphKeyStats"> </span>
-										<span id="memberGetsPerSecValue" class="color-d2d5d7 font-size23">345.12</span>
-										<span data-prod-custom="pulse-readgetpersec-custom" class="paddingL5">Read/Sec</span>
-									</div>
-									<!--Line 4-->
-									<div class="left widthfull-100per marginB10" >
-										<span id="memberPutsPerSecSparkLineBar" class="left lineGraphKeyStats"> </span>
-										<span id="memberPutsPerSecValue" class="color-d2d5d7 font-size23">678.34</span>
-										<span data-prod-custom="pulse-writeputpersec-custom" class="paddingL5">Write/Sec</span>
-									</div>
-								</div>
-							</div>
-						</div>
-						<!-- Block 5-->
-						<!-- <div class="canvasBlock marginBR10-11 left">
-							<div class="left width242 canvasBlockInnerBlock">
-								<span class="left marginL10 canvasHeading">Memory Usage</span><a
-									id="btnSmallBlock_5" class="minusIcon"
-									onClick="toggleDiv('SmallBlock_5');"></a>
-							</div>
-							<div class="left canvasInnerBlock canvasContentBlock"
-								id="SmallBlock_5">
-								<div class="graphBlocksContent">
-									<div id="memberHeapUsageAvg" class="color-d2d5d7 font-size40"> </div>
-									<span>Last 15 Minutes</span>
-								</div>
-								<div class="left graphChart">
-									<span class="left lineGraph" id="memberHeapUsage"></span>
-								</div>
-							</div>
-						</div>-->
-						<!-- Block 6-->
-						<div class="canvasBlock marginBR10-11 left" data-role="widget" data-widgetid="MemberGCPauses" data-active ="yes" data-timeline="5000">
-							<div class="left width242 canvasBlockInnerBlock">
-								<span class="left marginL10 canvasHeading">No. of JVM
-									pauses</span><a id="btnSmallBlock_6" class="minusIcon"
-									onClick="toggleDiv('SmallBlock_6');"></a>
-							</div>
-							<div class="left canvasInnerBlock canvasContentBlock"
-								id="SmallBlock_6">
-								<div class="graphBlocksContent">
-									<div id="memberGcPausesAvg" class="color-d2d5d7 font-size40"> </div>
-									<span>Last 15 Minutes</span>
-								</div>
-								<div class="left graphChart">
-									<span class="left lineGraph" id="memberGCPauses"></span>
-								</div>
-							</div>
-						</div>
-					</div>
-					<!-- Right Block-->
-					<div class="rightBlockCanvas">
-						<!-- Block 1-->
-						<div id="MemberGatewayHubWidget" class="canvasBlock marginB10 left " 
-						  data-role="widget" data-widgetid="MemberGatewayHub" data-active ="yes" data-timeline="5000">
-							<div class="left width242 canvasBlockInnerBlock">
-								<span class="left marginL10 canvasHeading">Gateway Receiver</span><a
-									id="btnSmallBlock_1" class="minusIcon"
-									onClick="toggleDiv('SmallBlock_1');"></a>
-							</div>
-							<div class="left canvasInnerBlock canvasContentBlock"
-								id="SmallBlock_1">
-								<div class="graphBlocksContent">
-									<div class="detailsBlock-member firstPaddingLeftZero">
-										<div id="receiverListeningPort" class="color-d2d5d7 font-size20"> </div>
-										<span class="labeltext">Listening Port</span>
-									</div>
-									<div class="detailsBlock-member">
-										<div id="receiverLinkThroughput" class="color-d2d5d7 font-size20"> </div>
-										<span class="labeltext">Link Throughput</span>
-									</div>
-									<div class="detailsBlock-member lastPaddingLeftZero">
-										<div id="receiverAvgBatchLatency" class="color-d2d5d7 font-size20"> </div>
-										<span class="labeltext">AVG Batch Latency</span>
-									</div>
-								</div>
-								<!-- End Point Master-->
-								<div class="left endPointMasterBlock">
-									<!--End point-->
-									<div class="pointHeading">
-										<label class="pointTextHeading">Gateway Senders</label>
-									</div>
-									<div class="pointGridHeading">
-										<span class="pointHeadingPadding pointC1">ID</span><span
-											class="pointHeadingPadding pointC2">Queue Size</span><span
-											class="pointHeadingPadding pointC3">Status</span>
-									</div>
-									<div class="pointGridData">
-									  <div id="gatewaySendersList" > </div>
-									</div>
-								</div>
-								<div class="clearButton">
-									<a id="idGatewaySenderMoreDetailsLink" class="right linkButton" onclick="showGatewaySenderPopup(this)" href="#">More Details</a>
-								</div>
-								<!-- Regions Involved-->
-								<div class="left endPointMasterBlock">
-									<!--Regions Involved-->
-									<img src="images/spacer.png" height="1" border="0"
-										class="pointHeading">
-									<div class="pointGridHeading">
-										<span data-prod-custom="pulse-regionstableInvolved-custom" class="pointHeadingPadding textUpper">Regions
-											Involved</span>
-									</div>
-									<div class="pointGridData" >
-									  <div id="regionInvolvedList"></div>
-									</div>
-								</div>
-							</div>
-						</div>
-						<div class="clear"></div>
-            <!-- Block 2-->
-            <div id="MemberAsynchEventQueuesWidget" class="canvasBlock marginB10 left " 
-              data-role="widget" data-widgetid="MemberAsynchEventQueues" data-active ="yes" data-timeline="5000">
-              <div class="left width242 canvasBlockInnerBlock">
-                <span class="left marginL10 canvasHeading">Asynch Event Queues</span>
-                <a id="btnSmallBlock_2" class="minusIcon" onClick="toggleDiv('SmallBlock_2');"></a>
-              </div>
-              <div class="left canvasInnerBlock canvasContentBlock" id="SmallBlock_2">
-                <div class="left endPointMasterBlock">
-                <!-- asynch event queue -->
-                  <div class="pointGridHeading">
-                    <span class="pointHeadingPadding pointC1">ID</span>
-                    <span class="pointHeadingPadding pointC2">Queue Size</span>
-                    <span class="pointHeadingPadding pointC3">Type</span>
-                  </div>
-                  <div class="pointGridData">
-                    <div id="asynchList"> </div>
-                  </div>
-                </div>
-                <div class="clearButton">
-                  <a id="idAsynchMoreDetailsLink" class="right linkButton" onclick="showAsyncEventQueuePopup(this)" href="#">More Details</a>
-                </div>
-              </div>
-            </div>
-            <div class="clear"></div>
-						<!-- Block 5-->
-						<div class="canvasBlock marginBR10-11 left" data-role="widget" data-widgetid="MemberHeapUsage" data-active ="yes" data-timeline="5000">
-							<div class="left width242 canvasBlockInnerBlock" >
-								<span class="left marginL10 canvasHeading">Memory Usage</span><a
-									id="btnSmallBlock_5" class="minusIcon"
-									onClick="toggleDiv('SmallBlock_5');"></a>
-							</div>
-							<div class="left canvasInnerBlock canvasContentBlock"
-								id="SmallBlock_5" >
-								<div class="graphBlocksContent" >
-									<div id="memberHeapUsageAvg" class="color-d2d5d7 font-size40">
-									</div>
-									<span>Last 15 Minutes</span>
-								</div>
-								<div class="left graphChart" >
-									<span class="left lineGraph" id="memberHeapUsage"></span>
-								</div>
-							</div>
-						</div>
-						<!-- Block 3-->
-						<div class="canvasBlock marginB10 left" data-role="widget" data-widgetid="MemberDiskThroughput" data-active ="yes" data-timeline="5000">
-							<div class="left width242 canvasBlockInnerBlock">
-								<span class="left marginL10 canvasHeading">Disk Throughput</span>
-								<a id="btnSmallBlock_3" class="minusIcon"
-									onClick="toggleDiv('SmallBlock_3');"></a>
-							</div>
-							<div class="left canvasInnerBlock canvasContentBlock"
-								id="SmallBlock_3">
-								<div class="graphBlocksContent marginB11 left">
-									<div class="left">
-										<span class="left">Last 15 Minutes</span>
-									</div>
-									<div class="right marginL10">
-										<span data-prod-custom="pulse-reads-custom" class="left">Reads</span> <span
-											class="left marginL10 colorCodeBlock diskReadsCode"></span>
-									</div>
-									<div class="right marginL10">
-										<span data-prod-custom="pulse-writes-custom" class="left">Writes</span> <span
-											class="left marginL10 colorCodeBlock diskWritesCode"></span>
-									</div>
-								</div>
-								<div class="graphBlocksContent width91Per left">
-									<div class="color-d2d5d7 font-size20">
-										<span id="diskReadsThroughput"></span>
-									</div>
-									<div class="width100Per left">
-										<span class="left">Reads</span> <span class="right"
-											id="currentDiskReadsThroughput"></span>
-									</div>
-								</div>
-								<div class="left graphChart marginB11">
-									<span class="left lineGraph" id="diskReadsThroughputTrend"></span>
-								</div>
-								<div class="graphBlocksContent width91Per left">
-									<div class="color-d2d5d7 font-size20">
-										<span id="diskWritesThroughput"></span>
-									</div>
-									<div class="width100Per left">
-										<span class="left">Writes</span> <span class="right"
-											id="currentDiskWritesThroughput"></span>
-									</div>
-								</div>
-								<div class="left graphChart">
-									<span class="left lineGraph" id="diskWritesThroughputTrend"></span>
-								</div>
-							</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-	<!-- Placeholder-->
-	<script>
-    $('input[placeholder], textarea[placeholder]').placeholder();
-  </script>
-<!--Popups Block-->
-<div id="boxes"> 
-  <!-- Version Details popup-->
- <div id="dialog1" class="window width345" data-role="widget" data-widgetid="PulseVersionDetails" data-active ="yes" data-timeline="5000">
-    <div class="popup_heading"><span>Version Details</span><a href="#" class="closePopup">&nbsp;</a></div>
-    <div class="popup_contentBlock">
-      <div class="popup-innerblock">
-        <ul class="widthfull-100per left">
-          <li class="left widthfull-100per">
-            <label class="width-40 display-inline-block">Pulse Version:</label>
-            <label class="width-58 display-inline-block" id="pulseVer"></label>
-          </li>
-          <li class="left widthfull-100per">
-            <label class="width-40 display-inline-block">Build Id:</label>
-            <label class="width-58 display-inline-block" id="buildId"></label>
-          </li>
-          <li class="left widthfull-100per">
-            <label class="width-40 display-inline-block">Build Date:</label>
-            <label class="width-58 display-inline-block" id="buildDate"></label>
-          </li>
-          <li class="left widthfull-100per">
-            <label class="width-40 display-inline-block">Source Date:</label>
-            <label class="width-58 display-inline-block" id="sourceDate"></label>
-          </li>
-          <li class="left widthfull-100per">
-            <label class="width-40 display-inline-block">Source Revision:</label>
-            <label class="width-58 display-inline-block" id="sourceRevision"></label>
-          </li>
-          <li class="left widthfull-100per">
-            <label class="width-40 display-inline-block">Source Repository:</label>
-            <label class="width-58 display-inline-block" id="sourceRepository"></label>
-          </li>
-        </ul>
-        <div class="clear"></div>
-      </div>
-    </div>
-  </div>
-  <!-- Mask to cover the whole screen -->
-  <div id="mask"></div>
-</div>
-<div id="tooltip" class="tooltip"></div>
-<!-- Placeholder--> 
-<script>
-$('input[placeholder], textarea[placeholder]').placeholder();
-</script>
-</body>
-</html>
+<!DOCTYPE HTML>
+<!--
+  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.
+-->
+
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="X-UA-Compatible" content="IE=edge" />
+<meta http-equiv="CACHE-CONTROL" content="NO-CACHE,NO-STORE" />
+<meta http-equiv="PRAGMA" content="NO-CACHE" />
+<meta http-equiv="EXPIRES" content="-1">
+<title>Pulse</title>
+<link href="css/common.css" rel="stylesheet" type="text/css" />
+<link href="css/style.css" rel="stylesheet" type="text/css" />
+
+<!-- fix IE Ui issues-->
+
+<!--[if IE 7]>
+  <link href="css/ie/ie7.css" type="text/css" rel="stylesheet"/>
+ <![endif]-->
+<!--[if IE 8]>
+  <link href="css/ie/ie8.css" type="text/css" rel="stylesheet"/>
+ <![endif]-->
+<!--[if IE 9]>
+  <link href="css/ie/ie9.css" type="text/css" rel="stylesheet"/>
+ <![endif]-->
+<!-- IE Fix for HTML5 Tags -->
+<!--[if lt IE 9]>
+<script src='scripts/lib/html5.js'></script>
+  <script type="text/javascript" src="scripts/lib/excanvas.js"></script>
+  <script type="text/javascript"> if (!window.console) console = {log: function() {}}; </script>
+  <![endif]-->
+  
+<!-- Rgraph and TreeMap-->
+<link type="text/css" href="css/base.css" rel="stylesheet" />
+<link type="text/css" href="css/Treemap.css" rel="stylesheet" />
+
+<!--Custom Scroll Bar-->
+<!-- styles needed by jScrollPane - include in your own sites -->
+<link type="text/css" href="css/jquery.jscrollpane.css" rel="stylesheet" media="all" />
+<!--Grid View-->
+<link rel="stylesheet" type="text/css" media="screen" href="css/grid/ui.jqgrid.css" />
+
+<!-- JavaScripts -->
+
+  <!-- Start: JQuery plugins JS -->
+  <script type="text/javascript" src='scripts/lib/jquery-1.7.2.js'></script>
+  <script type="text/javascript" src="scripts/lib/jit.js"></script>
+  <script type="text/javascript" src="scripts/lib/jquery.sparkline.js"></script>
+  <script type="text/javascript" src="scripts/lib/jquery.i18n.properties.js"></script>
+  <!-- End: JQuery plugins JS -->
+  
+  <!-- Start: Common JS -->
+  <script type="text/javascript" src='scripts/lib/common.js'></script>
+  <!-- End: Common JS -->
+
+	<!-- the mousewheel plugin -->
+	<script type="text/javascript" src="scripts/lib/jquery.mousewheel.js"></script>
+	<!-- the jScrollPane script -->
+	<script type="text/javascript" src="scripts/lib/jquery.jscrollpane.js"></script>
+	<!--Place Holder tag-->
+	<script type="text/javascript" src="scripts/lib/jquery.placeholder.js"></script>
+	<!--Grid View-->
+  <script src="scripts/lib/grid.locale-en.js" type="text/javascript"></script>
+  <script src="scripts/lib/jquery.jqGrid.src.js" type="text/javascript"></script>
+  <script src="scripts/lib/jquery.tablednd.js" type="text/javascript"></script>
+  
+  <!-- jQuery plugin to support automatically updating fuzzy timestamps 
+  (e.g. "4 minutes ago" or "about 1 day ago") -->
+  <script type="text/javascript" src="scripts/lib/jquery.timeago.js"></script>
+  
+  <!-- Start: Members Widgets JS -->
+  <script type="text/javascript" src="scripts/pulsescript/PulseCallbacks.js"></script>
+<script type="text/javascript" src="scripts/pulsescript/PulseFunctions.js"></script>
+<script type="text/javascript" src='scripts/pulsescript/common.js'></script>
+  <script type="text/javascript" src="scripts/pulsescript/MemberDetails.js"></script>
+</head>
+
+<body onload="return checkMedia();">
+<!-- Connection lost-->
+<div class="connectionLostMasterBlock hide" id="connectionStatusDiv" >
+<div class="connectionLostInnerBlock">
+    <label class="left">Connecting ...</label>
+    <div class="clear"></div>
+    <div id="connectionErrorMsgDiv"></div>
+</div>
+</div>
+	<div id="canvasWidth">
+	<!--Top Links-->
+  <div class="headerTopLinksMaster">
+    <div class="right">
+      <div class="left position-relative"><a href="#."class="left headerTopLinks aboutClicked-Off">About</a> 
+        <!-- About Dropdown-->
+        <div id="detailsAbout" class="aboutBlock display-none">
+          <div class="aboutDetailsBlock">
+            <div class="left widthfull-100per marginBottom30">
+              <div class="left"><img data-prod-custom="pulse-aboutimg-custom" src="images/about-geode.png">
+                <div>
+                 <div class="aboutVersionBlock left" id="pulseVersion"></div>
+                 <div class="left termsBlock">&nbsp;<a id="pulseVersionDetailsLink" href="#dialog1" class="display-none" >Version Details</a></div>
+                </div>
+              </div>
+              <div data-prod-custom="pulse-about-custom" class="right aboutText">The Pulse tool monitors Apache Geode system in real time. It provides health information, detailed operational and configuration data, system alerts, throughput performance and statistics for system members and connected clients.</div>
+            </div>
+			  <div class="left widthfull-100per copyright">
+				  <p>Apache Geode<br>
+					  Copyright 2016 The Apache Software Foundation.</p>
+				  <p>&nbsp;</p>
+				  <p>This product includes software developed at
+					  The Apache Software Foundation (http://www.apache.org/).</p>
+			  </div>
+            </div>
+        </div>
+      
+      </div>
+      <div class="left headerTopSeperator"></div>
+      <div class="left"><a data-prod-custom="pulse-help-custom" target="_blank" href="http://geode.apache.org/docs/guide/tools_modules/pulse/chapter_overview.html" class="left headerTopLinks" class="left headerTopLinks">Help</a></div>
+      <div class="left headerTopSeperator"></div>
+      <div class="left headerTopLinks welcomeLabelPRZero">Welcome</div>
+      <div class="left headerTopLinks textbold font-size12" id="userName"></div>
+      <div class="left headerTopSeperator"></div>
+      <div class="left"><a href="pulse/clusterLogout" class="left headerTopLinks">Sign Out</a></div>
+    </div>
+  </div>
+		<!-- Header block-->
+		<header>
+			<div class="left">
+				<a id="clusterNameLink" href="#." class="left textbold HeaderLink HeaderLinkActive" onclick="openClusterDetail();"></a>
+			</div>
+			<div class="textbold right logoBlock">
+				<img src="images/apache_geode_logo.png"/><a href="#.">[LOGO]</a>
+			</div>
+		</header>
+		<div class="clear"></div>
+		<div class="subHeader">
+			<ul>
+				<li><a href="#." class="active" onclick="openClusterDetail();">Cluster View</a></li>
+				<!-- Hide Data Browser tab for gemfirexd (Pulse-Cheetah Release) -->
+				<li><a href="#."  onclick="openDataBrowser();">Data Browser</a></li>
+				<!-- Hide Query Statistics tab for gemfire -->
+				<li id="subTabQueryStatistics"><a href="#." onclick="openQueryStatistics();">Query Statistics</a></li>
+			</ul>
+		<div class="clear"></div>
+		</div>
+		<!-- Middle block-->
+		<div class="left widthfull-100per">
+			<!--Top Right Block 1-->
+			<div class="right widthfull-100per marginTB10">
+				<!-- Tab-->
+				  <div id="notificationsPanel" class="right marginL10 TabTopPanel position-relative" 
+				  data-role="widget" data-widgetid="CluserAlertNotification" data-active ="yes" data-timeline="5000">
+				  </div>
+				<!-- <div class="right marginL10">
+					<a href="#." class="left linkButton" onclick="openDataView();">Data View</a>
+				</div> -->
+				<div class="left position-relative membersNameTopMargin" data-role="widget" data-widgetid="MembersList" data-active ="yes" data-timeline="5000">
+					<a href="#." class="memberClicked-Off" id="userLink">
+					 <span id="memberName" class="member_txt">Member Name</span>
+				  </a>
+					<!-- Setting Dropdown-->
+					<div id="setting" class="settingBlock" style="display: none">
+						<div class="memeberNameSearch position-relative">
+							<div class="searchBlockMaster">
+								<input type="button" class="searchButton">
+								<input type="text" class="searchBox" placeholder="Search"
+								id="filterMembersBox" >
+							</div>
+						</div>
+						<div id="clusterMembersList" class="jsonSuggestScrollFilter">
+						  <div id="clusterMembersContainer"> </div>
+						</div>  
+					</div>
+				</div>
+			</div>
+			<!--Middle Block 1-->
+			<div class="left leftBlockCanvas">
+				<!-- Status Block-->
+				<div class="statusmasterBlock left" data-role="widget" data-widgetid="MemberDetails" data-active ="yes" data-timeline="5000">
+					<!--Status Block Normal-->
+					<div class="statusFirstBlock left">
+						<div class="statusMasterBlock" id="memberStatusIcon">
+							<div id="memberStatus" class="textbold"> </div>
+							<div class="labeltext">Member Status</div>
+						</div>
+					</div>
+					<!-- Deails B1-->
+					<!-- <div class="borderRightDarkBlue detailsBlock">
+						<div id="memberDiskStorageUsed" class="color-d2d5d7 font-size23"> </div>
+						<span class="labeltext">Disk Storage Used</span>
+					</div> -->
+					<!-- Deails B2-->
+					<div class=" detailsBlock">
+						<div id="memberRegionsCount" class="color-d2d5d7 font-size23"> </div>
+						<span data-prod-custom="pulse-regionstableCaps-custom" class="labeltext">Regions</span>
+					</div>
+					<!-- Deails B3-->
+					<div class=" detailsBlock">
+						<div id="threads" class="color-d2d5d7 font-size23"></div>
+						<span class="labeltext">Threads</span>
+					</div>
+					<!-- Deails B4-->
+					<div class=" detailsBlock">
+						<div id="sockets" class="color-d2d5d7 font-size23"></div>
+						<span class="labeltext">Sockets</span>
+					</div>
+					<!-- Deails B5-->
+					<div class=" detailsBlock">
+						<div id="loadAverage" class="color-d2d5d7 font-size23"></div>
+						<span class="labeltext">Load Avg.</span>
+					</div>
+					<!-- Deails B6-->
+					<div class=" detailsBlock display-none">
+					  <div id="offHeapFreeSize" class="color-d2d5d7 font-size23"></div>
+					  <span class="labeltext">Off-Heap Free Size</span>
+					</div>
+					<!-- Deails B7-->
+					<div class=" detailsBlock display-none">
+					  <div id="offHeapUsedSize" class="color-d2d5d7 font-size23"></div>
+					  <span class="labeltext">Off-Heap Used Size</span>
+					</div>
+					<!-- Deails B8-->
+					<div class=" detailsBlock">
+					  <div id="numClients" class="color-d2d5d7 font-size23"></div>
+					  <span class="labeltext">Clients</span>
+					</div>
+				</div>
+				<div class="clear"></div>
+				<div>
+					<div class="middleTopologyBlock">
+						<!-- Large Block-->
+						<div class="canvasBlockLarge marginBR10-11 left">
+							<div class="left widthfull-100per canvasBlockInnerBlock">
+								<span data-prod-custom="pulse-memberRegionsTables-custom" class="left marginL10 canvasHeading">Member Regions</span>
+								<a id="btnLargeBlock_1" class="minusIcon borderLeftToggleBlock" onClick="toggleDiv('LargeBlock_1');"></a>
+								<a id="btngridIcon" class="gridIcon " onClick="tabGridNew('gview_memberRegionsList');"></a>
+								<a id="btnchartIcon" class="chartIconActive " onClick="tabChart();"></a>
+							</div>
+							<div class="left canvasInnerBlock" id="LargeBlock_1">
+							<div class="left widthfull-100per canvasBlockInnerBlock regionHeading">
+							   <!-- Search-->
+							   <div class="left marginBottom6 marginL10 marginTop6">
+							     <div class="searchBlockMaster">
+							       <input type="button" class="searchButton">
+							       <input type="text" placeholder="Search"
+							         onkeyup="applyFilterOnMemberRegions();" class="searchBox"
+							         id="filterMemberRegionsBox">
+							     </div>
+							   </div>
+							</div>
+								<!--Grid  Block-->
+								<div class="gridBlocksPanel left display-none canvasBlockLargeGridContent"
+									id="gridBlocks_Panel">
+									<div class="left widthfull-100per">
+										<table id="memberRegionsList">
+										</table>
+									</div>
+								</div>
+								<!--chart  Block-->
+								<div class="chartBlocksPanel left canvasBlockLargeContent membersTreeViewHeight" id="chartBlocks_Panel">
+									<div class="left widthfull-100per" >
+										<div class="marginB11 left widthfull-100per" >
+											<!-- <div class="left marginL10">
+												<span class="left colorCodeBlock managerCode"></span><span
+													class="left marginL10">Managers</span>
+											</div>
+											<div class="left marginL10">
+												<span class="left colorCodeBlock colorCode-ffae00"></span><span
+													class="left marginL10">Locators</span>
+											</div> -->
+										<!-- 	<div class="searchBlockMaster">
+												<input type="button" class="searchButton"> <input
+													type="text" class="searchBox" id="searchRegionName" 
+													placeholder="Search" onKeydown="Javascript: if (event.keyCode==13) searchName();">
+											</div>-->
+										</div>
+										<div class="treeViewGraph position-relative" data-role="widget" data-widgetid="MemberRegionSummary" data-active ="yes" data-timeline="5000">
+											<!-- tree view Control-->
+											<div id="center-containerTree">
+ 												<!-- <div id="TreeMap"></div> -->
+												<div id="memberRegionSummary" style="width:100%; height:410px; overflow:hidden;"></div>
+											</div>
+										</div>
+									</div>
+								</div>
+							</div>
+						</div>
+						<!-- Member Clients -->
+						<div class="canvasBlockLarge marginBR10-11 left" id="memberClientsWidget" data-role="widget" data-widgetid="MemberClients" data-active ="yes" data-timeline="5000">
+              <div class="left widthfull-100per canvasBlockInnerBlock">
+                <span class="left marginL10 canvasHeading">Member Clients</span>
+                <a id="btnLargeBlock_2" class="minusIcon borderLeftToggleBlock" onClick="toggleDiv('LargeBlock_2');"></a>
+              </div>
+              <div
+                class="left canvasInnerBlock canvasBlockLargeGridContent"
+                id="LargeBlock_2" >
+                <!--Grid  Block-->
+                <div class="gridBlocksPanel left"
+                  id="gridBlocks_Panel" >
+                  <div class="left widthfull-100per" >
+                    <table id="memberClientsList">
+                    </table>
+                  </div>
+                </div>
+              </div>
+            </div>
+						<!-- Block 4-->
+						<div class="canvasBlockKeyStats marginBR10-11 left" data-role="widget" data-widgetid="MemberKeyStatistics" data-active ="yes" data-timeline="5000">
+							<div class="left width495 canvasBlockInnerBlock" >
+								<span class="left marginL10 canvasHeading">Key Statistics</span><a
+									id="btnSmallBlock_4" class="minusIcon"
+									onClick="toggleDiv('SmallBlock_4');"></a>
+							</div>
+							<div class="left canvasInnerBlock canvasContentBlockKeyStats"
+								id="SmallBlock_4" >
+								<div class="graphBlocksContent left" >
+									<span class="marginB11 left widthfull-100per">Last 15
+										Minutes</span>
+									<!--Line 1-->
+									<div class="left widthfull-100per marginB10" >
+										<span id="memberCPUUsageSparkLine" class="left lineGraphKeyStats"> </span>
+										<span id="memberCPUUsageValue" class="color-d2d5d7 font-size23"> </span>
+										<span class="paddingL5">% CPU Usage</span>
+									</div>
+                  <!--Line 2-->
+                  <!-- <div class="left widthfull-100per ">
+                    <span id="memberMemoryUsageSparkLine" class="left lineGraphKeyStats"> </span>
+                    <span id="memberMemoryUsageValue" class="color-d2d5d7 font-size23"> </span>
+                    <span class="paddingL5">MB</span>
+                  </div> -->
+									<!--Line 3-->
+									<div class="left widthfull-100per marginB10" >
+										<span id="memberGetsPerSecSparkLine" class="left lineGraphKeyStats"> </span>
+										<span id="memberGetsPerSecValue" class="color-d2d5d7 font-size23">345.12</span>
+										<span data-prod-custom="pulse-readgetpersec-custom" class="paddingL5">Read/Sec</span>
+									</div>
+									<!--Line 4-->
+									<div class="left widthfull-100per marginB10" >
+										<span id="memberPutsPerSecSparkLineBar" class="left lineGraphKeyStats"> </span>
+										<span id="memberPutsPerSecValue" class="color-d2d5d7 font-size23">678.34</span>
+										<span data-prod-custom="pulse-writeputpersec-custom" class="paddingL5">Write/Sec</span>
+									</div>
+								</div>
+							</div>
+						</div>
+						<!-- Block 5-->
+						<!-- <div class="canvasBlock marginBR10-11 left">
+							<div class="left width242 canvasBlockInnerBlock">
+								<span class="left marginL10 canvasHeading">Memory Usage</span><a
+									id="btnSmallBlock_5" class="minusIcon"
+									onClick="toggleDiv('SmallBlock_5');"></a>
+							</div>
+							<div class="left canvasInnerBlock canvasContentBlock"
+								id="SmallBlock_5">
+								<div class="graphBlocksContent">
+									<div id="memberHeapUsageAvg" class="color-d2d5d7 font-size40"> </div>
+									<span>Last 15 Minutes</span>
+								</div>
+								<div class="left graphChart">
+									<span class="left lineGraph" id="memberHeapUsage"></span>
+								</div>
+							</div>
+						</div>-->
+						<!-- Block 6-->
+						<div class="canvasBlock marginBR10-11 left" data-role="widget" data-widgetid="MemberGCPauses" data-active ="yes" data-timeline="5000">
+							<div class="left width242 canvasBlockInnerBlock">
+								<span class="left marginL10 canvasHeading">No. of JVM
+									pauses</span><a id="btnSmallBlock_6" class="minusIcon"
+									onClick="toggleDiv('SmallBlock_6');"></a>
+							</div>
+							<div class="left canvasInnerBlock canvasContentBlock"
+								id="SmallBlock_6">
+								<div class="graphBlocksContent">
+									<div id="memberGcPausesAvg" class="color-d2d5d7 font-size40"> </div>
+									<span>Last 15 Minutes</span>
+								</div>
+								<div class="left graphChart">
+									<span class="left lineGraph" id="memberGCPauses"></span>
+								</div>
+							</div>
+						</div>
+					</div>
+					<!-- Right Block-->
+					<div class="rightBlockCanvas">
+						<!-- Block 1-->
+						<div id="MemberGatewayHubWidget" class="canvasBlock marginB10 left " 
+						  data-role="widget" data-widgetid="MemberGatewayHub" data-active ="yes" data-timeline="5000">
+							<div class="left width242 canvasBlockInnerBlock">
+								<span class="left marginL10 canvasHeading">Gateway Receiver</span><a
+									id="btnSmallBlock_1" class="minusIcon"
+									onClick="toggleDiv('SmallBlock_1');"></a>
+							</div>
+							<div class="left canvasInnerBlock canvasContentBlock"
+								id="SmallBlock_1">
+								<div class="graphBlocksContent">
+									<div class="detailsBlock-member firstPaddingLeftZero">
+										<div id="receiverListeningPort" class="color-d2d5d7 font-size20"> </div>
+										<span class="labeltext">Listening Port</span>
+									</div>
+									<div class="detailsBlock-member">
+										<div id="receiverLinkThroughput" class="color-d2d5d7 font-size20"> </div>
+										<span class="labeltext">Link Throughput</span>
+									</div>
+									<div class="detailsBlock-member lastPaddingLeftZero">
+										<div id="receiverAvgBatchLatency" class="color-d2d5d7 font-size20"> </div>
+										<span class="labeltext">AVG Batch Latency</span>
+									</div>
+								</div>
+								<!-- End Point Master-->
+								<div class="left endPointMasterBlock">
+									<!--End point-->
+									<div class="pointHeading">
+										<label class="pointTextHeading">Gateway Senders</label>
+									</div>
+									<div class="pointGridHeading">
+										<span class="pointHeadingPadding pointC1">ID</span><span
+											class="pointHeadingPadding pointC2">Queue Size</span><span
+											class="pointHeadingPadding pointC3">Status</span>
+									</div>
+									<div class="pointGridData">
+									  <div id="gatewaySendersList" > </div>
+									</div>
+								</div>
+								<div class="clearButton">
+									<a id="idGatewaySenderMoreDetailsLink" class="right linkButton" onclick="showGatewaySenderPopup(this)" href="#">More Details</a>
+								</div>
+								<!-- Regions Involved-->
+								<div class="left endPointMasterBlock">
+									<!--Regions Involved-->
+									<img src="images/spacer.png" height="1" border="0"
+										class="pointHeading">
+									<div class="pointGridHeading">
+										<span data-prod-custom="pulse-regionstableInvolved-custom" class="pointHeadingPadding textUpper">Regions
+											Involved</span>
+									</div>
+									<div class="pointGridData" >
+									  <div id="regionInvolvedList"></div>
+									</div>
+								</div>
+							</div>
+						</div>
+						<div class="clear"></div>
+            <!-- Block 2-->
+            <div id="MemberAsynchEventQueuesWidget" class="canvasBlock marginB10 left " 
+              data-role="widget" data-widgetid="MemberAsynchEventQueues" data-active ="yes" data-timeline="5000">
+              <div class="left width242 canvasBlockInnerBlock">
+                <span class="left marginL10 canvasHeading">Asynch Event Queues</span>
+                <a id="btnSmallBlock_2" class="minusIcon" onClick="toggleDiv('SmallBlock_2');"></a>
+              </div>
+              <div class="left canvasInnerBlock canvasContentBlock" id="SmallBlock_2">
+                <div class="left endPointMasterBlock">
+                <!-- asynch event queue -->
+                  <div class="pointGridHeading">
+                    <span class="pointHeadingPadding pointC1">ID</span>
+                    <span class="pointHeadingPadding pointC2">Queue Size</span>
+                    <span class="pointHeadingPadding pointC3">Type</span>
+                  </div>
+                  <div class="pointGridData">
+                    <div id="asynchList"> </div>
+                  </div>
+                </div>
+                <div class="clearButton">
+                  <a id="idAsynchMoreDetailsLink" class="right linkButton" onclick="showAsyncEventQueuePopup(this)" href="#">More Details</a>
+                </div>
+              </div>
+            </div>
+            <div class="clear"></div>
+						<!-- Block 5-->
+						<div class="canvasBlock marginBR10-11 left" data-role="widget" data-widgetid="MemberHeapUsage" data-active ="yes" data-timeline="5000">
+							<div class="left width242 canvasBlockInnerBlock" >
+								<span class="left marginL10 canvasHeading">Memory Usage</span><a
+									id="btnSmallBlock_5" class="minusIcon"
+									onClick="toggleDiv('SmallBlock_5');"></a>
+							</div>
+							<div class="left canvasInnerBlock canvasContentBlock"
+								id="SmallBlock_5" >
+								<div class="graphBlocksContent" >
+									<div id="memberHeapUsageAvg" class="color-d2d5d7 font-size40">
+									</div>
+									<span>Last 15 Minutes</span>
+								</div>
+								<div class="left graphChart" >
+									<span class="left lineGraph" id="memberHeapUsage"></span>
+								</div>
+							</div>
+						</div>
+						<!-- Block 3-->
+						<div class="canvasBlock marginB10 left" data-role="widget" data-widgetid="MemberDiskThroughput" data-active ="yes" data-timeline="5000">
+							<div class="left width242 canvasBlockInnerBlock">
+								<span class="left marginL10 canvasHeading">Disk Throughput</span>
+								<a id="btnSmallBlock_3" class="minusIcon"
+									onClick="toggleDiv('SmallBlock_3');"></a>
+							</div>
+							<div class="left canvasInnerBlock canvasContentBlock"
+								id="SmallBlock_3">
+								<div class="graphBlocksContent marginB11 left">
+									<div class="left">
+										<span class="left">Last 15 Minutes</span>
+									</div>
+									<div class="right marginL10">
+										<span data-prod-custom="pulse-reads-custom" class="left">Reads</span> <span
+											class="left marginL10 colorCodeBlock diskReadsCode"></span>
+									</div>
+									<div class="right marginL10">
+										<span data-prod-custom="pulse-writes-custom" class="left">Writes</span> <span
+											class="left marginL10 colorCodeBlock diskWritesCode"></span>
+									</div>
+								</div>
+								<div class="graphBlocksContent width91Per left">
+									<div class="color-d2d5d7 font-size20">
+										<span id="diskReadsThroughput"></span>
+									</div>
+									<div class="width100Per left">
+										<span class="left">Reads</span> <span class="right"
+											id="currentDiskReadsThroughput"></span>
+									</div>
+								</div>
+								<div class="left graphChart marginB11">
+									<span class="left lineGraph" id="diskReadsThroughputTrend"></span>
+								</div>
+								<div class="graphBlocksContent width91Per left">
+									<div class="color-d2d5d7 font-size20">
+										<span id="diskWritesThroughput"></span>
+									</div>
+									<div class="width100Per left">
+										<span class="left">Writes</span> <span class="right"
+											id="currentDiskWritesThroughput"></span>
+									</div>
+								</div>
+								<div class="left graphChart">
+									<span class="left lineGraph" id="diskWritesThroughputTrend"></span>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<!-- Placeholder-->
+	<script>
+    $('input[placeholder], textarea[placeholder]').placeholder();
+  </script>
+<!--Popups Block-->
+<div id="boxes"> 
+  <!-- Version Details popup-->
+ <div id="dialog1" class="window width345" data-role="widget" data-widgetid="PulseVersionDetails" data-active ="yes" data-timeline="5000">
+    <div class="popup_heading"><span>Version Details</span><a href="#" class="closePopup">&nbsp;</a></div>
+    <div class="popup_contentBlock">
+      <div class="popup-innerblock">
+        <ul class="widthfull-100per left">
+          <li class="left widthfull-100per">
+            <label class="width-40 display-inline-block">Pulse Version:</label>
+            <label class="width-58 display-inline-block" id="pulseVer"></label>
+          </li>
+          <li class="left widthfull-100per">
+            <label class="width-40 display-inline-block">Build Id:</label>
+            <label class="width-58 display-inline-block" id="buildId"></label>
+          </li>
+          <li class="left widthfull-100per">
+            <label class="width-40 display-inline-block">Build Date:</label>
+            <label class="width-58 display-inline-block" id="buildDate"></label>
+          </li>
+          <li class="left widthfull-100per">
+            <label class="width-40 display-inline-block">Source Date:</label>
+            <label class="width-58 display-inline-block" id="sourceDate"></label>
+          </li>
+          <li class="left widthfull-100per">
+            <label class="width-40 display-inline-block">Source Revision:</label>
+            <label class="width-58 display-inline-block" id="sourceRevision"></label>
+          </li>
+          <li class="left widthfull-100per">
+            <label class="width-40 display-inline-block">Source Repository:</label>
+            <label class="width-58 display-inline-block" id="sourceRepository"></label>
+          </li>
+        </ul>
+        <div class="clear"></div>
+      </div>
+    </div>
+  </div>
+  <!-- Mask to cover the whole screen -->
+  <div id="mask"></div>
+</div>
+<div id="tooltip" class="tooltip"></div>
+<!-- Placeholder--> 
+<script>
+$('input[placeholder], textarea[placeholder]').placeholder();
+</script>
+</body>
+</html>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7d798c34/geode-pulse/src/main/webapp/QueryStatistics.html
----------------------------------------------------------------------
diff --git a/geode-pulse/src/main/webapp/QueryStatistics.html b/geode-pulse/src/main/webapp/QueryStatistics.html
index 21ece3f..543e003 100644
--- a/geode-pulse/src/main/webapp/QueryStatistics.html
+++ b/geode-pulse/src/main/webapp/QueryStatistics.html
@@ -138,7 +138,7 @@
 									system members and connected clients.</div>
 							</div>
 							<div class="left widthfull-100per copyright">
-								<p>Apache Geode (incubating)<br>
+								<p>Apache Geode<br>
 									Copyright 2016 The Apache Software Foundation.</p>
 								<p>&nbsp;</p>
 								<p>This product includes software developed at


[20/31] incubator-geode git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-geode into develop

Posted by ab...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-geode 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/a5941da7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/a5941da7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/a5941da7

Branch: refs/heads/feature/GEODE-2156
Commit: a5941da7375fa183f858e15a6b513a502cb77342
Parents: be964ef 7047920
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Thu Dec 1 11:09:48 2016 -0800
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Thu Dec 1 11:09:48 2016 -0800

----------------------------------------------------------------------
 .../geode/DeltaSerializationException.java      |    1 +
 .../apache/geode/GemFireCheckedException.java   |    1 +
 .../org/apache/geode/InvalidDeltaException.java |    1 +
 .../cache/GatewayConfigurationException.java    |    1 +
 .../apache/geode/cache/RegionRoleException.java |    1 +
 .../apache/geode/cache/ResourceException.java   |    2 +
 ...upportedOperationInTransactionException.java |    1 +
 .../apache/geode/cache/VersionException.java    |    1 +
 .../query/QueryExecutionLowMemoryException.java |    1 +
 .../query/QueryExecutionTimeoutException.java   |    1 +
 .../QueryExecutionCanceledException.java        |    1 +
 .../geode/internal/cache/AbstractRegionMap.java |   43 +-
 .../internal/cache/BucketNotFoundException.java |    1 +
 .../internal/cache/DataLocationException.java   |    2 +
 .../geode/internal/cache/LocalRegion.java       |    2 +-
 .../cache/PutAllPartialResultException.java     |    3 +
 .../apache/geode/internal/cache/RegionMap.java  |    4 +
 .../apache/geode/internal/cache/TXState.java    |   79 +-
 .../execute/InternalFunctionException.java      |    1 +
 ...ternalFunctionInvocationTargetException.java |    1 +
 .../RedundancyAlreadyMetException.java          |    1 +
 .../ConcurrentCacheModificationException.java   |    2 +
 .../internal/cache/versions/RVVException.java   |    2 +
 .../BucketRegionQueueUnavailableException.java  |    1 +
 .../internal/tcp/ReenteredConnectException.java |    1 +
 .../internal/util/SunAPINotFoundException.java  |    1 +
 .../geode/lang/AttachAPINotFoundException.java  |    1 +
 .../cli/commands/AbstractCommandsSupport.java   |   13 +-
 .../internal/cli/commands/DeployCommands.java   |   28 +-
 .../cli/exceptions/CliCommandException.java     |    1 +
 .../exceptions/CliCommandInvalidException.java  |    1 +
 .../CliCommandMultiModeOptionException.java     |    1 +
 .../CliCommandNotAvailableException.java        |    1 +
 .../exceptions/CliCommandOptionException.java   |    1 +
 .../CliCommandOptionInvalidException.java       |    1 +
 .../CliCommandOptionMissingException.java       |    1 +
 .../CliCommandOptionNotApplicableException.java |    1 +
 ...liCommandOptionValueConversionException.java |    1 +
 .../CliCommandOptionValueException.java         |    1 +
 .../CliCommandOptionValueMissingException.java  |    1 +
 .../internal/cli/exceptions/CliException.java   |    1 +
 .../cli/util/DiskStoreNotFoundException.java    |    1 +
 .../cli/util/JConsoleNotFoundException.java     |    1 +
 .../cli/util/MemberNotFoundException.java       |    1 +
 .../cli/util/VisualVmNotFoundException.java     |    1 +
 .../web/shell/MBeanAccessException.java         |    1 +
 .../RestApiCallForCommandNotFoundException.java |    1 +
 .../internal/cache/ClearTXLockingDUnitTest.java |  437 +++++
 .../security/DeployCommandsSecurityTest.java    |  124 ++
 .../security/SimpleSecurityManagerTest.java     |   27 +-
 .../security/SimpleTestSecurityManager.java     |   12 +-
 .../codeAnalysis/sanctionedSerializables.txt    | 1686 +++++++++---------
 52 files changed, 1579 insertions(+), 923 deletions(-)
----------------------------------------------------------------------



[31/31] incubator-geode git commit: GEODE-2156: Update repo references

Posted by ab...@apache.org.
GEODE-2156: Update repo references


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

Branch: refs/heads/feature/GEODE-2156
Commit: 13a046b41d395855326387c440b7b580f7e51a82
Parents: 30c269e
Author: Anthony Baker <ab...@apache.org>
Authored: Thu Dec 1 17:42:29 2016 -0800
Committer: Anthony Baker <ab...@apache.org>
Committed: Thu Dec 1 17:42:29 2016 -0800

----------------------------------------------------------------------
 .travis.yml                                    | 2 +-
 README.md                                      | 2 +-
 geode-book/config.yml                          | 2 +-
 geode-docs/about_geode.html.md.erb             | 2 +-
 geode-examples/README.md                       | 2 +-
 geode-site/website/content/index.html          | 6 +++---
 geode-site/website/content/releases/index.html | 4 ++--
 geode-site/website/layouts/footer.html         | 4 ++--
 geode-site/website/layouts/header.html         | 2 +-
 gradle/publish.gradle                          | 6 +++---
 10 files changed, 16 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/13a046b4/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index d496872..e61cde5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,7 @@ cache:
     - $HOME/.gradle/wrapper/
 
 after_failure:
-  - cat /home/travis/build/apache/incubator-geode/build/reports/rat/rat-report.txt
+  - cat /home/travis/build/apache/geode/build/reports/rat/rat-report.txt
 
 notifications:
   email:

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/13a046b4/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index d0b6de5..955d45f 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 **[Application Development](#development)**  
 **[Documentation](http://geode.apache.org/docs/)**
 **[wiki](https://cwiki.apache.org/confluence/display/GEODE/Index)**  
-**Continuous Integration** [![Build Status](https://travis-ci.org/apache/incubator-geode.svg?branch=develop)](https://travis-ci.org/apache/incubator-geode)  
+**Continuous Integration** [![Build Status](https://travis-ci.org/apache/geode.svg?branch=develop)](https://travis-ci.org/apache/geode)  
 
 ## <a name="overview"></a>Overview
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/13a046b4/geode-book/config.yml
----------------------------------------------------------------------
diff --git a/geode-book/config.yml b/geode-book/config.yml
index 6cbc87d..bbc8ccc 100644
--- a/geode-book/config.yml
+++ b/geode-book/config.yml
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 
-book_repo: apache/incubator-geode/geode-book
+book_repo: apache/geode/geode-book
 public_host: localhost
 
 sections:

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/13a046b4/geode-docs/about_geode.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/about_geode.html.md.erb b/geode-docs/about_geode.html.md.erb
index ca6f022..0d7f9b8 100644
--- a/geode-docs/about_geode.html.md.erb
+++ b/geode-docs/about_geode.html.md.erb
@@ -19,6 +19,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 -->
 
-This documentation describes product concepts and provides complete setup instructions for Apache Geode 1.0.0-incubating. Source files are available at [https://github.com/apache/incubator-geode/tree/develop/geode-docs](https://github.com/apache/incubator-geode/tree/develop/geode-docs) and instructions on how to build this documentation is available at [https://github.com/apache/incubator-geode/blob/develop/geode-book/README.md](https://github.com/apache/incubator-geode/blob/develop/geode-book/README.md).
+This documentation describes product concepts and provides complete setup instructions for Apache Geode 1.0.0-incubating. Source files are available at [https://github.com/apache/geode/tree/develop/geode-docs](https://github.com/apache/geode/tree/develop/geode-docs) and instructions on how to build this documentation is available at [https://github.com/apache/geode/blob/develop/geode-book/README.md](https://github.com/apache/geode/blob/develop/geode-book/README.md).
 
 You can also find additional documentation about Geode on the **Apache Geode Wiki**: [https://cwiki.apache.org/confluence/display/GEODE/Index](https://cwiki.apache.org/confluence/display/GEODE/Index).

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/13a046b4/geode-examples/README.md
----------------------------------------------------------------------
diff --git a/geode-examples/README.md b/geode-examples/README.md
index de7a533..6266603 100644
--- a/geode-examples/README.md
+++ b/geode-examples/README.md
@@ -1,6 +1,6 @@
 # Apache Geode examples
 
-This is the home of Apache Geode examples that are bundled with the project. Contributions<sup>[2]</sup> and corrections are welcome. Please talk to us about your suggestions at [dev@geode.apache.org](mailto:dev@geode.apache.org) or submit a [pull request](https://github.com/apache/incubator-geode/pull/new/develop).
+This is the home of Apache Geode examples that are bundled with the project. Contributions<sup>[2]</sup> and corrections are welcome. Please talk to us about your suggestions at [dev@geode.apache.org](mailto:dev@geode.apache.org) or submit a [pull request](https://github.com/apache/geode/pull/new/develop).
 
 ## Example requirements
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/13a046b4/geode-site/website/content/index.html
----------------------------------------------------------------------
diff --git a/geode-site/website/content/index.html b/geode-site/website/content/index.html
index 867eddd..55311d7 100644
--- a/geode-site/website/content/index.html
+++ b/geode-site/website/content/index.html
@@ -35,9 +35,9 @@ under the License. -->
             <div class="btn-wrapper">
               <p><a href="/releases/" class="btn btn-inverse btn-lg">Download Geode</a> &nbsp;</p> 
               <!-- Place this tag where you want the button to render. -->
-              <a class="github-button" href="https://github.com/apache/incubator-geode" data-icon="octicon-star" data-style="mega" data-count-href="/apache/incubator-geode/stargazers" data-count-api="/repos/apache/incubator-geode#stargazers_count" data-count-aria-label="# stargazers on GitHub" aria-label="Star apache/incubator-geode on GitHub">Star</a>
-              <a class="github-button" href="https://github.com/apache/incubator-geode/fork" data-icon="octicon-repo-forked" data-style="mega" data-count-href="/apache/incubator-geode/network" data-count-api="/repos/apache/incubator-geode#forks_count" data-count-aria-label="# forks on GitHub" aria-label="Fork apache/incubator-geode on GitHub">Fork</a>
-              <a class="github-button" href="https://github.com/apache/incubator-geode" data-icon="octicon-eye" data-style="mega" data-count-href="/apache/incubator-geode/watchers" data-count-api="/repos/apache/incubator-geode#subscribers_count" data-count-aria-label="# watchers on GitHub" aria-label="Watch apache/incubator-geode on GitHub">Watch</a>
+              <a class="github-button" href="https://github.com/apache/geode" data-icon="octicon-star" data-style="mega" data-count-href="/apache/geode/stargazers" data-count-api="/repos/apache/geode#stargazers_count" data-count-aria-label="# stargazers on GitHub" aria-label="Star apache/geode on GitHub">Star</a>
+              <a class="github-button" href="https://github.com/apache/geode/fork" data-icon="octicon-repo-forked" data-style="mega" data-count-href="/apache/geode/network" data-count-api="/repos/apache/geode#forks_count" data-count-aria-label="# forks on GitHub" aria-label="Fork apache/geode on GitHub">Fork</a>
+              <a class="github-button" href="https://github.com/apache/geode" data-icon="octicon-eye" data-style="mega" data-count-href="/apache/geode/watchers" data-count-api="/repos/apache/geode#subscribers_count" data-count-aria-label="# watchers on GitHub" aria-label="Watch apache/geode on GitHub">Watch</a>
 
 
             </div>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/13a046b4/geode-site/website/content/releases/index.html
----------------------------------------------------------------------
diff --git a/geode-site/website/content/releases/index.html b/geode-site/website/content/releases/index.html
index 08b28f1..de0335d 100644
--- a/geode-site/website/content/releases/index.html
+++ b/geode-site/website/content/releases/index.html
@@ -98,10 +98,10 @@ under the License. -->
 					Project releases are approved by vote of the Apache Geode Project Management Committee (PMC). Support for a release is provided by project volunteers on the project <a href="http://geode.apache.org/community/#mailing-lists">mailing lists</a>. Bugs found in a release may be discussed on the list and reported through the <a href="https://issues.apache.org/jira/browse/GEODE">issue tracker</a>. The user mailing list and issue tracker are the only support options hosted by the Apache Geode project.
 				</p>
 				<p>
-					<strong>Note</strong>: When downloading from a mirror, please be sure to verify that checksums and signatures are correct. To do so, use the checksum and signature files from the main Apache site at <a href="https://dist.apache.org/repos/dist/release/incubator/geode/">https://dist.apache.org/repos/dist/release/incubator/geode/</a>. Find here the KEYS file, which contains all OpenPGP keys we use to sign releases here: <a href="https://git-wip-us.apache.org/repos/asf?p=incubator-geode.git;a=blob;f=KEYS;h=9d13f70a9ce8f8d6a7c3feb1e194ccec123b5868;hb=c26334542fa9e90daff5f58467d6e174b3e0f3e2">KEYS</a>
+					<strong>Note</strong>: When downloading from a mirror, please be sure to verify that checksums and signatures are correct. To do so, use the checksum and signature files from the main Apache site at <a href="https://dist.apache.org/repos/dist/release/incubator/geode/">https://dist.apache.org/repos/dist/release/incubator/geode/</a>. Find here the KEYS file, which contains all OpenPGP keys we use to sign releases here: <a href="https://git-wip-us.apache.org/repos/asf?p=geode.git;a=blob;f=KEYS;h=9d13f70a9ce8f8d6a7c3feb1e194ccec123b5868;hb=c26334542fa9e90daff5f58467d6e174b3e0f3e2">KEYS</a>
 				</p>
 				<p>
-					The PGP signatures can be verified using PGP or GPG. First download the <a href="https://git-wip-us.apache.org/repos/asf?p=incubator-geode.git;a=blob;f=KEYS;h=9d13f70a9ce8f8d6a7c3feb1e194ccec123b5868;hb=c26334542fa9e90daff5f58467d6e174b3e0f3e2">KEYS</a> as well as the <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M1/">asc signature</a> file for the particular distribution. Then verify the signatures using:
+					The PGP signatures can be verified using PGP or GPG. First download the <a href="https://git-wip-us.apache.org/repos/asf?p=geode.git;a=blob;f=KEYS;h=9d13f70a9ce8f8d6a7c3feb1e194ccec123b5868;hb=c26334542fa9e90daff5f58467d6e174b3e0f3e2">KEYS</a> as well as the <a href="https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M1/">asc signature</a> file for the particular distribution. Then verify the signatures using:
 				</p>
 				<p>
        				% pgpk -a KEYS

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/13a046b4/geode-site/website/layouts/footer.html
----------------------------------------------------------------------
diff --git a/geode-site/website/layouts/footer.html b/geode-site/website/layouts/footer.html
index fc817f4..4877109 100644
--- a/geode-site/website/layouts/footer.html
+++ b/geode-site/website/layouts/footer.html
@@ -13,7 +13,7 @@
             </div>
             <div class="col-md-2">
                 <ul class="nav nav-list">
-                    <li class="nav-header"><a href="http://github.com/apache/incubator-geode" target="_blank">Code</a></li>
+                    <li class="nav-header"><a href="http://github.com/apache/geode" target="_blank">Code</a></li>
                     <li><a href="https://cwiki.apache.org/confluence/display/GEODE/Project+Proposals+and+Specifications" target="_blank">Specifications</a></li>
                     <li><a href="https://cwiki.apache.org/confluence/display/GEODE/Geode+Internal+Architecture" target="_blank">Internal Architecture</a></li>
                     <li><a href="https://cwiki.apache.org/confluence/display/GEODE/Writing+tests" target="_blank">Writing Tests</a></li>
@@ -23,7 +23,7 @@
             <div class="col-md-2">
                 <ul class="nav nav-list">
                     <li class="nav-header">Resources</li>
-                    <li><a href="http://github.com/apache/incubator-geode" target="_blank">GitHub Code</a></li>
+                    <li><a href="http://github.com/apache/geode" target="_blank">GitHub Code</a></li>
                     <li><a href="/docs/">Docs</a></li>
                     <li><a href="https://issues.apache.org/jira/browse/GEODE" target="_blank">JIRA Bug Tracker</a></li>
                     <li><a href="http://stackoverflow.com/search?q=Apache%20Geode" target="_blank">StackOverflow</a></li>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/13a046b4/geode-site/website/layouts/header.html
----------------------------------------------------------------------
diff --git a/geode-site/website/layouts/header.html b/geode-site/website/layouts/header.html
index b40ccd9..618d33d 100644
--- a/geode-site/website/layouts/header.html
+++ b/geode-site/website/layouts/header.html
@@ -247,7 +247,7 @@
             <ul class="nav navbar-nav navbar-right">
                 <li class="<%= 'active' if @community %>"><a href="/community/"><span class="fa fa-users"></span></a></li>
                 <li class="<%= 'active' if @docs %>"><a href="/docs/"><span class="fa fa-book"></span></a></li>
-                <li><a href="http://github.com/apache/incubator-geode" target="_blank"><span class="fa fa-github-square"></span></a></li>
+                <li><a href="http://github.com/apache/geode" target="_blank"><span class="fa fa-github-square"></span></a></li>
                 <!--<li><a href="https://trello.com/b/exQmJIOn/usergrid" target="_blank"><span class="icns icon-trello"></span></a></li>-->
                 <li><a href="https://issues.apache.org/jira/browse/GEODE/"
                        target="_blank"><span class="fa fa-bug"></span></a></li>

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/13a046b4/gradle/publish.gradle
----------------------------------------------------------------------
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
index dbb5919..af5ee13 100644
--- a/gradle/publish.gradle
+++ b/gradle/publish.gradle
@@ -78,9 +78,9 @@ subprojects {
       url 'http://geode.apache.org'
   
       scm {
-        url 'https://git-wip-us.apache.org/repos/asf?p=incubator-geode.git;a=tree'
-        connection 'scm:https://git-wip-us.apache.org/repos/asf/incubator-geode.git'
-        developerConnection 'scm:https://git-wip-us.apache.org/repos/asf/incubator-geode.git'
+        url 'https://git-wip-us.apache.org/repos/asf?p=geode.git;a=tree'
+        connection 'scm:https://git-wip-us.apache.org/repos/asf/geode.git'
+        developerConnection 'scm:https://git-wip-us.apache.org/repos/asf/geode.git'
       }
   
       licenses {


[11/31] incubator-geode git commit: Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-geode into develop

Posted by ab...@apache.org.
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-geode into develop

* 'develop' of https://git-wip-us.apache.org/repos/asf/incubator-geode:
  GEODE-2157: Fixing sanctionedSerializables for PutAllPartialResultEx


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

Branch: refs/heads/feature/GEODE-2156
Commit: 5928459918617613dfaf39a03512630ed66aea95
Parents: 4b0544c 423e04f
Author: Dave Barnes <db...@pivotal.io>
Authored: Wed Nov 30 16:54:09 2016 -0800
Committer: Dave Barnes <db...@pivotal.io>
Committed: Wed Nov 30 16:54:09 2016 -0800

----------------------------------------------------------------------
 .../org/apache/geode/codeAnalysis/sanctionedSerializables.txt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------



[24/31] incubator-geode git commit: This closes #293

Posted by ab...@apache.org.
This closes #293

GEODE-1653: Added helper method getAllServers in ExecuteFunctionNoAckOp
to get all available servers, instead executing Fire and Forget only on the ones the
client is currently connected to.

GEODE-1653: Dunit test for Executing a fire-and-forget function on all
servers as opposed to only executing on the ones the client is currently
connected to.

GEODE-1653: changes after spotlessApply.

GEODE-1653:
1. renamed test file to FireAndForgetFunctionOnAllServersDUnitTest and
test to testFireAndForgetFunctionOnAllServers
2. replaced thread sleep with waitUntilDeterministic function before
verifying results after Fire and Forget Function execution
3. removed commented testServerSingleKeyExecution_Bug43513_OnServer
test.

GEODE-1653: Replacing Thread's sleep with Awatility, if the condition is not met during the
timeout, a ConditionTimeoutException will be thrown. This makes
analyzing the failure much simpler.

GEODE-1653: Use a larger timeout value such as 60 seconds to prevent
test from failing on slower machines or garbage collection during the
test.

GEODE-1653:
1. Code changes
  a. Added getAllServers() method to connection source, and converted
  AutoConnectionSourceImpl's findAllServers logic into it.
  b. Made relevant changes to both ExecuteFunctionNoAckOp and
  ExecuteFunctionOp classes

2. Test changes
  a. removed author tag in the test.
  b. created a new function (FireAndForgetFunctionOnAllServers) for
  test and removed it from TestFunction.
  c. test change about awaitility and actual assertion.
  d. asserted for pool's current server size after starting a new
  server and stopping existing server.

GEODE-1653: Adding missed out file for FireAndForgetFunctionOnAllServers function.

GEODE-1653: Adding @Override to ExplicitConnectionSourceImpl's
getAllServers() method.

GEODE-1653: fix the test code to double check the getCurrentServer only
returns 1 server


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

Branch: refs/heads/feature/GEODE-2156
Commit: c61028966d51db436e75ba228465767cb1a0bd21
Parents: 44278d1
Author: Amey Barve <ab...@apache.org>
Authored: Mon Nov 21 18:09:55 2016 +0530
Committer: zhouxh <gz...@pivotal.io>
Committed: Thu Dec 1 16:19:59 2016 -0800

----------------------------------------------------------------------
 .../internal/AutoConnectionSourceImpl.java      |  28 ++--
 .../cache/client/internal/ConnectionSource.java |   7 +
 .../client/internal/ExecuteFunctionNoAckOp.java |   5 +-
 .../client/internal/ExecuteFunctionOp.java      |  20 +--
 .../internal/ExplicitConnectionSourceImpl.java  |   3 +-
 .../client/internal/QueueManagerJUnitTest.java  |   5 +
 ...eAndForgetFunctionOnAllServersDUnitTest.java | 160 +++++++++++++++++++
 ...tServerRegionFunctionExecutionDUnitTest.java |   8 -
 .../FireAndForgetFunctionOnAllServers.java      |  73 +++++++++
 .../internal/cache/functions/TestFunction.java  |   3 +-
 10 files changed, 266 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c6102896/geode-core/src/main/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImpl.java
index ca3d979..d9fca87 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImpl.java
@@ -120,6 +120,20 @@ public class AutoConnectionSourceImpl implements ConnectionSource {
     return isBalanced;
   }
 
+  @Override
+  public List<ServerLocation> getAllServers() {
+    if (PoolImpl.TEST_DURABLE_IS_NET_DOWN) {
+      return null;
+    }
+    GetAllServersRequest request = new GetAllServersRequest(serverGroup);
+    GetAllServersResponse response = (GetAllServersResponse) queryLocators(request);
+    if (response != null) {
+      return response.getServers();
+    } else {
+      return null;
+    }
+  }
+
   public ServerLocation findReplacementServer(ServerLocation currentServer,
       Set/* <ServerLocation> */ excludedServers) {
     if (PoolImpl.TEST_DURABLE_IS_NET_DOWN) {
@@ -160,20 +174,6 @@ public class AutoConnectionSourceImpl implements ConnectionSource {
     return response.getServer();
   }
 
-
-  public ArrayList<ServerLocation> findAllServers() {
-    if (PoolImpl.TEST_DURABLE_IS_NET_DOWN) {
-      return null;
-    }
-    GetAllServersRequest request = new GetAllServersRequest(serverGroup);
-    GetAllServersResponse response = (GetAllServersResponse) queryLocators(request);
-    if (response != null) {
-      return response.getServers();
-    } else {
-      return null;
-    }
-  }
-
   public List/* ServerLocation */ findServersForQueue(Set/* <ServerLocation> */ excludedServers,
       int numServers, ClientProxyMembershipID proxyId, boolean findDurableQueue) {
     if (PoolImpl.TEST_DURABLE_IS_NET_DOWN) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c6102896/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionSource.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionSource.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionSource.java
index b1ce89e..eaccb6d 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionSource.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ConnectionSource.java
@@ -66,4 +66,11 @@ public interface ConnectionSource {
    * @return true if the servers have balanced load.
    */
   boolean isBalanced();
+
+  /**
+   * get the list of all the servers
+   * 
+   * @return a list of all servers
+   */
+  List<ServerLocation> getAllServers();
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c6102896/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionNoAckOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionNoAckOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionNoAckOp.java
index f0dce70..def7389 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionNoAckOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionNoAckOp.java
@@ -70,7 +70,7 @@ public class ExecuteFunctionNoAckOp {
           logger.debug("ExecuteFunctionNoAckOp#execute : Sending Function Execution Message:"
               + op.getMessage() + " to all servers using pool: " + pool);
         }
-        servers = pool.getCurrentServers();
+        servers = pool.getConnectionSource().getAllServers();
         Iterator i = servers.iterator();
         while (i.hasNext()) {
           pool.executeOn((ServerLocation) i.next(), op);
@@ -111,7 +111,7 @@ public class ExecuteFunctionNoAckOp {
           logger.debug("ExecuteFunctionNoAckOp#execute : Sending Function Execution Message:"
               + op.getMessage() + " to all servers using pool: " + pool);
         }
-        servers = pool.getCurrentServers();
+        servers = pool.getConnectionSource().getAllServers();
         Iterator i = servers.iterator();
         while (i.hasNext()) {
           pool.executeOn((ServerLocation) i.next(), op);
@@ -235,5 +235,4 @@ public class ExecuteFunctionNoAckOp {
       return new Message(1, Version.CURRENT);
     }
   }
-
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c6102896/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionOp.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionOp.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionOp.java
index cce1c37..d32e0f4 100755
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionOp.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteFunctionOp.java
@@ -337,15 +337,7 @@ public class ExecuteFunctionOp {
       Object args, MemberMappedArgument memberMappedArg, byte hasResult, ResultCollector rc,
       boolean isFnSerializationReqd, UserAttributes attributes) {
     final List<SingleHopOperationCallable> tasks = new ArrayList<SingleHopOperationCallable>();
-    ArrayList<ServerLocation> servers = null;
-    if (pool.getLocators() == null || pool.getLocators().isEmpty()) {
-      servers = ((ExplicitConnectionSourceImpl) pool.getConnectionSource()).getAllServers();
-    } else {
-      servers = ((AutoConnectionSourceImpl) pool.getConnectionSource()).findAllServers(); // n/w
-                                                                                          // call on
-                                                                                          // locator
-    }
-
+    List<ServerLocation> servers = pool.getConnectionSource().getAllServers();
     for (ServerLocation server : servers) {
       final AbstractOp op = new ExecuteFunctionOpImpl(function, args, memberMappedArg, hasResult,
           rc, isFnSerializationReqd, (byte) 0, null/* onGroups does not use single-hop for now */,
@@ -362,15 +354,7 @@ public class ExecuteFunctionOp {
       boolean isFnSerializationReqd, boolean isHA, boolean optimizeForWrite,
       UserAttributes properties) {
     final List<SingleHopOperationCallable> tasks = new ArrayList<SingleHopOperationCallable>();
-    ArrayList<ServerLocation> servers = null;
-    if (pool.getLocators() == null || pool.getLocators().isEmpty()) {
-      servers = ((ExplicitConnectionSourceImpl) pool.getConnectionSource()).getAllServers();
-    } else {
-      servers = ((AutoConnectionSourceImpl) pool.getConnectionSource()).findAllServers(); // n/w
-                                                                                          // call on
-                                                                                          // locator
-    }
-
+    List<ServerLocation> servers = pool.getConnectionSource().getAllServers();
     for (ServerLocation server : servers) {
       final AbstractOp op = new ExecuteFunctionOpImpl(functionId, args, memberMappedArg, hasResult,
           rc, isFnSerializationReqd, isHA, optimizeForWrite, (byte) 0,

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c6102896/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExplicitConnectionSourceImpl.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExplicitConnectionSourceImpl.java b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExplicitConnectionSourceImpl.java
index 412ccb8..aee69e4 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExplicitConnectionSourceImpl.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExplicitConnectionSourceImpl.java
@@ -257,7 +257,8 @@ public class ExplicitConnectionSourceImpl implements ConnectionSource {
     return sb.toString();
   }
 
-  ArrayList<ServerLocation> getAllServers() {
+  @Override
+  public ArrayList<ServerLocation> getAllServers() {
     ArrayList<ServerLocation> list = new ArrayList<ServerLocation>();
     list.addAll(this.serverList);
     return list;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c6102896/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java b/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
index 0ec69aa..7f9a459 100644
--- a/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache/client/internal/QueueManagerJUnitTest.java
@@ -592,6 +592,11 @@ public class QueueManagerJUnitTest {
     public boolean isBalanced() {
       return false;
     }
+
+    @Override
+    public List<ServerLocation> getAllServers() {
+      return Collections.emptyList();
+    }
   }
 
   private class DummyConnection implements Connection {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c6102896/geode-core/src/test/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java
new file mode 100644
index 0000000..d733ae0
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/FireAndForgetFunctionOnAllServersDUnitTest.java
@@ -0,0 +1,160 @@
+/*
+ * 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 org.apache.geode.internal.cache;
+
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.client.*;
+import org.apache.geode.cache.client.internal.LocatorTestBase;
+import org.apache.geode.cache.client.internal.PoolImpl;
+import org.apache.geode.cache.execute.Execution;
+import org.apache.geode.cache.execute.Function;
+import org.apache.geode.cache.execute.FunctionService;
+import org.apache.geode.internal.AvailablePort;
+import org.apache.geode.internal.cache.functions.FireAndForgetFunctionOnAllServers;
+import org.apache.geode.test.dunit.Assert;
+import org.apache.geode.test.dunit.Host;
+import org.apache.geode.test.dunit.NetworkUtils;
+import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import static com.jayway.awaitility.Awaitility.*;
+import static java.util.concurrent.TimeUnit.*;
+
+@Category(DistributedTest.class)
+public class FireAndForgetFunctionOnAllServersDUnitTest extends LocatorTestBase {
+
+  public FireAndForgetFunctionOnAllServersDUnitTest() {
+    super();
+  }
+
+  @Override
+  public final void postSetUp() throws Exception {
+    disconnectAllFromDS();
+  }
+
+  @Override
+  protected final void postTearDownLocatorTestBase() throws Exception {
+    disconnectAllFromDS();
+  }
+
+  @Test
+  public void testFireAndForgetFunctionOnAllServers() {
+
+    // Test case for Executing a fire-and-forget function on all servers as opposed to only
+    // executing on the ones the
+    // client is currently connected to.
+
+    Host host = Host.getHost(0);
+    VM locator = host.getVM(0);
+    VM server1 = host.getVM(1);
+    VM server2 = host.getVM(2);
+    VM client = host.getVM(3);
+
+    final int locatorPort = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
+    final String locatorHost = NetworkUtils.getServerHostName(host);
+
+    // Step 1. Start a locator and one cache server.
+    locator.invoke("Start Locator", () -> startLocator(locatorHost, locatorPort, ""));
+
+    String locString = getLocatorString(host, locatorPort);
+
+    // Step 2. Start a server and create a replicated region "R1".
+    server1.invoke("Start BridgeServer",
+        () -> startBridgeServer(new String[] {"R1"}, locString, new String[] {"R1"}));
+
+    // Step 3. Create a client cache with pool mentioning locator.
+    client.invoke("create client cache and pool mentioning locator", () -> {
+      ClientCacheFactory ccf = new ClientCacheFactory();
+      ccf.addPoolLocator(locatorHost, locatorPort);
+      ClientCache cache = ccf.create();
+      Pool pool1 = PoolManager.createFactory().addLocator(locatorHost, locatorPort)
+          .setServerGroup("R1").create("R1");
+
+      Region region1 = cache.createClientRegionFactory(ClientRegionShortcut.PROXY).setPoolName("R1")
+          .create("R1");
+
+      // Step 4. Execute the function to put DistributedMemberID into above created replicated
+      // region.
+      Function function = new FireAndForgetFunctionOnAllServers();
+      FunctionService.registerFunction(function);
+
+      PoolImpl pool = (PoolImpl) pool1;
+
+      await().atMost(60, SECONDS)
+          .until(() -> Assert.assertEquals(1, pool.getCurrentServers().size()));
+
+      String regionName = "R1";
+      Execution dataSet = FunctionService.onServers(pool1);
+      dataSet.withArgs(regionName).execute(function);
+
+      // Using Awatility, if the condition is not met during the timeout, a
+      // ConditionTimeoutException will be thrown. This makes analyzing the failure much simpler
+      // Step 5. Assert for the region keyset size with 1.
+      await().atMost(60, SECONDS)
+          .until(() -> Assert.assertEquals(1, region1.keySetOnServer().size()));
+
+      region1.clear();
+
+      // Step 6. Start another server mentioning locator and create a replicated region "R1".
+      server2.invoke("Start BridgeServer",
+          () -> startBridgeServer(new String[] {"R1"}, locString, new String[] {"R1"}));
+
+      // Step 7. Execute the same function to put DistributedMemberID into above created replicated
+      // region.
+      await().atMost(60, SECONDS)
+          .until(() -> Assert.assertEquals(1, pool.getCurrentServers().size()));
+      dataSet = FunctionService.onServers(pool1);
+      dataSet.withArgs(regionName).execute(function);
+
+      await().atMost(60, SECONDS)
+          .until(() -> Assert.assertEquals(2, pool.getCurrentServers().size()));
+
+      // Using Awatility, if the condition is not met during the timeout, a
+      // ConditionTimeoutException will be thrown. This makes analyzing the failure much simpler
+      // Step 8. Assert for the region keyset size with 2, since above function was executed on 2
+      // servers.
+      await().atMost(60, SECONDS).until(() -> {
+        Assert.assertEquals(2, region1.keySetOnServer().size());
+      });
+
+      region1.clear();
+
+      // Step 8.Stop one of the servers.
+      server1.invoke("Stop BridgeServer", () -> stopBridgeMemberVM(server1));
+
+      // Step 9. Execute the same function to put DistributedMemberID into above created replicated
+      // region.
+      dataSet = FunctionService.onServers(pool1);
+      dataSet.withArgs(regionName).execute(function);
+
+      await().atMost(60, SECONDS)
+          .until(() -> Assert.assertEquals(1, pool.getCurrentServers().size()));
+
+      // Using Awatility, if the condition is not met during the timeout, a
+      // ConditionTimeoutException will be thrown. This makes analyzing the failure much simpler
+      // Step 10. Assert for the region keyset size with 1, since only one server was running.
+      await().atMost(60, SECONDS).until(() -> {
+        Assert.assertEquals(1, region1.keySetOnServer().size());
+      });
+
+      region1.clear();
+
+      return null;
+    });
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c6102896/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
index 3b072d6..e4a85b0 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRClientServerRegionFunctionExecutionDUnitTest.java
@@ -143,14 +143,6 @@ public class PRClientServerRegionFunctionExecutionDUnitTest extends PRClientServ
         .serverSingleKeyExecutionOnRegion_SingleConnection());
   }
 
-  @Ignore("Bug47584")
-  @Test
-  public void testServerSingleKeyExecution_Bug43513_OnServer() {
-    createScenario_SingleConnection();
-    client.invoke(() -> PRClientServerRegionFunctionExecutionDUnitTest
-        .serverSingleKeyExecutionOnServer_SingleConnection());
-  }
-
   @Test
   public void testServerSingleKeyExecution_SendException() {
     createScenario();

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c6102896/geode-core/src/test/java/org/apache/geode/internal/cache/functions/FireAndForgetFunctionOnAllServers.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/functions/FireAndForgetFunctionOnAllServers.java b/geode-core/src/test/java/org/apache/geode/internal/cache/functions/FireAndForgetFunctionOnAllServers.java
new file mode 100644
index 0000000..f292f1a
--- /dev/null
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/functions/FireAndForgetFunctionOnAllServers.java
@@ -0,0 +1,73 @@
+/*
+ * 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 org.apache.geode.internal.cache.functions;
+
+import org.apache.geode.LogWriter;
+import org.apache.geode.cache.*;
+import org.apache.geode.cache.execute.Function;
+import org.apache.geode.cache.execute.FunctionContext;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+
+/*
+ * Function for Executing a fire-and-forget function on all servers as opposed to only executing on
+ * the ones the client is currently connected to.
+ */
+public class FireAndForgetFunctionOnAllServers implements Function {
+
+  public static final String ID = FireAndForgetFunctionOnAllServers.class.getName();
+
+  @Override
+  public boolean hasResult() {
+    return false;
+  }
+
+  @Override
+  public void execute(FunctionContext context) {
+    DistributedSystem ds = InternalDistributedSystem.getAnyInstance();
+    LogWriter logger = ds.getLogWriter();
+    Cache cache = CacheFactory.getAnyInstance();
+    String regionName = (String) context.getArguments();
+    Region<String, Integer> region1 = cache.getRegion(regionName);
+    if (region1 == null) {
+      RegionFactory<String, Integer> rf;
+      rf = cache.createRegionFactory(RegionShortcut.REPLICATE);
+      region1 = rf.create(regionName);
+    }
+    region1.put(ds.getDistributedMember().toString(), 1);
+
+    logger.info("Executing FireAndForgetFunctionOnAllServers on Member : "
+        + ds.getDistributedMember() + " with Context : " + context);
+
+    if (!hasResult()) {
+      return;
+    }
+  }
+
+  @Override
+  public String getId() {
+    return FireAndForgetFunctionOnAllServers.ID;
+  }
+
+  @Override
+  public boolean optimizeForWrite() {
+    return false;
+  }
+
+  @Override
+  public boolean isHA() {
+    return false;
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c6102896/geode-core/src/test/java/org/apache/geode/internal/cache/functions/TestFunction.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/functions/TestFunction.java b/geode-core/src/test/java/org/apache/geode/internal/cache/functions/TestFunction.java
index 2a5f51f..438cdd3 100755
--- a/geode-core/src/test/java/org/apache/geode/internal/cache/functions/TestFunction.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/cache/functions/TestFunction.java
@@ -15,8 +15,7 @@
 package org.apache.geode.internal.cache.functions;
 
 import org.apache.geode.LogWriter;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.cache.Region;
+import org.apache.geode.cache.*;
 import org.apache.geode.cache.control.RebalanceFactory;
 import org.apache.geode.cache.control.RebalanceOperation;
 import org.apache.geode.cache.control.RebalanceResults;


[19/31] incubator-geode git commit: GEODE-1931: Fixed serialization issue with Lambda

Posted by ab...@apache.org.
GEODE-1931: Fixed serialization issue with Lambda


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

Branch: refs/heads/feature/GEODE-2156
Commit: be964ef702964c1279d5c9a8c2b9021c00738552
Parents: 6eb62eb
Author: Udo Kohlmeyer <uk...@pivotal.io>
Authored: Thu Dec 1 11:09:30 2016 -0800
Committer: Udo Kohlmeyer <uk...@pivotal.io>
Committed: Thu Dec 1 11:09:30 2016 -0800

----------------------------------------------------------------------
 .../geode/distributed/LocatorDUnitTest.java     | 65 +++++++++++---------
 1 file changed, 36 insertions(+), 29 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/be964ef7/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java b/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
index 9715b73..350f183 100644
--- a/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/distributed/LocatorDUnitTest.java
@@ -97,7 +97,6 @@ import java.util.concurrent.TimeUnit;
 
 /**
  * Tests the ability of the {@link Locator} API to start and stop locators running in remote VMs.
- * 
  * @since GemFire 4.0
  */
 @Category({DistributedTest.class, MembershipTest.class})
@@ -407,7 +406,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
   }
 
   private void startVerifyAndStopLocator(VM loc1, VM loc2, int port1, int port2,
-      Properties properties) {
+                                         Properties properties) {
     try {
       loc2.invoke("startLocator2", () -> startLocatorWithPortAndProperties(port2, properties));
       loc1.invoke("startLocator1", () -> startLocatorWithPortAndProperties(port1, properties));
@@ -633,7 +632,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
     try {
       DistributedSystem sys = locator.getDistributedSystem();
 
-      Object[] connectArgs = new Object[] {properties};
+      Object[] connectArgs = new Object[]{properties};
 
       assertTrue(MembershipManagerHelper.getLeadMember(sys) == null);
 
@@ -683,7 +682,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
   }
 
   private void assertLeadMember(final DistributedMember member, final DistributedSystem sys,
-      long timeout) {
+                                long timeout) {
     Awaitility.waitAtMost(timeout, TimeUnit.MILLISECONDS).pollInterval(200, TimeUnit.MILLISECONDS)
         .until(() -> {
           DistributedMember lead = MembershipManagerHelper.getLeadMember(sys);
@@ -756,7 +755,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
         }
       });
 
-      Object[] connectArgs = new Object[] {properties};
+      Object[] connectArgs = new Object[]{properties};
 
       SerializableRunnable crashLocator = new SerializableRunnable("Crash locator") {
         public void run() {
@@ -886,7 +885,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
         }
       });
 
-      Object[] connectArgs = new Object[] {properties};
+      Object[] connectArgs = new Object[]{properties};
 
       SerializableRunnable crashSystem = new SerializableRunnable("Crash system") {
         public void run() {
@@ -1032,7 +1031,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
         }
       });
 
-      Object[] connectArgs = new Object[] {properties};
+      Object[] connectArgs = new Object[]{properties};
 
       SerializableRunnable crashSystem = new SerializableRunnable("Crash system") {
         public void run() {
@@ -1168,7 +1167,7 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
       DistributedSystem sys = locator.getDistributedSystem();
       sys.getLogWriter().info(
           "<ExpectedException action=add>org.apache.geode.ForcedDisconnectException</ExpectedException>");
-      Object[] connectArgs = new Object[] {properties};
+      Object[] connectArgs = new Object[]{properties};
 
       assertTrue(MembershipManagerHelper.getLeadMember(sys) == null);
 
@@ -1617,9 +1616,9 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
     dsProps.setProperty(MCAST_PORT, "0");
 
     addDSProps(dsProps);
-    vm0.invoke(() -> startLocatorAsync(new Object[] {port1, dsProps}));
-    vm1.invoke(() -> startLocatorAsync(new Object[] {port2, dsProps}));
-    vm2.invoke(() -> startLocatorAsync(new Object[] {port3, dsProps}));
+    vm0.invoke(() -> startLocatorAsync(new Object[]{port1, dsProps}));
+    vm1.invoke(() -> startLocatorAsync(new Object[]{port2, dsProps}));
+    vm2.invoke(() -> startLocatorAsync(new Object[]{port3, dsProps}));
 
     try {
       try {
@@ -1671,11 +1670,11 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
         DistributedMember vm3ID = vm3.invoke(() -> GMSJoinLeaveTestHelper
             .getInternalDistributedSystem().getDM().getDistributionManagerId());
         assertTrue("View is " + system.getDM().getMembershipManager().getView()
-            + " and vm3's ID is " + vm3ID,
+                + " and vm3's ID is " + vm3ID,
             vm3.invoke(() -> GMSJoinLeaveTestHelper.isViewCreator()));
 
-        vm1.invoke(() -> startLocatorAsync(new Object[] {port2, dsProps}));
-        vm2.invoke(() -> startLocatorAsync(new Object[] {port3, dsProps}));
+        vm1.invoke(() -> startLocatorAsync(new Object[]{port2, dsProps}));
+        vm2.invoke(() -> startLocatorAsync(new Object[]{port3, dsProps}));
 
         Awaitility.waitAtMost(30000, TimeUnit.MILLISECONDS).pollInterval(200, TimeUnit.MILLISECONDS)
             .until(() -> {
@@ -1857,13 +1856,13 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
 
       Awaitility.waitAtMost(WAIT2_MS, TimeUnit.MILLISECONDS)
           .pollInterval(200, TimeUnit.MILLISECONDS).until(() -> {
-            try {
-              return system.getDM().getViewMembers().size() == 5;
-            } catch (Exception e) {
-              org.apache.geode.test.dunit.Assert.fail("unexpected exception", e);
-            }
-            return false; // NOTREACHED
-          });
+        try {
+          return system.getDM().getViewMembers().size() == 5;
+        } catch (Exception e) {
+          org.apache.geode.test.dunit.Assert.fail("unexpected exception", e);
+        }
+        return false; // NOTREACHED
+      });
       system.disconnect();
 
       vm1.invoke(() -> disconnectDistributedSystem());
@@ -1953,7 +1952,6 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
 
   /**
    * Tests starting, stopping, and restarting a locator. See bug 32856.
-   * 
    * @since GemFire 4.1
    */
   @Test
@@ -1977,7 +1975,10 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
     Locator locator = Locator.startLocatorAndDS(port1, logFile, p);
     try {
 
-      vm0.invoke(() -> DistributedSystem.connect(p));
+      vm0.invoke(() -> {
+        DistributedSystem.connect(p);
+        return null;
+      });
 
       LogWriterUtils.getLogWriter().info("Stopping locator");
       locator.stop();
@@ -1985,7 +1986,10 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
       LogWriterUtils.getLogWriter().info("Starting locator");
       locator = Locator.startLocatorAndDS(port1, logFile, p);
 
-      vm0.invoke("disconnect", () -> DistributedSystem.connect(p).disconnect());
+      vm0.invoke("disconnect", () -> {
+        DistributedSystem.connect(p).disconnect();
+        return null;
+      });
 
     } finally {
       locator.stop();
@@ -2084,7 +2088,8 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
     }
 
     @Override
-    public void afterMembershipFailure(String reason, Throwable cause) {}
+    public void afterMembershipFailure(String reason, Throwable cause) {
+    }
 
     public void reset() {
       unboundedWait = false;
@@ -2097,17 +2102,19 @@ public class LocatorDUnitTest extends JUnit4DistributedTestCase {
     boolean quorumLostInvoked;
     List<String> suspectReasons = new ArrayList<>(50);
 
-    public void memberJoined(InternalDistributedMember id) {}
+    public void memberJoined(InternalDistributedMember id) {
+    }
 
-    public void memberDeparted(InternalDistributedMember id, boolean crashed) {}
+    public void memberDeparted(InternalDistributedMember id, boolean crashed) {
+    }
 
     public void memberSuspect(InternalDistributedMember id, InternalDistributedMember whoSuspected,
-        String reason) {
+                              String reason) {
       suspectReasons.add(reason);
     }
 
     public void quorumLost(Set<InternalDistributedMember> failures,
-        List<InternalDistributedMember> remaining) {
+                           List<InternalDistributedMember> remaining) {
       quorumLostInvoked = true;
       org.apache.geode.test.dunit.LogWriterUtils.getLogWriter()
           .info("quorumLost invoked in test code");


[09/31] incubator-geode git commit: Docs: Remove / convert some mentions of GemFire - Cluster config tutorial and Managing a Remote Cluster

Posted by ab...@apache.org.
Docs: Remove / convert some mentions of GemFire -  Cluster config tutorial and Managing a Remote Cluster


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

Branch: refs/heads/feature/GEODE-2156
Commit: 4b0544c61fe369c9c065cfe0a92d8908de274241
Parents: 890e6c7
Author: Dave Barnes <db...@pivotal.io>
Authored: Wed Nov 30 13:52:00 2016 -0800
Committer: Dave Barnes <db...@pivotal.io>
Committed: Wed Nov 30 16:42:41 2016 -0800

----------------------------------------------------------------------
 .../cluster_config/gfsh_remote.html.md.erb      |  10 +-
 .../persisting_configurations.html.md.erb       | 149 ++++++++++---------
 2 files changed, 81 insertions(+), 78 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4b0544c6/geode-docs/configuring/cluster_config/gfsh_remote.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/configuring/cluster_config/gfsh_remote.html.md.erb b/geode-docs/configuring/cluster_config/gfsh_remote.html.md.erb
index a1fab41..6adb6e7 100644
--- a/geode-docs/configuring/cluster_config/gfsh_remote.html.md.erb
+++ b/geode-docs/configuring/cluster_config/gfsh_remote.html.md.erb
@@ -21,10 +21,10 @@ limitations under the License.
 
 You can connect `gfsh` via HTTP or HTTPS to a remote cluster and manage the cluster using `gfsh` commands.
 
-To connect `gfsh` using the HTTP protocol to a remote GemFire cluster:
+To connect `gfsh` using the HTTP protocol to a remote cluster:
 
 1.  Launch `gfsh`. See [Starting gfsh](../../tools_modules/gfsh/starting_gfsh.html#concept_DB959734350B488BBFF91A120890FE61).
-2.  When starting the remote cluster on the remote host, you can optionally specify `--http-bind-address` and `--http-service-port` as GemFire properties when starting up your JMX manager (server or locator). These properties can be then used in the URL used when connecting from your local system to the HTTP service in the remote cluster. For example:
+2.  When starting the remote cluster on the remote host, you can optionally specify `--http-bind-address` and `--http-service-port` as Geode properties when starting up your JMX manager (server or locator). These properties can be then used in the URL used when connecting from your local system to the HTTP service in the remote cluster. For example:
 
     ``` pre
     gfsh>start server --name=server1 --J=-Dgemfire.jmx-manager=true \
@@ -32,14 +32,14 @@ To connect `gfsh` using the HTTP protocol to a remote GemFire cluster:
     --http-service-bind-address=myremotecluster.example.com
     ```
 
-    This command must be executed directly on the host machine that will ultimately act as the remote GemFire server that hosts the HTTP service for remote administration. (You cannot launch a GemFire server remotely.)
+    This command must be executed directly on the host machine that will ultimately act as the remote server that hosts the HTTP service for remote administration. (You cannot launch a server remotely.)
 
 3.  On your local system, run the `gfsh connect` command to connect to the remote system. Include the `--use-http` and `--url` parameters. For example:
 
     ``` pre
-    gfsh>connect --use-http=true --url="http://myremotecluster.example.com:8080/gemfire/v1"
+    gfsh>connect --use-http=true --url="http://myremotecluster.example.com:8080/geode/v1"
 
-    Successfully connected to: GemFire Manager's HTTP service @ http://myremotecluster.example.com:8080/gemfire/v1
+    Successfully connected to: Geode Manager's HTTP service @ http://myremotecluster.example.com:8080/geode/v1
     ```
 
     See [connect](../../tools_modules/gfsh/command-pages/connect.html).

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4b0544c6/geode-docs/configuring/cluster_config/persisting_configurations.html.md.erb
----------------------------------------------------------------------
diff --git a/geode-docs/configuring/cluster_config/persisting_configurations.html.md.erb b/geode-docs/configuring/cluster_config/persisting_configurations.html.md.erb
index d6aadbc..372ea5b 100644
--- a/geode-docs/configuring/cluster_config/persisting_configurations.html.md.erb
+++ b/geode-docs/configuring/cluster_config/persisting_configurations.html.md.erb
@@ -25,7 +25,7 @@ The `gfsh` command-line tool allows you to configure and start a Geode cluster.
 
 This section provides a walk-through example of configuring a simple Apache Geode cluster and then re-using that configuration in a new context.
 
-1.  Create a working directory (For example:`/home/username/my_gemfire`) and switch to the new directory. This directory will contain the configurations for your cluster.
+1.  Create a working directory (For example:`/home/username/my_geode`) and switch to the new directory. This directory will contain the configurations for your cluster.
 
 2.  Start the `gfsh` command-line tool. For example:
 
@@ -51,20 +51,20 @@ This section provides a walk-through example of configuring a simple Apache Geod
 
     ``` pre
     gfsh>start locator --name=locator1
-    Starting a GemFire Locator in /Users/username/my_gemfire/locator1...
+    Starting a Geode Locator in /Users/username/my_geode/locator1...
     .............................
-    Locator in /Users/username/my_gemfire/locator1 on 192.0.2.0[10334] as locator1 is currently online.
+    Locator in /Users/username/my_geode/locator1 on 192.0.2.0[10334] as locator1 is currently online.
     Process ID: 5203
     Uptime: 15 seconds
-    GemFire Version: 8.1.0
-    Java Version: 1.7.0_71
-    Log File: /Users/username/my_gemfire/locator1/locator1.log
+    Geode Version: 1.0.0
+    Java Version: 1.8.0_101
+    Log File: /Users/username/my_geode/locator1/locator1.log
     JVM Arguments: -Dgemfire.enable-cluster-configuration=true
     -Dgemfire.load-cluster-configuration-from-dir=false
     -Dgemfire.launcher.registerSignalHandlers=true -Djava.awt.headless=true
     -Dsun.rmi.dgc.server.gcInterval=9223372036854775806
-    Class-Path: /Users/username/Pivotal_GemFire_810_b50582_Linux/lib/gemfire.jar
-    :/Users/username/Pivotal_GemFire_810_b50582_Linux/lib/locator-dependencies.jar
+    Class-Path: /Users/username/Apache_Geode_1.0.0_Linux/lib/geode-dependencies.jar
+    :/Users/username/Apache_Geode_1.0.0_Linux/lib/locator-dependencies.jar
 
     Successfully connected to: [host=192.0.2.0, port=1099]
 
@@ -77,52 +77,52 @@ This section provides a walk-through example of configuring a simple Apache Geod
 
     ``` pre
     gfsh>start server --name=server1 --group=group1
-    Starting a GemFire Server in /Users/username/my_gemfire/server1...
+    Starting a Geode Server in /Users/username/my_geode/server1...
     .....
-    Server in /Users/username/my_gemfire/server1 on 192.0.2.0[40404] as server1 is currently online.
+    Server in /Users/username/my_geode/server1 on 192.0.2.0[40404] as server1 is currently online.
     Process ID: 5627
     Uptime: 2 seconds
-    GemFire Version: 8.1.0
-    Java Version: 1.7.0_71
-    Log File: /Users/username/my_gemfire/server1/server1.log
+    Geode Version: 1.0.0
+    Java Version: 1.8.0_101
+    Log File: /Users/username/my_geode/server1/server1.log
     JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10334] -Dgemfire.groups=group1
     -Dgemfire.use-cluster-configuration=true -XX:OnOutOfMemoryError=kill -KILL %p
     -Dgemfire.launcher.registerSignalHandlers=true -Djava.awt.headless=true
     -Dsun.rmi.dgc.server.gcInterval=9223372036854775806
-    Class-Path: /Users/username/Pivotal_GemFire_810_b50582_Linux/lib/gemfire.jar
-    :/Users/username/Pivotal_GemFire_810_b50582_Linux/lib/server-dependencies.jar
+    Class-Path: /Users/username/Apache_Geode_1.0.0_Linux/lib/geode-dependencies.jar
+    :/Users/username/Apache_Geode_1.0.0_Linux/lib/server-dependencies.jar
 
     gfsh>start server --name=server2 --group=group1 --server-port=40405
-    Starting a GemFire Server in /Users/username/my_gemfire/server2...
+    Starting a Geode Server in /Users/username/my_geode/server2...
     .....
-    Server in /Users/username/my_gemfire/server2 on 192.0.2.0[40405] as server2 is currently online.
+    Server in /Users/username/my_geode/server2 on 192.0.2.0[40405] as server2 is currently online.
     Process ID: 5634
     Uptime: 2 seconds
-    GemFire Version: 8.1.0
-    Java Version: 1.7.0_71
-    Log File: /Users/username/my_gemfire/server2/server2.log
+    Geode Version: 1.0.0
+    Java Version: 1.8.0_101
+    Log File: /Users/username/my_geode/server2/server2.log
     JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10334] -Dgemfire.groups=group1
     -Dgemfire.use-cluster-configuration=true -XX:OnOutOfMemoryError=kill -KILL %p
     -Dgemfire.launcher.registerSignalHandlers=true -Djava.awt.headless=true
     -Dsun.rmi.dgc.server.gcInterval=9223372036854775806
-    Class-Path: /Users/username/Pivotal_GemFire_810_b50582_Linux/lib/gemfire.jar
-    :/Users/username/Pivotal_GemFire_810_b50582_Linux/lib/server-dependencies.jar
+    Class-Path: /Users/username/Apache_Geode_1.0.0_Linux/lib/geode-dependencies.jar
+    :/Users/username/Apache_Geode_1.0.0_Linux/lib/server-dependencies.jar
 
     gfsh>start server --name=server3 --server-port=40406
-    Starting a GemFire Server in /Users/username/my_gemfire/server3...
+    Starting a Geode Server in /Users/username/my_geode/server3...
     .....
-    Server in /Users/username/my_gemfire/server3 on 192.0.2.0[40406] as server3 is currently online.
+    Server in /Users/username/my_geode/server3 on 192.0.2.0[40406] as server3 is currently online.
     Process ID: 5637
     Uptime: 2 seconds
-    GemFire Version: 8.1.0
-    Java Version: 1.7.0_71
-    Log File: /Users/username/my_gemfire/server3/server3.log
+    Geode Version: 1.0.0
+    Java Version: 1.8.0_101
+    Log File: /Users/username/my_geode/server3/server3.log
     JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10334]
     -Dgemfire.use-cluster-configuration=true -XX:OnOutOfMemoryError=kill -KILL %p
     -Dgemfire.launcher.registerSignalHandlers=true -Djava.awt.headless=true
     -Dsun.rmi.dgc.server.gcInterval=9223372036854775806
-    Class-Path: /Users/username/Pivotal_GemFire_810_b50582_Linux/lib/gemfire.jar
-    :/Users/username/Pivotal_GemFire_810_b50582_Linux/lib/server-dependencies.jar
+    Class-Path: /Users/username/Apache_Geode_1.0.0_Linux/lib/geode-dependencies.jar
+    :/Users/username/Apache_Geode_1.0.0_Linux/lib/server-dependencies.jar
     ```
 
     Note that the `gfsh` commands you used to start `server1` and `server2` specify a group named `group1` while the command for `server3` did not specify a group name.
@@ -146,26 +146,26 @@ This section provides a walk-through example of configuring a simple Apache Geod
 
     Note that `region1` is created on all cache servers that specified the group named `group1` when starting the cache server (`server1` and `server2`, in this example). `region2` is created on all members because no group was specified.
 
-6.  Deploy jar files. Use the `gfsh deploy` command to deploy application jar files to all members or to a specified group of members. The following example deploys the `mail.jar` and `mx4j.jar` files from the distribution. (Note: This is only an example, you do not need to deploy these files to use the Cluster Configuration Service. Alternately, you can use any two jar files for this demonstration.)
+6.  Deploy jar files. Use the `gfsh deploy` command to deploy application jar files to all members or to a specified group of members. The following example deploys the `mx4j-3.0.1.jar` and `mx4j.jar` files from the distribution. (Note: This is only an example, you do not need to deploy these files to use the Cluster Configuration Service. Alternately, you can use any two jar files for this demonstration.)
 
     ``` pre
-    gfsh>deploy --group=group1 --jar=${SYS_GEMFIRE_DIR}/lib/mail.jar
-    Post substitution: deploy --group=group1 --jar=/Users/username/Pivotal_GemFire_810_b50582_Linux/lib/mail.jar
+    gfsh>deploy --group=group1 --jar=/lib/mail.jar
+    Post substitution: deploy --group=group1 --jar=/Users/username/Apache_Geode_1.0.0_Linux/lib/mx4j-3.0.1.jar
+    Member  |    Deployed JAR    | Deployed JAR Location
+    ------- | ------------------ | -------------------------------------------------------
+    server1 | mx4j-3.0.1.jar     | /Users/username/my_geode/server1/vf.gf#mx4j-3.0.1.jar#1
+    server2 | mx4j-3.0.1.jar     | /Users/username/my_geode/server2/vf.gf#mx4j-3.0.1.jar#1
+
+    gfsh>deploy --jar=/lib/mx4j.jar
+    Post substitution: deploy --jar=/Users/username/Apache_Geode_1.0.0_Linux/lib/ra.jar
     Member  | Deployed JAR | Deployed JAR Location
-    ------- | ------------ | -------------------------------------------------
-    server1 | mail.jar     | /Users/username/my_gemfire/server1/vf.gf#mail.jar#1
-    server2 | mail.jar     | /Users/username/my_gemfire/server2/vf.gf#mail.jar#1
-
-    gfsh>deploy --jar=${SYS_GEMFIRE_DIR}/lib/mx4j.jar
-    Post substitution: deploy --jar=/Users/username/Pivotal_GemFire_810_b50582_Linux/lib/mx4j.jar
-    Member  | Deployed JAR | Deployed JAR Location
-    ------- | ------------ | -------------------------------------------------
-    server1 | mx4j.jar     | /Users/username/my_gemfire/server1/vf.gf#mx4j.jar#1
-    server2 | mx4j.jar     | /Users/username/my_gemfire/server2/vf.gf#mx4j.jar#1
-    server3 | mx4j.jar     | /Users/username/my_gemfire/server3/vf.gf#mx4j.jar#1
+    ------- | ------------ | -----------------------------------------------
+    server1 | ra.jar       | /Users/username/my_geode/server1/vf.gf#ra.jar#1
+    server2 | ra.jar       | /Users/username/my_geode/server1/vf.gf#ra.jar#1
+    server3 | ra.jar       | /Users/username/my_geode/server1/vf.gf#ra.jar#1
     ```
 
-    Note that the `mail.jar` file was deployed only to the members of `group1` and the `mx4j.jar` was deployed to all members.
+    Note that the `mx4j-3.0.1.jar` file was deployed only to the members of `group1` and the `ra.jar` was deployed to all members.
 
 7.  Export the cluster configuration.
     You can use the `gfsh export cluster-configuration` command to create a zip file that contains the cluster's persisted configuration. The zip file contains a copy of the contents of the `cluster_config` directory. For example:
@@ -202,7 +202,7 @@ This section provides a walk-through example of configuring a simple Apache Geod
     Exiting...
     ```
 
-10. Create a new working directory (for example: `new_gemfire`) and switch to the new directory.
+10. Create a new working directory (for example: `new_geode`) and switch to the new directory.
 11. Start the `gfsh` command shell:
 
     ``` pre
@@ -213,20 +213,20 @@ This section provides a walk-through example of configuring a simple Apache Geod
 
     ``` pre
     gfsh>start locator --name=locator2 --port=10335
-    Starting a GemFire Locator in /Users/username/new_gemfire/locator2...
+    Starting a Geode Locator in /Users/username/new_geode/locator2...
     .............................
-    Locator in /Users/username/new_gemfire/locator2 on 192.0.2.0[10335] as locator2 is currently online.
+    Locator in /Users/username/new_geode/locator2 on 192.0.2.0[10335] as locator2 is currently online.
     Process ID: 5749
     Uptime: 15 seconds
-    GemFire Version: 8.1.0
-    Java Version: 1.7.0_71
-    Log File: /Users/username/new_gemfire/locator2/locator2.log
+    Geode Version: 1.0.0
+    Java Version: 1.8.0_101
+    Log File: /Users/username/new_geode/locator2/locator2.log
     JVM Arguments: -Dgemfire.enable-cluster-configuration=true
     -Dgemfire.load-cluster-configuration-from-dir=false
     -Dgemfire.launcher.registerSignalHandlers=true -Djava.awt.headless=true
     -Dsun.rmi.dgc.server.gcInterval=9223372036854775806
-    Class-Path: /Users/username/Pivotal_GemFire_810_b50582_Linux/lib/gemfire.jar
-    :/Users/username/Pivotal_GemFire_810_b50582_Linux/lib/locator-dependencies.jar
+    Class-Path: /Users/username/Apache_Geode_1.0.0_Linux/lib/geode-dependencies.jar
+    :/Users/username/Apache_Geode_1.0.0_Linux/lib/locator-dependencies.jar
 
     Successfully connected to: [host=192.0.2.0, port=1099]
 
@@ -246,40 +246,40 @@ This section provides a walk-through example of configuring a simple Apache Geod
 
     ``` pre
     gfsh>start server --name=server4 --server-port=40414
-    Starting a GemFire Server in /Users/username/new_gemfire/server4...
+    Starting a Geode Server in /Users/username/new_geode/server4...
     ........
-    Server in /Users/username/new_gemfire/server4 on 192.0.2.0[40414] as server4 is currently online.
+    Server in /Users/username/new_geode/server4 on 192.0.2.0[40414] as server4 is currently online.
     Process ID: 5813
     Uptime: 4 seconds
-    GemFire Version: 8.1.0
-    Java Version: 1.7.0_71
-    Log File: /Users/username/new_gemfire/server4/server4.log
+    Geode Version: 1.0.0
+    Java Version: 1.8.0_101
+    Log File: /Users/username/new_geode/server4/server4.log
     JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10335]
     -Dgemfire.use-cluster-configuration=true -XX:OnOutOfMemoryError=kill -KILL %p
     -Dgemfire.launcher.registerSignalHandlers=true -Djava.awt.headless=true
     -Dsun.rmi.dgc.server.gcInterval=9223372036854775806
-    Class-Path: /Users/username/Pivotal_GemFire_810_b50582_Linux/lib/gemfire.jar
-    :/Users/username/Pivotal_GemFire_810_b50582_Linux/lib/server-dependencies.jar
+    Class-Path: /Users/username/Apache_Geode_1.0.0_Linux/lib/geode-dependencies.jar
+    :/Users/username/Apache_Geode_1.0.0_Linux/lib/server-dependencies.jar
     ```
 
 15. Start another server that references `group1`:
 
     ``` pre
     gfsh>start server --name=server5 --group=group1 --server-port=40415
-    Starting a GemFire Server in /Users/username/new_gemfire/server5...
+    Starting a Geode Server in /Users/username/new_geode/server5...
     .....
-    Server in /Users/username/new_gemfire/server2 on 192.0.2.0[40415] as server5 is currently online.
+    Server in /Users/username/new_geode/server2 on 192.0.2.0[40415] as server5 is currently online.
     Process ID: 5954
     Uptime: 2 seconds
-    GemFire Version: 8.1.0
-    Java Version: 1.7.0_71
-    Log File: /Users/username/new_gemfire/server5/server5.log
+    Geode Version: 1.0.0
+    Java Version: 1.8.0_101
+    Log File: /Users/username/new_geode/server5/server5.log
     JVM Arguments: -Dgemfire.default.locators=192.0.2.0[10335] -Dgemfire.groups=group1
     -Dgemfire.use-cluster-configuration=true -XX:OnOutOfMemoryError=kill -KILL %p
     -Dgemfire.launcher.registerSignalHandlers=true -Djava.awt.headless=true
     -Dsun.rmi.dgc.server.gcInterval=9223372036854775806
-    Class-Path: /Users/username/Pivotal_GemFire_810_b50582_Linux/lib/gemfire.jar
-    :/Users/username/Pivotal_GemFire_810_b50582_Linux/lib/server-dependencies.jar
+    Class-Path: /Users/username/Apache_Geode_1.0.0_Linux/lib/geode-dependencies.jar
+    :/Users/username/Apache_Geode_1.0.0_Linux/lib/server-dependencies.jar
     ```
 
 16. Use the `list regions` command to display the configured regions. Note that region1 and region2, which were configured in the original cluster level are available.
@@ -303,10 +303,11 @@ This section provides a walk-through example of configuring a simple Apache Geod
 
     Non-Default Attributes Shared By Hosting Members
 
-     Type  | Name | Value
-    ------ | ---- | -----
-    Region | size | 0
-
+     Type  |    Name     | Value
+    ------ | ----------- | ---------------
+    Region | data-policy | REPLICATE
+           | size        | 0
+           | scope       | distributed-ack
 
     gfsh>describe region --name=region2
     ..........................................................
@@ -317,9 +318,11 @@ This section provides a walk-through example of configuring a simple Apache Geod
 
     Non-Default Attributes Shared By Hosting Members
 
-     Type  | Name | Value
-    ------ | ---- | -----
-    Region | size | 0
+     Type  |    Name     | Value
+    ------ | ----------- | ---------------
+    Region | data-policy | REPLICATE
+           | size        | 0
+           | scope       | distributed-ack
     ```
 
     This new cluster uses the same configuration as the original system. You can start any number of servers using this cluster configuration. All servers will receive the cluster-level configuration. Servers that specify `group1` also receive the `group1` configuration.


[25/31] incubator-geode git commit: GEODE-2141: Replace use of List with ConcurrentHashSet for storing various stats and listener. Moved methods stopNotifier_IfEnabledAndRunning and startNotifier_IfEnabledAndNotRunning in synchronized block.

Posted by ab...@apache.org.
GEODE-2141: Replace use of List with ConcurrentHashSet for storing various stats and listener.
Moved methods stopNotifier_IfEnabledAndRunning and startNotifier_IfEnabledAndNotRunning in synchronized
block.

GEODE-2141: Addresing the review comments.

GEODE-2141: Addressing Review Comments
Making addMonitor and remoteMonitor threadsafe.


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

Branch: refs/heads/feature/GEODE-2156
Commit: 50320dc4e828c900b6e1ee92c909fa019cae26d0
Parents: c610289
Author: adongre <av...@ampool.io>
Authored: Sun Nov 27 19:41:48 2016 +0530
Committer: adongre <av...@ampool.io>
Committed: Fri Dec 2 06:48:35 2016 +0530

----------------------------------------------------------------------
 .../internal/statistics/StatMonitorHandler.java | 34 +++++--------
 .../internal/statistics/StatisticsMonitor.java  | 51 +++++++-------------
 2 files changed, 29 insertions(+), 56 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/50320dc4/geode-core/src/main/java/org/apache/geode/internal/statistics/StatMonitorHandler.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatMonitorHandler.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatMonitorHandler.java
index 0c9583e..170ba49 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatMonitorHandler.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatMonitorHandler.java
@@ -16,12 +16,11 @@ package org.apache.geode.internal.statistics;
 
 import org.apache.geode.SystemFailure;
 import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.internal.concurrent.ConcurrentHashSet;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.geode.internal.logging.log4j.LogMarker;
 import org.apache.logging.log4j.Logger;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.SynchronousQueue;
 
@@ -38,7 +37,8 @@ public class StatMonitorHandler implements SampleHandler {
   private final boolean enableMonitorThread;
 
   /** The registered monitors */
-  private volatile List<StatisticsMonitor> monitors = Collections.<StatisticsMonitor>emptyList();
+  private final ConcurrentHashSet<StatisticsMonitor> monitors =
+      new ConcurrentHashSet<StatisticsMonitor>();
 
   /** Protected by synchronization on this handler instance */
   private volatile StatMonitorNotifier notifier;
@@ -52,11 +52,8 @@ public class StatMonitorHandler implements SampleHandler {
   public boolean addMonitor(StatisticsMonitor monitor) {
     synchronized (this) {
       boolean added = false;
-      List<StatisticsMonitor> oldMonitors = this.monitors;
-      if (!oldMonitors.contains(monitor)) {
-        List<StatisticsMonitor> newMonitors = new ArrayList<StatisticsMonitor>(oldMonitors);
-        added = newMonitors.add(monitor);
-        this.monitors = Collections.unmodifiableList(newMonitors);
+      if (!this.monitors.contains(monitor)) {
+        added = this.monitors.add(monitor);
       }
       if (!this.monitors.isEmpty()) {
         startNotifier_IfEnabledAndNotRunning();
@@ -69,11 +66,8 @@ public class StatMonitorHandler implements SampleHandler {
   public boolean removeMonitor(StatisticsMonitor monitor) {
     synchronized (this) {
       boolean removed = false;
-      List<StatisticsMonitor> oldMonitors = this.monitors;
-      if (oldMonitors.contains(monitor)) {
-        List<StatisticsMonitor> newMonitors = new ArrayList<StatisticsMonitor>(oldMonitors);
-        removed = newMonitors.remove(monitor);
-        this.monitors = Collections.unmodifiableList(newMonitors);
+      if (this.monitors.contains(monitor)) {
+        removed = this.monitors.remove(monitor);
       }
       if (this.monitors.isEmpty()) {
         stopNotifier_IfEnabledAndRunning();
@@ -110,8 +104,7 @@ public class StatMonitorHandler implements SampleHandler {
   }
 
   private void monitor(final long sampleTimeMillis, final List<ResourceInstance> resourceInstance) {
-    List<StatisticsMonitor> currentMonitors = StatMonitorHandler.this.monitors;
-    for (StatisticsMonitor monitor : currentMonitors) {
+    for (StatisticsMonitor monitor : StatMonitorHandler.this.monitors) {
       try {
         monitor.monitor(sampleTimeMillis, resourceInstance);
       } catch (VirtualMachineError e) {
@@ -138,15 +131,13 @@ public class StatMonitorHandler implements SampleHandler {
   public void destroyedResourceInstance(ResourceInstance resourceInstance) {}
 
   /** For testing only */
-  List<StatisticsMonitor> getMonitorsSnapshot() {
-    return Collections.unmodifiableList(this.monitors);
+  ConcurrentHashSet<StatisticsMonitor> getMonitorsSnapshot() {
+    return this.monitors;
   }
 
   /** For testing only */
   StatMonitorNotifier getStatMonitorNotifier() {
-    synchronized (this) {
-      return this.notifier;
-    }
+    return this.notifier;
   }
 
   private void startNotifier_IfEnabledAndNotRunning() {
@@ -228,8 +219,7 @@ public class StatMonitorHandler implements SampleHandler {
             }
           }
           if (working && latestTask != null) {
-            List<StatisticsMonitor> currentMonitors = StatMonitorHandler.this.monitors;
-            for (StatisticsMonitor monitor : currentMonitors) {
+            for (StatisticsMonitor monitor : StatMonitorHandler.this.monitors) {
               try {
                 monitor.monitor(latestTask.getSampleTimeMillis(),
                     latestTask.getResourceInstances());

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/50320dc4/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsMonitor.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsMonitor.java b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsMonitor.java
index 0e53557..16f71e2 100755
--- a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsMonitor.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatisticsMonitor.java
@@ -14,8 +14,8 @@
  */
 package org.apache.geode.internal.statistics;
 
-import java.util.ArrayList;
-import java.util.Collections;
+import org.apache.geode.internal.concurrent.ConcurrentHashSet;
+
 import java.util.List;
 
 /**
@@ -29,9 +29,10 @@ public abstract class StatisticsMonitor {
 
   private final Object mutex = new Object();
 
-  private volatile List<StatisticsListener> listeners = Collections.<StatisticsListener>emptyList();
+  private final ConcurrentHashSet<StatisticsListener> listeners =
+      new ConcurrentHashSet<StatisticsListener>();
 
-  private volatile List<StatisticId> statisticIds = Collections.<StatisticId>emptyList();
+  private final ConcurrentHashSet<StatisticId> statisticIds = new ConcurrentHashSet<StatisticId>();
 
   public StatisticsMonitor() {}
 
@@ -39,13 +40,8 @@ public abstract class StatisticsMonitor {
     if (statId == null) {
       throw new NullPointerException("StatisticId is null");
     }
-    synchronized (this.mutex) {
-      List<StatisticId> oldStatisticIds = this.statisticIds;
-      if (!oldStatisticIds.contains(statId)) {
-        List<StatisticId> newStatisticIds = new ArrayList<StatisticId>(oldStatisticIds);
-        newStatisticIds.add(statId);
-        this.statisticIds = Collections.unmodifiableList(newStatisticIds);
-      }
+    if (!this.statisticIds.contains(statId)) {
+      this.statisticIds.add(statId);
     }
     return this;
   }
@@ -54,13 +50,8 @@ public abstract class StatisticsMonitor {
     if (statId == null) {
       throw new NullPointerException("StatisticId is null");
     }
-    synchronized (this.mutex) {
-      List<StatisticId> oldStatisticIds = this.statisticIds;
-      if (oldStatisticIds.contains(statId)) {
-        List<StatisticId> newStatisticIds = new ArrayList<StatisticId>(oldStatisticIds);
-        newStatisticIds.remove(statId);
-        this.statisticIds = Collections.unmodifiableList(newStatisticIds);
-      }
+    if (this.statisticIds.contains(statId)) {
+      this.statisticIds.remove(statId);
     }
     return this;
   }
@@ -70,11 +61,8 @@ public abstract class StatisticsMonitor {
       throw new NullPointerException("StatisticsListener is null");
     }
     synchronized (this.mutex) {
-      List<StatisticsListener> oldListeners = this.listeners;
-      if (!oldListeners.contains(listener)) {
-        List<StatisticsListener> newListeners = new ArrayList<StatisticsListener>(oldListeners);
-        newListeners.add(listener);
-        this.listeners = Collections.unmodifiableList(newListeners);
+      if (!this.listeners.contains(listener)) {
+        this.listeners.add(listener);
         getStatMonitorHandler().addMonitor(this);
       }
     }
@@ -85,18 +73,15 @@ public abstract class StatisticsMonitor {
       throw new NullPointerException("StatisticsListener is null");
     }
     synchronized (this.mutex) {
-      List<StatisticsListener> oldListeners = this.listeners;
-      if (oldListeners.contains(listener)) {
-        List<StatisticsListener> newListeners = new ArrayList<StatisticsListener>(oldListeners);
-        newListeners.remove(listener);
-        if (newListeners.isEmpty()) {
+      if (this.listeners.contains(listener)) {
+        this.listeners.remove(listener);
+        if (this.listeners.isEmpty()) {
           try {
             getStatMonitorHandler().removeMonitor(this);
           } catch (IllegalStateException ignore) {
             // sample collector and handlers were closed (ok on removal)
           }
         }
-        this.listeners = Collections.unmodifiableList(newListeners);
       }
     }
   }
@@ -114,15 +99,13 @@ public abstract class StatisticsMonitor {
 
   private final void monitorStatisticIds(long millisTimeStamp,
       List<ResourceInstance> resourceInstances) {
-    List<StatisticId> statisticIdsToMonitor = statisticIds;
-    if (!statisticIdsToMonitor.isEmpty()) {
+    if (!this.statisticIds.isEmpty()) {
       // TODO:
     }
   }
 
   protected final void notifyListeners(StatisticsNotification notification) {
-    List<StatisticsListener> listenersToNotify = this.listeners;
-    for (StatisticsListener listener : listenersToNotify) {
+    for (StatisticsListener listener : this.listeners) {
       listener.handleNotification(notification);
     }
   }
@@ -136,7 +119,7 @@ public abstract class StatisticsMonitor {
   }
 
   /** For testing only */
-  List<StatisticsListener> getStatisticsListenersSnapshot() {
+  ConcurrentHashSet<StatisticsListener> getStatisticsListenersSnapshot() {
     return this.listeners;
   }