[incubator-geode] Git Push Summary

[udo]

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-1874 [deleted] c330e5e56

[3/6] incubator-geode git commit: GEODE-1874: Changed setNextNeighbor to not create HashMap for every p2p invocation

[udo]

GEODE-1874: Changed setNextNeighbor to not create HashMap for every p2p 
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/b3d32850
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/b3d32850
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/b3d32850

Branch: refs/heads/develop
Commit: b3d3285088c1c3950ba9c8e638e02ca8b852bd01
Parents: 3046ea8
Author: Udo Kohlmeyer <ukohlme...@pivotal.io>
Authored: Wed Oct 12 11:54:33 2016 +1100
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Nov 8 07:09:19 2016 +1100

--
 .../membership/gms/fd/GMSHealthMonitor.java | 445 ++-
 1 file changed, 224 insertions(+), 221 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b3d32850/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
index f3319ac..97a413c 100644
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
@@ -1,22 +1,22 @@
 /*
- * 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
+ * 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
+ *  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.
+ * 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.distributed.internal.membership.gms.fd;
 
-import static 
org.apache.geode.internal.DataSerializableFixedID.HEARTBEAT_REQUEST;
-import static 
org.apache.geode.internal.DataSerializableFixedID.HEARTBEAT_RESPONSE;
-import static 
org.apache.geode.internal.DataSerializableFixedID.SUSPECT_MEMBERS_MESSAGE;
+import static org.apache.geode.internal.DataSerializableFixedID.*;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -27,7 +27,19 @@ import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketTimeoutException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Timer;
+import java.util.TimerTask;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutorService;
@@ -38,7 +50,7 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.*;
+import java.util.stream.Collectors;
 
 import org.apache.logging.log4j.Logger;
 import org.jgroups.util.UUID;
@@ -67,23 +79,25 @@ import 
org.apache.geode.internal.security.SecurableCommunicationChannel;
 
 /**
  * Failure Detection
- * 
- * This class make sure that each member is alive and communicating to th

[4/6] incubator-geode git commit: GEODE-1874: Changed setNextNeighbor to not create HashMap for every p2p invocation

[udo]

GEODE-1874: Changed setNextNeighbor to not create HashMap for every p2p 
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/5b0c5650
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/5b0c5650
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/5b0c5650

Branch: refs/heads/develop
Commit: 5b0c56504080f19064e677d79aecf880cd80d091
Parents: b3d3285
Author: Udo Kohlmeyer <ukohlme...@pivotal.io>
Authored: Thu Oct 13 10:46:44 2016 +1100
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Nov 8 07:09:19 2016 +1100

--
 .../internal/membership/gms/fd/GMSHealthMonitor.java | 15 ++-
 1 file changed, 6 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5b0c5650/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
index 97a413c..b3598cd 100644
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
@@ -374,15 +374,14 @@ public class GMSHealthMonitor implements HealthMonitor, 
MessageHandler {
*/
   private void contactedBy(InternalDistributedMember sender, long timeStamp) {
 TimeStamp cTS = new TimeStamp(timeStamp);
-    //TODO Udo: why putIfAbsent. Surely only put is required
 cTS = memberTimeStamps.putIfAbsent(sender, cTS);
 if (cTS != null && cTS.getTime() < timeStamp) {
   cTS.setTime(timeStamp);
 }
 if (suspectedMemberInView.remove(sender) != null) {
   logger.info("No longer suspecting {}", sender);
+  setNextNeighbor(currentView, null);
 }
-setNextNeighbor(currentView, null);
   }
 
 
@@ -834,7 +833,7 @@ public class GMSHealthMonitor implements HealthMonitor, 
MessageHandler {
 }
 
 List allMembers = newView.getMembers();
-
+//
 //Set checkAllSuspected = new 
HashSet<>(allMembers);
 //checkAllSuspected.removeAll(suspectedMemberInView.keySet());
 //checkAllSuspected.remove(localAddress);
@@ -1066,10 +1065,7 @@ public class GMSHealthMonitor implements HealthMonitor, 
MessageHandler {
 
   private void processHeartbeat(HeartbeatMessage m) {
 this.stats.incHeartbeatsReceived();
-if (m.getRequestId() < 0) {
-  // a periodic heartbeat
-  contactedBy(m.getSender(), System.currentTimeMillis());
-} else {
+if (m.getRequestId() >= 0) {
   Response resp = requestIdVsResponse.get(m.getRequestId());
   logger.trace("Got heartbeat from member {}. {}", m.getSender(), (resp != 
null ? "Check thread still waiting" : "Check thread is not waiting"));
   if (resp != null) {
@@ -1078,9 +1074,10 @@ public class GMSHealthMonitor implements HealthMonitor, 
MessageHandler {
   resp.notify();
 }
   }
-  //we got heartbeat lets update timestamp
-  contactedBy(m.getSender(), System.currentTimeMillis());
+
 }
+//we got heartbeat lets update timestamp
+contactedBy(m.getSender(), System.currentTimeMillis());
   }
 
   /**

[1/6] incubator-geode git commit: GEODE-1874: Checkin after code formatting refactor

[udo]

Repository: incubator-geode
Updated Branches:
  refs/heads/develop 3046ea831 -> 15450f5c3


GEODE-1874: Checkin after code formatting refactor


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

Branch: refs/heads/develop
Commit: 1661504f2944870d59a8c545bba80dfc19a58b94
Parents: b0c6f05
Author: Udo Kohlmeyer <ukohlme...@pivotal.io>
Authored: Fri Oct 21 16:11:54 2016 -0700
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Nov 8 07:09:19 2016 +1100

--
 .../membership/gms/fd/GMSHealthMonitor.java | 410 ++-
 1 file changed, 227 insertions(+), 183 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1661504f/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
index b3598cd..ec1d606 100644
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
@@ -1,22 +1,46 @@
 /*
- * 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
+ * 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
+ * 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.
+ * 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.distributed.internal.membership.gms.fd;
 
-import static org.apache.geode.internal.DataSerializableFixedID.*;
+import static 
org.apache.geode.internal.DataSerializableFixedID.HEARTBEAT_REQUEST;
+import static 
org.apache.geode.internal.DataSerializableFixedID.HEARTBEAT_RESPONSE;
+import static 
org.apache.geode.internal.DataSerializableFixedID.SUSPECT_MEMBERS_MESSAGE;
+
+import org.apache.geode.CancelException;
+import org.apache.geode.GemFireConfigException;
+import org.apache.geode.SystemConnectException;
+import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.distributed.internal.DMStats;
+import org.apache.geode.distributed.internal.DistributionMessage;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import 
org.apache.geode.distributed.internal.membership.InternalDistributedMember;
+import org.apache.geode.distributed.internal.membership.NetView;
+import org.apache.geode.distributed.internal.membership.gms.GMSMember;
+import org.apache.geode.distributed.internal.membership.gms.Services;
+import 
org.apache.geode.distributed.internal.membership.gms.interfaces.HealthMonitor;
+import 
org.apache.geode.distributed.internal.membership.gms.interfaces.MessageHandler;
+import 
org.apache.geode.distributed.internal.membership.gms.messages.HeartbeatMessage;
+import 
org.apache.geode.distributed.internal.membership.gms.messages.HeartbeatRequestMessage;
+import 
org.apache.geode.distributed.internal.membership.gms.messages.SuspectMembersMessage;
+import 
org.apache.geode.distributed.i

[2/6] incubator-geode git commit: GEODE-1874: Changed setNextNeighbor to not create HashMap for every p2p invocation

[udo]

GEODE-1874: Changed setNextNeighbor to not create HashMap for every p2p 
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/b0c6f05b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/b0c6f05b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/b0c6f05b

Branch: refs/heads/develop
Commit: b0c6f05b22a2cfda4005b1812285c77ad24d7c44
Parents: 593c702
Author: Udo Kohlmeyer <ukohlme...@pivotal.io>
Authored: Thu Oct 13 10:46:44 2016 +1100
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Nov 8 07:09:19 2016 +1100

--
 .../internal/membership/gms/fd/GMSHealthMonitor.java | 15 ++-
 1 file changed, 6 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b0c6f05b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
index 97a413c..b3598cd 100644
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
@@ -374,15 +374,14 @@ public class GMSHealthMonitor implements HealthMonitor, 
MessageHandler {
*/
   private void contactedBy(InternalDistributedMember sender, long timeStamp) {
 TimeStamp cTS = new TimeStamp(timeStamp);
-    //TODO Udo: why putIfAbsent. Surely only put is required
 cTS = memberTimeStamps.putIfAbsent(sender, cTS);
 if (cTS != null && cTS.getTime() < timeStamp) {
   cTS.setTime(timeStamp);
 }
 if (suspectedMemberInView.remove(sender) != null) {
   logger.info("No longer suspecting {}", sender);
+  setNextNeighbor(currentView, null);
 }
-setNextNeighbor(currentView, null);
   }
 
 
@@ -834,7 +833,7 @@ public class GMSHealthMonitor implements HealthMonitor, 
MessageHandler {
 }
 
 List allMembers = newView.getMembers();
-
+//
 //Set checkAllSuspected = new 
HashSet<>(allMembers);
 //checkAllSuspected.removeAll(suspectedMemberInView.keySet());
 //checkAllSuspected.remove(localAddress);
@@ -1066,10 +1065,7 @@ public class GMSHealthMonitor implements HealthMonitor, 
MessageHandler {
 
   private void processHeartbeat(HeartbeatMessage m) {
 this.stats.incHeartbeatsReceived();
-if (m.getRequestId() < 0) {
-  // a periodic heartbeat
-  contactedBy(m.getSender(), System.currentTimeMillis());
-} else {
+if (m.getRequestId() >= 0) {
   Response resp = requestIdVsResponse.get(m.getRequestId());
   logger.trace("Got heartbeat from member {}. {}", m.getSender(), (resp != 
null ? "Check thread still waiting" : "Check thread is not waiting"));
   if (resp != null) {
@@ -1078,9 +1074,10 @@ public class GMSHealthMonitor implements HealthMonitor, 
MessageHandler {
   resp.notify();
 }
   }
-  //we got heartbeat lets update timestamp
-  contactedBy(m.getSender(), System.currentTimeMillis());
+
 }
+//we got heartbeat lets update timestamp
+contactedBy(m.getSender(), System.currentTimeMillis());
   }
 
   /**

[5/6] incubator-geode git commit: GEODE-1874: Changed setNextNeighbor to not create HashMap for every p2p invocation

[udo]

GEODE-1874: Changed setNextNeighbor to not create HashMap for every p2p 
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/593c7025
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/593c7025
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/593c7025

Branch: refs/heads/develop
Commit: 593c7025f929819fde2e12ca05d24c6abe29b3a4
Parents: 5b0c565
Author: Udo Kohlmeyer <ukohlme...@pivotal.io>
Authored: Wed Oct 12 11:54:33 2016 +1100
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Nov 8 07:09:19 2016 +1100

--
 .../internal/membership/gms/fd/GMSHealthMonitor.java | 15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/593c7025/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
index b3598cd..97a413c 100644
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
@@ -374,14 +374,15 @@ public class GMSHealthMonitor implements HealthMonitor, 
MessageHandler {
*/
   private void contactedBy(InternalDistributedMember sender, long timeStamp) {
 TimeStamp cTS = new TimeStamp(timeStamp);
+    //TODO Udo: why putIfAbsent. Surely only put is required
 cTS = memberTimeStamps.putIfAbsent(sender, cTS);
 if (cTS != null && cTS.getTime() < timeStamp) {
   cTS.setTime(timeStamp);
 }
 if (suspectedMemberInView.remove(sender) != null) {
   logger.info("No longer suspecting {}", sender);
-  setNextNeighbor(currentView, null);
 }
+setNextNeighbor(currentView, null);
   }
 
 
@@ -833,7 +834,7 @@ public class GMSHealthMonitor implements HealthMonitor, 
MessageHandler {
 }
 
 List allMembers = newView.getMembers();
-//
+
 //Set checkAllSuspected = new 
HashSet<>(allMembers);
 //checkAllSuspected.removeAll(suspectedMemberInView.keySet());
 //checkAllSuspected.remove(localAddress);
@@ -1065,7 +1066,10 @@ public class GMSHealthMonitor implements HealthMonitor, 
MessageHandler {
 
   private void processHeartbeat(HeartbeatMessage m) {
 this.stats.incHeartbeatsReceived();
-if (m.getRequestId() >= 0) {
+if (m.getRequestId() < 0) {
+  // a periodic heartbeat
+  contactedBy(m.getSender(), System.currentTimeMillis());
+} else {
   Response resp = requestIdVsResponse.get(m.getRequestId());
   logger.trace("Got heartbeat from member {}. {}", m.getSender(), (resp != 
null ? "Check thread still waiting" : "Check thread is not waiting"));
   if (resp != null) {
@@ -1074,10 +1078,9 @@ public class GMSHealthMonitor implements HealthMonitor, 
MessageHandler {
   resp.notify();
 }
   }
-
+  //we got heartbeat lets update timestamp
+  contactedBy(m.getSender(), System.currentTimeMillis());
 }
-//we got heartbeat lets update timestamp
-contactedBy(m.getSender(), System.currentTimeMillis());
   }
 
   /**

[incubator-geode] Git Push Summary

[udo]

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-2017 [deleted] 3046ea831

incubator-geode git commit: GEODE-2017: removal of nonPRSingleHop stat in client

[udo]

Repository: incubator-geode
Updated Branches:
  refs/heads/develop b4077414e -> 3046ea831


GEODE-2017: removal of nonPRSingleHop stat in client


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

Branch: refs/heads/develop
Commit: 3046ea831746f1d710b7f2d66b9e6793b8448274
Parents: b407741
Author: Udo Kohlmeyer <ukohlme...@pivotal.io>
Authored: Tue Nov 8 07:07:35 2016 +1100
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Nov 8 07:07:35 2016 +1100

--
 .../client/internal/ClientMetadataService.java  |  52 ++---
 .../geode/internal/cache/CachePerfStats.java|  11 --
 .../geode/internal/cache/LocalRegion.java   |   6 -
 .../internal/cache/SingleHopStatsDUnitTest.java | 191 +++
 4 files changed, 100 insertions(+), 160 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3046ea83/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
index 915e1bf..3cf0d7b 100755
--- 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
@@ -15,15 +15,33 @@
 package org.apache.geode.cache.client.internal;
 
 import org.apache.geode.SystemFailure;
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.EntryOperation;
+import org.apache.geode.cache.FixedPartitionResolver;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.PartitionResolver;
+import org.apache.geode.cache.Region;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.distributed.internal.ServerLocation;
-import org.apache.geode.internal.cache.*;
+import org.apache.geode.internal.cache.BucketServerLocation66;
+import org.apache.geode.internal.cache.EntryOperationImpl;
+import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.internal.cache.PartitionedRegionHelper;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.logging.log4j.Logger;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArraySet;
 
@@ -32,9 +50,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
  * will consult this service to identify the server locations on which the 
data for the client
  * operation is residing
  * 
- * 
  * @since GemFire 6.5
- * 
  */
 public final class ClientMetadataService {
 
@@ -51,7 +67,9 @@ public final class ClientMetadataService {
 
   public static final int INITIAL_VERSION = 0;
 
-  /** random number generator used in pruning */
+  /**
+   * random number generator used in pruning
+   */
   private final Random rand = new Random();
 
   private volatile boolean isMetadataStable = true;
@@ -149,9 +167,10 @@ public final class ClientMetadataService {
 
 ServerLocation bucketServerLocation = getServerLocation(region, operation, 
bucketId);
 ServerLocation location = null;
-if (bucketServerLocation != null)
+if (bucketServerLocation != null) {
   location =
   new ServerLocation(bucketServerLocation.getHostName(), 
bucketServerLocation.getPort());
+}
 return location;
   }
 
@@ -167,18 +186,6 @@ public final class ClientMetadataService {
   return null;
 }
 
-// if (prAdvisor.getColocatedWith() != null) {
-// prAdvisor = 
this.getClientPartitionAdvisor(prAdvisor.getColocatedWith());
-// if (prAdvisor == null) {
-// if (this.logger.fineEnabled()) {
-// this.logger.fine(
-// "ClientMetadataService#getServerLocation : Region "
-// + regionFullPath + "prAdvisor does not exist.");
-// }
-// return null;
-// }
-// }
-
 if (operation.isGet()) {
   return prAdvisor.adviseServerLocation(bucketId);
 } else {
@@ -410,8 +417,9 @@ public final class ClientMetadataService {
 
 // retu

incubator-geode git commit: GEODE-2017: removal of nonPRSingleHop stat in client

[udo]

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-2017 [created] 3046ea831


GEODE-2017: removal of nonPRSingleHop stat in client


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

Branch: refs/heads/feature/GEODE-2017
Commit: 3046ea831746f1d710b7f2d66b9e6793b8448274
Parents: b407741
Author: Udo Kohlmeyer <ukohlme...@pivotal.io>
Authored: Tue Nov 8 07:07:35 2016 +1100
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Nov 8 07:07:35 2016 +1100

--
 .../client/internal/ClientMetadataService.java  |  52 ++---
 .../geode/internal/cache/CachePerfStats.java|  11 --
 .../geode/internal/cache/LocalRegion.java   |   6 -
 .../internal/cache/SingleHopStatsDUnitTest.java | 191 +++
 4 files changed, 100 insertions(+), 160 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3046ea83/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
index 915e1bf..3cf0d7b 100755
--- 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
@@ -15,15 +15,33 @@
 package org.apache.geode.cache.client.internal;
 
 import org.apache.geode.SystemFailure;
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.EntryOperation;
+import org.apache.geode.cache.FixedPartitionResolver;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.PartitionResolver;
+import org.apache.geode.cache.Region;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.distributed.internal.ServerLocation;
-import org.apache.geode.internal.cache.*;
+import org.apache.geode.internal.cache.BucketServerLocation66;
+import org.apache.geode.internal.cache.EntryOperationImpl;
+import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.internal.cache.PartitionedRegionHelper;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.logging.log4j.Logger;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArraySet;
 
@@ -32,9 +50,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
  * will consult this service to identify the server locations on which the 
data for the client
  * operation is residing
  * 
- * 
  * @since GemFire 6.5
- * 
  */
 public final class ClientMetadataService {
 
@@ -51,7 +67,9 @@ public final class ClientMetadataService {
 
   public static final int INITIAL_VERSION = 0;
 
-  /** random number generator used in pruning */
+  /**
+   * random number generator used in pruning
+   */
   private final Random rand = new Random();
 
   private volatile boolean isMetadataStable = true;
@@ -149,9 +167,10 @@ public final class ClientMetadataService {
 
 ServerLocation bucketServerLocation = getServerLocation(region, operation, 
bucketId);
 ServerLocation location = null;
-if (bucketServerLocation != null)
+if (bucketServerLocation != null) {
   location =
   new ServerLocation(bucketServerLocation.getHostName(), 
bucketServerLocation.getPort());
+}
 return location;
   }
 
@@ -167,18 +186,6 @@ public final class ClientMetadataService {
   return null;
 }
 
-// if (prAdvisor.getColocatedWith() != null) {
-// prAdvisor = 
this.getClientPartitionAdvisor(prAdvisor.getColocatedWith());
-// if (prAdvisor == null) {
-// if (this.logger.fineEnabled()) {
-// this.logger.fine(
-// "ClientMetadataService#getServerLocation : Region "
-// + regionFullPath + "prAdvisor does not exist.");
-// }
-// return null;
-// }
-// }
-
 if (operation.isGet()) {
   return prAdvisor.adviseServerLocation(bucketId);
 } else {
@@ -410,8 +417,9 @@ public final class ClientMetadat

[incubator-geode] Git Push Summary

[udo]

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-2017 [deleted] 4e51ac5db

incubator-geode git commit: GEODE-2079: mark the test as flaky

[udo]

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-2017 b62cb1d1a -> 4e51ac5db


GEODE-2079: mark the test as flaky


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

Branch: refs/heads/feature/GEODE-2017
Commit: 4e51ac5dbf2061fd5f347ff7ae3d6954e3a6266c
Parents: b62cb1d
Author: Jinmei Liao <jil...@pivotal.io>
Authored: Mon Nov 7 08:37:41 2016 -0800
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Nov 8 05:57:37 2016 +1100

--
 .../org/apache/geode/management/ConnectToLocatorSSLDUnitTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4e51ac5d/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 1c8079a..b6afcca 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,6 +43,7 @@ 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;
@@ -90,10 +91,10 @@ public class ConnectToLocatorSSLDUnitTest extends 
JUnit4DistributedTestCase {
 securityProps.setProperty(SSL_TRUSTSTORE_PASSWORD, "password");
 securityProps.setProperty(SSL_PROTOCOLS, "TLSv1.2,TLSv1.1");
 
-
 setUpLocatorAndConnect(securityProps);
   }
 
+  @Category(FlakyTest.class) // GEODE-2079
   @Test
   public void testConnectToLocatorWithLegacyClusterSSL() throws Exception {
 securityProps.setProperty(CLUSTER_SSL_ENABLED, "true");

[03/13] incubator-geode git commit: GEODE-2060 Update docs for security-related poperties

[udo]

GEODE-2060 Update docs for security-related poperties

Add security-manager and security-post-processor.
Deprecate others.


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

Branch: refs/heads/feature/GEODE-2017
Commit: dd5af9599af947cacb64e29b1f6bba8f0a4d9b32
Parents: 47d295c
Author: Karen Miller <kmil...@pivotal.io>
Authored: Thu Nov 3 09:04:10 2016 -0700
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Nov 8 05:39:37 2016 +1100

--
 .../topics/gemfire_properties.html.md.erb   | 28 +---
 1 file changed, 18 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dd5af959/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 ae0f198..f9455dd 100644
--- a/geode-docs/reference/topics/gemfire_properties.html.md.erb
+++ b/geode-docs/reference/topics/gemfire_properties.html.md.erb
@@ -423,21 +423,19 @@ See Co
 
 
 security-*
-Used for authentication. Any custom properties needed by your AuthInitialize or Authenticator callbacks.
-
-**Note:**
-Any security-related (properties that begin with security-*) configuration properties that are normally 
configured in gemfire.properties can be moved to 
a separate gfsecurity.properties file. Placing 
these configuration settings in a separate file allows you to restrict access 
to security configuration data. This way, you can still allow read or write 
access for your gemfire.properties file.
-
+
+Any security-related (properties that begin with security-) configuration properties that are normally configured 
in gemfire.properties can be moved to a separate 
gfsecurity.properties file. Placing these 
configuration settings in a separate file allows you to restrict access to 
security configuration data. This way, you can still allow read or write access 
for your gemfire.properties file.
+
 not set
 
 
 security-client-accessor
-Used for authorization. Static creation method returning an AccessControl object, which determines authorization 
of client-server cache operations. This specifies the callback that should be 
invoked in the pre-operation phase, which is when the request for the operation 
is received from the client.
+Deprecated. Used for authorization. Static creation method 
returning an AccessControl object, which 
determines authorization of client-server cache operations. This specifies the 
callback that should be invoked in the pre-operation phase, which is when the 
request for the operation is received from the client.
 not set
 
 
 security-client-accessor-pp
-Used for authorization. The callback that should be invoked in the 
post-operation phase, which is when the operation has completed on the server 
but before the result is sent to the client. The post-operation callback is 
also invoked for the updates that are sent from server to client through the 
notification channel.
+Deprecated. Used for authorization. The callback that should be 
invoked in the post-operation phase, which is when the operation has completed 
on the server but before the result is sent to the client. The post-operation 
callback is also invoked for the updates that are sent from server to client 
through the notification channel.
 not set
 
 
@@ -447,7 +445,7 @@ See Co
 
 
 security-client-authenticator
-Used for authentication. Static creation method returning an Authenticator object, which is used by a peer to 
verify the credentials of the connecting peer.
+Deprecated. Used for authentication. Static creation method 
returning an Authenticator object, which is used 
by a peer to verify the credentials of the connecting peer.
 not set
 
 
@@ -466,14 +464,19 @@ See Co
 Valid values from lowest to highest are fine, config, info, warning, error, 
severe, and none.
 config
 
+
+security-manager
+Specifies the implementation of the SecurityManager interface 
that implements the callbacks that do authentication and authorization.
+not set
+
 
 security-peer-auth-init
-Used with authentication. Static creation method returning an AuthInitialize object, which obtains credentials for 
peers in a distributed system. The obtained credentials should be acceptable to 
the Authenticator specified through the 
security-peer-authenticator property on the peers.
+Deprecated. Used with authentication. Static creation method 
returning an AuthInitialize object, which 
obtains credentials for peers in a distri

[10/13] incubator-geode git commit: Adding a geode-benchmark project with support for running jmh benchmarks

[udo]

Adding a geode-benchmark project with support for running jmh benchmarks

Adding a new project with a couple of simple benchmarks using jmh, to
make it easier for developers to write microbenchmarks of geode.


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

Branch: refs/heads/feature/GEODE-2017
Commit: 9ca9d75e69882d1bbcc803b78d6521a38874
Parents: dd2df31
Author: Dan Smith <upthewatersp...@apache.org>
Authored: Wed Oct 19 10:16:31 2016 -0700
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Nov 8 05:39:39 2016 +1100

--
 build.gradle|   1 +
 geode-benchmarks/build.gradle   |  26 +
 .../benchmark/RangeQueryWithIndexBenchmark.java | 104 +++
 .../benchmark/RegionOperationBenchmark.java |  62 +++
 settings.gradle |   1 +
 5 files changed, 194 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9ca9d75e/build.gradle
--
diff --git a/build.gradle b/build.gradle
index 6e82433..360310f 100755
--- a/build.gradle
+++ b/build.gradle
@@ -25,6 +25,7 @@ buildscript {
 classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1'
 classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.0.1'
 classpath "com.diffplug.gradle.spotless:spotless:2.2.0"
+classpath "me.champeau.gradle:jmh-gradle-plugin:0.3.1"
   }
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9ca9d75e/geode-benchmarks/build.gradle
--
diff --git a/geode-benchmarks/build.gradle b/geode-benchmarks/build.gradle
new file mode 100644
index 000..b6f09bc
--- /dev/null
+++ b/geode-benchmarks/build.gradle
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+
+apply plugin: "me.champeau.gradle.jmh"
+
+dependencies {
+  compile project(':geode-core')
+}
+
+jmh {
+  duplicateClassesStrategy = 'warn'
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9ca9d75e/geode-benchmarks/src/jmh/java/org/apache/geode/cache/benchmark/RangeQueryWithIndexBenchmark.java
--
diff --git 
a/geode-benchmarks/src/jmh/java/org/apache/geode/cache/benchmark/RangeQueryWithIndexBenchmark.java
 
b/geode-benchmarks/src/jmh/java/org/apache/geode/cache/benchmark/RangeQueryWithIndexBenchmark.java
new file mode 100644
index 000..7255c1a
--- /dev/null
+++ 
b/geode-benchmarks/src/jmh/java/org/apache/geode/cache/benchmark/RangeQueryWithIndexBenchmark.java
@@ -0,0 +1,104 @@
+/*
+ * 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.benchmark;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.List;
+import java.util.stream.IntStream;
+
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.

[13/13] incubator-geode git commit: GEODE-1985: Updating the SAFE_QUERY_TIME after updating indexes

[udo]

GEODE-1985: Updating the SAFE_QUERY_TIME after updating indexes

This is a fix for pretty specific race condition
1) T1 does a put and gets to the point of calling setIndexBufferTime,
but hasn't updated the indexes
2) T2 starts a query and finds the entry in the index even though the
value no longer matches the query
3) T1 finishes the put
4) T2 checks to see if should revaluate the entry, but decides not to
because based on the SAFE_QUERY_TIME value the entry changed before the
query started.

By moving the update to SAFE_QUERY_TIME down, the if the an entry
doesn't need reevaluation based on the SAFE_QUERY_TIME, we know the
index was updated before the query started.

There is currently an updateInProgress flag to handle the issue of the
query executing before the SAFE_QUERY_TIME is updated. If the entry is
updated, but not the index, the updateInProgress flag will be set.


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

Branch: refs/heads/feature/GEODE-2017
Commit: cc67eddb6c385bf5f87db0dae488bf0b0a5a8d5d
Parents: fdf6329
Author: Dan Smith <upthewatersp...@apache.org>
Authored: Mon Oct 31 14:15:47 2016 -0700
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Nov 8 05:39:40 2016 +1100

--
 .../main/java/org/apache/geode/internal/cache/LocalRegion.java| 3 ++-
 .../query/internal/index/MapRangeIndexMaintenanceJUnitTest.java   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cc67eddb/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 7ccf3d6..e307c86 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
@@ -5875,6 +5875,8 @@ public class LocalRegion extends AbstractRegion 
implements LoaderHelperFactory,
   }
 } catch (QueryException e) {
   throw new IndexMaintenanceException(e);
+} finally {
+  IndexManager.setIndexBufferTime(lastModifiedTime, cacheTimeMillis());
 }
   }
 }
@@ -7369,7 +7371,6 @@ public class LocalRegion extends AbstractRegion 
implements LoaderHelperFactory,
   lastModified = cacheTimeMillis();
 }
 entry.updateStatsForPut(lastModified);
-IndexManager.setIndexBufferTime(lastModified, cacheTimeMillis());
 if (this.statisticsEnabled && !isProxy()) {
   // do not reschedule if there is already a task in the queue.
   // this prevents bloat in the TimerTask since cancelled tasks

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cc67eddb/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java
index beffe47..5159f89 100644
--- 
a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java
@@ -968,7 +968,7 @@ public class MapRangeIndexMaintenanceJUnitTest {
 HashMap map2 = new HashMap();
 map2.put("SUN", 1);
 map2.put("IBM", 2);
-p2.positions = map1;
+p2.positions = map2;
 region.put(2, p2);
 
 

[11/13] incubator-geode git commit: GEODE-2074: annotate flaky test with FlakyTest category

[udo]

GEODE-2074: annotate flaky test with FlakyTest category


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

Branch: refs/heads/feature/GEODE-2017
Commit: 3cf725f46b3847e4939ce0256221f8dc10a54bcc
Parents: 082c084
Author: Kirk Lund <kl...@apache.org>
Authored: Fri Nov 4 11:50:37 2016 -0700
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Nov 8 05:39:39 2016 +1100

--
 .../internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3cf725f4/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
index 0df7656..dac49d5 100644
--- 
a/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/distributed/internal/membership/gms/membership/GMSJoinLeaveJUnitTest.java
@@ -35,6 +35,7 @@ import 
org.apache.geode.distributed.internal.membership.gms.membership.GMSJoinLe
 import org.apache.geode.distributed.internal.membership.gms.messages.*;
 import org.apache.geode.internal.Version;
 import org.apache.geode.security.AuthenticationFailedException;
+import org.apache.geode.test.junit.categories.FlakyTest;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.junit.After;
 import org.junit.Assert;
@@ -486,7 +487,7 @@ public class GMSJoinLeaveJUnitTest {
 view.getCrashedMembers().contains(mockMembers[0]));
   }
 
-
+  @Category(FlakyTest.class) // GEODE-2074: timed out waiting for view #7
   @Test
   public void testDuplicateJoinRequestDoesNotCauseNewView() throws Exception {
 initMocks();

[06/13] incubator-geode git commit: GEODE-2073: annotate flaky test with FlakyTest category

[udo]

GEODE-2073: annotate flaky test with FlakyTest category


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

Branch: refs/heads/feature/GEODE-2017
Commit: 082c0849fae5a56ab5f530990a0dc6342022c670
Parents: c73bea7
Author: Kirk Lund <kl...@apache.org>
Authored: Fri Nov 4 11:50:06 2016 -0700
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Nov 8 05:39:38 2016 +1100

--
 .../internal/membership/gms/fd/GMSHealthMonitorJUnitTest.java  | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/082c0849/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 70ebbc1..547a200 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
@@ -32,6 +32,7 @@ import 
org.apache.geode.distributed.internal.membership.gms.messages.SuspectRequ
 import org.apache.geode.internal.net.SocketCreator;
 import org.apache.geode.internal.Version;
 import org.apache.geode.internal.net.SocketCreatorFactory;
+import org.apache.geode.test.junit.categories.FlakyTest;
 import org.apache.geode.test.junit.categories.IntegrationTest;
 import org.jgroups.util.UUID;
 import org.junit.After;
@@ -163,6 +164,7 @@ public class GMSHealthMonitorJUnitTest {
 Assert.assertEquals(mockMembers.get(4), 
gmsHealthMonitor.getNextNeighbor());
   }
 
+  @Category(FlakyTest.class) // GEODE-2073
   @Test
   public void testHMNextNeighborAfterTimeout() throws Exception {
 System.out.println("testHMNextNeighborAfterTimeout starting");

[01/13] incubator-geode git commit: GEODE-2013: throw IllegalStateException if resource type is missing

[udo]

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-2017 47d295cb2 -> cc67eddb6


GEODE-2013: throw IllegalStateException if resource type is missing


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

Branch: refs/heads/feature/GEODE-2017
Commit: 789814d5c0239d86c9a4f7970eabc0a7ad9473a7
Parents: 1a522c0
Author: Kirk Lund <kl...@apache.org>
Authored: Wed Nov 2 13:01:05 2016 -0700
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Nov 8 05:39:37 2016 +1100

--
 .../internal/statistics/StatArchiveReader.java  |   5 ++
 ...veWithMissingResourceTypeRegressionTest.java |  65 +++
 ...iveWithMissingResourceTypeRegressionTest.gfs | Bin 0 -> 253 bytes
 3 files changed, 70 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/789814d5/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveReader.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveReader.java
 
b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveReader.java
index ca1a6c4..9fba511 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveReader.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/statistics/StatArchiveReader.java
@@ -3228,6 +3228,11 @@ public class StatArchiveReader implements 
StatArchiveFormat {
   if ((resourceInstId + 1) > this.resourceInstSize) {
 this.resourceInstSize = resourceInstId + 1;
   }
+  ResourceType type = resourceTypeTable[resourceTypeId];
+  if (type == null) {
+throw new IllegalStateException(
+"ResourceType is missing for resourceTypeId " + resourceTypeId);
+  }
   boolean loadInstance = loadInstance(name, id, 
resourceTypeTable[resourceTypeId]);
   resourceInstTable[resourceInstId] = new ResourceInst(this, 
resourceInstId, name, id,
   resourceTypeTable[resourceTypeId], loadInstance);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/789814d5/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithMissingResourceTypeRegressionTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithMissingResourceTypeRegressionTest.java
 
b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithMissingResourceTypeRegressionTest.java
new file mode 100644
index 000..73d6739
--- /dev/null
+++ 
b/geode-core/src/test/java/org/apache/geode/internal/statistics/StatArchiveWithMissingResourceTypeRegressionTest.java
@@ -0,0 +1,65 @@
+/*
+ * 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.statistics;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+import org.junit.After;
+import org.junit.Before;
+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.net.URL;
+
+@Category(IntegrationTest.class)
+public class StatArchiveWithMissingResourceTypeRegressionTest {
+
+  private static final String ARCHIVE_FILE_NAME =
+  StatArchiveWithMissingResourceTypeRegressionTest.class.getSimpleName() + 
".gfs";
+
+  private File archiveFile;
+
+  @Rule
+  public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
+  @Before
+  public void setUp() throws Exception {
+URL url = getClass().getResource(ARCHIVE_FILE_NAME);
+assertT

[02/13] incubator-geode git commit: GEODE-2065 Document defragmentationsInProgress statistic

[udo]

GEODE-2065 Document defragmentationsInProgress statistic

This is a sub-task of GEODE-1590.


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

Branch: refs/heads/feature/GEODE-2017
Commit: 3b55eb6956ac49149f5e153b54b956a371cb24c8
Parents: dd5af95
Author: Karen Miller <kmil...@pivotal.io>
Authored: Wed Nov 2 16:45:57 2016 -0700
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Nov 8 05:39:37 2016 +1100

--
 geode-docs/reference/statistics/statistics_list.html.md.erb | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3b55eb69/geode-docs/reference/statistics/statistics_list.html.md.erb
--
diff --git a/geode-docs/reference/statistics/statistics_list.html.md.erb 
b/geode-docs/reference/statistics/statistics_list.html.md.erb
index 07e4281..02ed6a7 100644
--- a/geode-docs/reference/statistics/statistics_list.html.md.erb
+++ b/geode-docs/reference/statistics/statistics_list.html.md.erb
@@ -1013,6 +1013,7 @@ These statistics quantify the use of off-heap memory. The 
primary statistics are
 | Statistic | Description  





   |
 
|---|-|
 | `compactions` | The total number of times the off-heap memory 
manager has invoked the defragmentation algorithm on the off-heap memory space. 




  |
+| `defragmentationsInProgress` | The number of defragmentation operations 
currently in progress.  




   |
 | `defragmentationTime` | The total number of nanoseconds spent running the 
defragmentation algorithm on off-heap memory space fragments.   




  |
 | `fragmentation`   | This statistic gives an indication of the level of 
external fragmentation in the off-heap memory space by providing a ratio of the 
current number of fragments of free space to the largest number of fragments 
that could be formed from that free space. It is expressed as a percentage; the 
higher this value, the more fragmented the free space currently is. This 
statistic is 0 if the memory manager has never run its defragmentation 
algorithm on the off-heap space, and it is recalculated after each 
defragmentation. |
 | `fragments`   | The current number of fragments of free off-heap 
memory. This statistic is 0 if no defragmentation has ever been done, and it is 
updated after each defragmentation. 



   |

[07/13] incubator-geode git commit: GEODE-2071: annotate flaky test with FlakyTest category

[udo]

GEODE-2071: annotate flaky test with FlakyTest category


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

Branch: refs/heads/feature/GEODE-2017
Commit: 3c0de2a83b961a3320066b267ad4e34fc2010cec
Parents: 151df7b
Author: Kirk Lund <kl...@apache.org>
Authored: Fri Nov 4 11:37:26 2016 -0700
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Nov 8 05:39:38 2016 +1100

--
 .../org/apache/geode/security/ClientAuthzObjectModDUnitTest.java   | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3c0de2a8/geode-cq/src/test/java/org/apache/geode/security/ClientAuthzObjectModDUnitTest.java
--
diff --git 
a/geode-cq/src/test/java/org/apache/geode/security/ClientAuthzObjectModDUnitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/security/ClientAuthzObjectModDUnitTest.java
index ded9b47..3be6dde 100644
--- 
a/geode-cq/src/test/java/org/apache/geode/security/ClientAuthzObjectModDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/security/ClientAuthzObjectModDUnitTest.java
@@ -27,6 +27,7 @@ import 
org.apache.geode.security.generator.DummyAuthzCredentialGenerator;
 import org.apache.geode.security.generator.DummyCredentialGenerator;
 import org.apache.geode.security.templates.UserPasswordAuthInit;
 import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FlakyTest;
 import org.apache.geode.test.junit.categories.SecurityTest;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -71,6 +72,7 @@ public class ClientAuthzObjectModDUnitTest extends 
ClientAuthorizationTestCase {
 () -> Instantiator.register(new MyInstantiator(), false));
   }
 
+  @Category(FlakyTest.class) // GEODE-2071: failed with 
ForcedDisconnectException
   @Test
   public void testAllOpsObjectModWithFailover() throws Exception {
 OperationWithAction[] allOps = allOps();

[05/13] incubator-geode git commit: GEODE-2072: annotate flaky test with FlakyTest category

[udo]

GEODE-2072: annotate flaky test with FlakyTest category


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

Branch: refs/heads/feature/GEODE-2017
Commit: c73bea742e5c89bc9af7a5db3b2016f10d0cd056
Parents: 3c0de2a
Author: Kirk Lund <kl...@apache.org>
Authored: Fri Nov 4 11:42:24 2016 -0700
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Nov 8 05:39:38 2016 +1100

--
 .../geode/management/internal/pulse/TestFunctionsDUnitTest.java| 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c73bea74/geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestFunctionsDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestFunctionsDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestFunctionsDUnitTest.java
index 2dfbcbf..59f7ed2 100644
--- 
a/geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestFunctionsDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/management/internal/pulse/TestFunctionsDUnitTest.java
@@ -14,6 +14,7 @@
  */
 package org.apache.geode.management.internal.pulse;
 
+import org.apache.geode.test.junit.categories.FlakyTest;
 import org.junit.experimental.categories.Category;
 import org.junit.Test;
 
@@ -80,6 +81,7 @@ public class TestFunctionsDUnitTest extends 
ManagementTestBase {
 return Integer.valueOf(bean.getNumRunningFunctions());
   }
 
+  @Category(FlakyTest.class) // GEODE-2072: waitForCriterion times out
   @Test
   public void testNumOfRunningFunctions() throws Exception {
 initManagement(false);

[08/13] incubator-geode git commit: GEODE-1955: fix flaky tests by properly closing the gfsh instance in ConnectToLocatorSSLDUnitTest

[udo]

GEODE-1955: fix flaky tests by properly closing the gfsh instance in 
ConnectToLocatorSSLDUnitTest

GEODE-1955: fix flaky tests by properly closing the gfsh instance in 
ConnectToLocatorSSLDUnitTest

GEODE-1955: fix flaky tests by properly closing the gfsh instance in 
ConnectToLocatorSSLDUnitTest


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

Branch: refs/heads/feature/GEODE-2017
Commit: 151df7bf5f186c115ca8ea048167b9559f419395
Parents: 789814d
Author: Jinmei Liao <jil...@pivotal.io>
Authored: Fri Oct 28 14:46:10 2016 -0700
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Nov 8 05:39:38 2016 +1100

--
 .../ConnectToLocatorSSLDUnitTest.java   | 106 ---
 .../security/GfshCommandsPostProcessorTest.java |   7 +-
 .../security/GfshCommandsSecurityTest.java  |  11 +-
 .../dunit/rules/GfshShellConnectionRule.java|  81 +++---
 .../dunit/rules/LocatorServerStartupRule.java   |   8 +-
 .../GfshCommandsOverHttpSecurityTest.java   |   2 +-
 6 files changed, 101 insertions(+), 114 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/151df7bf/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 8426c6f..1c8079a 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
@@ -15,16 +15,35 @@
 
 package org.apache.geode.management;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_ENABLED;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_KEYSTORE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_KEYSTORE_PASSWORD;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_KEYSTORE_TYPE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_TRUSTSTORE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.CLUSTER_SSL_TRUSTSTORE_PASSWORD;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_ENABLED;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_KEYSTORE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_KEYSTORE_PASSWORD;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_KEYSTORE_TYPE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_TRUSTSTORE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD;
+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_PROTOCOLS;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.SSL_TRUSTSTORE_PASSWORD;
 import static org.apache.geode.internal.Assert.assertTrue;
-import static org.apache.geode.util.test.TestUtil.*;
-import static org.junit.Assert.*;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import java.util.Properties;
+import static org.apache.geode.util.test.TestUtil.getResourcePath;
 
+import org.apache.geode.internal.security.SecurableCommunicationChannel;
+import org.apache.geode.management.internal.cli.i18n.CliStrings;
+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.rules.serializable.SerializableTemporaryFolder;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -32,47 +51,36 @@ import org.junit.T

[09/13] incubator-geode git commit: GEODE-1985 Removing some string comparisons in the AttributesDescriptor

[udo]

GEODE-1985 Removing some string comparisons in the AttributesDescriptor

Optimizing the attributes descriptor by removing some string
comparisons.


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

Branch: refs/heads/feature/GEODE-2017
Commit: fdf632901e15c40a5c5510e24d57e0ecfa0ba32e
Parents: 9ca9d75
Author: Dan Smith <upthewatersp...@apache.org>
Authored: Mon Oct 24 17:23:35 2016 -0700
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Nov 8 05:39:39 2016 +1100

--
 .../query/internal/AttributeDescriptor.java | 27 
 1 file changed, 10 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fdf63290/geode-core/src/main/java/org/apache/geode/cache/query/internal/AttributeDescriptor.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/AttributeDescriptor.java
 
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/AttributeDescriptor.java
index a11bea0..f40ab3e 100644
--- 
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/AttributeDescriptor.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/AttributeDescriptor.java
@@ -33,6 +33,7 @@ import org.apache.geode.cache.query.NameNotFoundException;
 import org.apache.geode.cache.query.QueryInvocationTargetException;
 import org.apache.geode.cache.query.QueryService;
 import org.apache.geode.cache.query.types.ObjectType;
+import org.apache.geode.internal.cache.Token;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.pdx.PdxInstance;
 import org.apache.geode.pdx.PdxSerializationException;
@@ -78,29 +79,25 @@ public class AttributeDescriptor {
   return readPdx((PdxInstance) target);
 }
 // for non pdx objects
-return read(target, target.getClass());
+return readReflection(target);
   }
 
   // used when the resolution of an attribute must be on a superclass
   // instead of the runtime class
-  private Object read(Object target, Class resolutionClass)
+  private Object readReflection(Object target)
   throws NameNotFoundException, QueryInvocationTargetException {
 Support.Assert(target != null);
 Support.Assert(target != QueryService.UNDEFINED);
-Member m;
-if 
(target.getClass().getName().startsWith("org.apache.geode.internal.cache.Token$"))
 {
+if (target instanceof Token) {
   return QueryService.UNDEFINED;
-} else {
-  m = getReadMember(resolutionClass);
 }
+
+Class resolutionClass = target.getClass();
+Member m = getReadMember(resolutionClass);
 try {
   if (m instanceof Method) {
 try {
-  if 
(target.getClass().getName().startsWith("org.apache.geode.internal.cache.Token$"))
 {
-return QueryService.UNDEFINED;
-  } else {
-return ((Method) m).invoke(target, (Object[]) null);
-  }
+  return ((Method) m).invoke(target, (Object[]) null);
 } catch (EntryDestroyedException e) {
   // eat the Exception
   return QueryService.UNDEFINED;
@@ -123,11 +120,7 @@ public class AttributeDescriptor {
 }
   } else {
 try {
-  if 
(target.getClass().getName().startsWith("org.apache.geode.internal.cache.Token$"))
 {
-return QueryService.UNDEFINED;
-  } else {
-return ((Field) m).get(target);
-  }
+  return ((Field) m).get(target);
 } catch (IllegalAccessException e) {
   throw new NameNotFoundException(
   
LocalizedStrings.AttributeDescriptor_FIELD_0_IN_CLASS_1_IS_NOT_ACCESSIBLE_TO_THE_QUERY_PROCESSOR
@@ -315,7 +308,7 @@ public class AttributeDescriptor {
   throws NameNotFoundException, QueryInvocationTargetException {
 try {
   Object obj = pdxInstance.getCachedObject();
-  return read(obj, obj.getClass());
+  return readReflection(obj);
 } catch (PdxSerializationException e) {
   throw new NameNotFoundException( // the domain object is not available
   
LocalizedStrings.AttributeDescriptor_FIELD_0_IN_CLASS_1_IS_NOT_ACCESSIBLE_TO_THE_QUERY_PROCESSOR

[12/13] incubator-geode git commit: GEODE-1821: Adjust timing to wait for async thread

[udo]

GEODE-1821: Adjust timing to wait for async thread

This closes #279


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

Branch: refs/heads/feature/GEODE-2017
Commit: dd2df31b42cdfdb2728828ff5640b897d480d819
Parents: 3cf725f
Author: Ken Howe <kh...@pivotal.io>
Authored: Wed Nov 2 11:14:13 2016 -0700
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Nov 8 05:39:39 2016 +1100

--
 .../PersistentColocatedPartitionedRegionDUnitTest.java  | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dd2df31b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
index 3f2ab70..a044a61 100644
--- 
a/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
@@ -93,7 +93,7 @@ public class PersistentColocatedPartitionedRegionDUnitTest
   private static final String PATTERN_FOR_MISSING_CHILD_LOG =
   "(?s)Persistent data recovery for region .*is prevented by offline 
colocated region.*";
   private static final int NUM_BUCKETS = 15;
-  private static final int MAX_WAIT = 30 * 1000;
+  private static final int MAX_WAIT = 60 * 1000;
   private static final int DEFAULT_NUM_EXPECTED_LOG_MESSAGES = 1;
   private static int numExpectedLogMessages = 
DEFAULT_NUM_EXPECTED_LOG_MESSAGES;
   private static int numChildPRs = 1;
@@ -1188,6 +1188,13 @@ public class 
PersistentColocatedPartitionedRegionDUnitTest
 CHILD_REGION_RESTART_ORDER.add(new Object[] {"Gen2_C2_2", "Gen1_C2", 0});
   }
 
+  /**
+   * This thread starts up multiple colocated child regions in the sequence 
defined by
+   * {@link #CHILD_REGION_RESTART_ORDER}. The complete startup sequence, which 
includes timed
+   * periods waiting for log messages, takes at least 28 secs. Tests waiting 
for this
+   * {@link SerializableCallable} to complete must have sufficient overhead in 
the wait for runtime
+   * variations that exceed the minimum time to complete.
+   */
   private SerializableCallable createPRsSequencedColocationTreeCreationThread =
   new SerializableCallable("createPRsSequencedColocationTreeCreation") {
 Appender mockAppender;

incubator-geode git commit: GEODE-2017: Remove nonPRSingleHop stat from client

[udo]

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-2017 [created] 47d295cb2


GEODE-2017: Remove nonPRSingleHop stat from client


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

Branch: refs/heads/feature/GEODE-2017
Commit: 47d295cb2aa7931007188b2c31ee443b46c4c357
Parents: 9bbecb2
Author: Udo Kohlmeyer <ukohlme...@pivotal.io>
Authored: Thu Nov 3 09:36:31 2016 +1100
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Thu Nov 3 09:36:31 2016 +1100

--
 .../client/internal/ClientMetadataService.java  |  84 
 .../geode/internal/cache/CachePerfStats.java|  11 --
 .../geode/internal/cache/LocalRegion.java   |   6 -
 .../internal/cache/SingleHopStatsDUnitTest.java | 191 +++
 4 files changed, 118 insertions(+), 174 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/47d295cb/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
index 915e1bf..d4d5ac9 100755
--- 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
@@ -15,15 +15,33 @@
 package org.apache.geode.cache.client.internal;
 
 import org.apache.geode.SystemFailure;
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.EntryOperation;
+import org.apache.geode.cache.FixedPartitionResolver;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.PartitionResolver;
+import org.apache.geode.cache.Region;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.distributed.internal.ServerLocation;
-import org.apache.geode.internal.cache.*;
+import org.apache.geode.internal.cache.BucketServerLocation66;
+import org.apache.geode.internal.cache.EntryOperationImpl;
+import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.internal.cache.PartitionedRegionHelper;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
 import org.apache.logging.log4j.Logger;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArraySet;
 
@@ -31,10 +49,7 @@ import java.util.concurrent.CopyOnWriteArraySet;
  * Maintains {@link ClientPartitionAdvisor} for Partitioned Regions on servers 
Client operations
  * will consult this service to identify the server locations on which the 
data for the client
  * operation is residing
- * 
- * 
  * @since GemFire 6.5
- * 
  */
 public final class ClientMetadataService {
 
@@ -51,7 +66,9 @@ public final class ClientMetadataService {
 
   public static final int INITIAL_VERSION = 0;
 
-  /** random number generator used in pruning */
+  /**
+   * random number generator used in pruning
+   */
   private final Random rand = new Random();
 
   private volatile boolean isMetadataStable = true;
@@ -100,7 +117,7 @@ public final class ClientMetadataService {
   }
 
   public ServerLocation getBucketServerLocation(Region region, Operation 
operation, Object key,
-  Object value, Object callbackArg) {
+Object value, Object 
callbackArg) {
 ClientPartitionAdvisor prAdvisor = 
this.getClientPartitionAdvisor(region.getFullPath());
 if (prAdvisor == null) {
   return null;
@@ -131,7 +148,7 @@ public final class ClientMetadataService {
   String partition = ((FixedPartitionResolver) 
resolver).getPartitionName(entryOp,
   prAdvisor.getFixedPartitionNames());
   if (partition == null) {
-Object[] prms = new Object[] {region.getName(), resolver};
+Object[] prms = new Object[]{region.getName(), resolver};
 throw new IllegalStateException(
 
LocalizedStrings.PartitionedRegionHelper_FOR_REGION_0_PARTITIONRESOLVER_1_RETURNED_PARTITION_NAME_NULL
 .toLocalizedString(prms)

[14/50] [abbrv] incubator-geode git commit: GEODE-999: Converted from Firefox driver to PhantomJS driver to run UITests in headless mode

[udo]

GEODE-999: Converted from Firefox driver to PhantomJS driver to run UITests in 
headless mode

* Moved pulse ui tests into their own package.


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

Branch: refs/heads/feature/GEODE-1874
Commit: dfb87a591ef33e1a0f4e4b5299c21685cef2f25e
Parents: e15657e
Author: Jared Stewart 
Authored: Mon Oct 3 14:15:59 2016 -0700
Committer: Jinmei Liao 
Committed: Wed Oct 12 09:46:53 2016 -0700

--
 .gitignore  |3 +
 .../test/gemfire-jstewartgeode999-files.tgz |  Bin 0 -> 877528 bytes
 geode-pulse/build.gradle|5 +
 .../tools/pulse/testbed/driver/PulseUITest.java |2 +-
 .../pulse/tests/DataBrowserResultLoader.java|2 +
 .../tools/pulse/tests/PulseAbstractTest.java| 1048 --
 .../geode/tools/pulse/tests/PulseAuthTest.java  |   33 -
 .../tools/pulse/tests/PulseAutomatedTest.java   |  784 -
 .../geode/tools/pulse/tests/PulseBaseTest.java  |  693 
 .../tools/pulse/tests/PulseNoAuthTest.java  |   33 -
 .../tools/pulse/tests/ui/PulseAbstractTest.java |  978 
 .../tools/pulse/tests/ui/PulseAuthTest.java |   34 +
 .../pulse/tests/ui/PulseAutomatedTest.java  |  768 +
 .../tools/pulse/tests/ui/PulseBaseTest.java |  697 
 .../tools/pulse/tests/ui/PulseNoAuthTest.java   |   34 +
 gradle/dependency-versions.properties   |1 +
 16 files changed, 2523 insertions(+), 2592 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dfb87a59/.gitignore
--
diff --git a/.gitignore b/.gitignore
index 825e379..38c8131 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,8 @@ build/
 build-eclipse/
 /tags
 
+
+
 *.iml
 *.ipr
 *.iws
@@ -25,3 +27,4 @@ build-eclipse/
 *.orig
 geode-spark-connector/**/target/
 geode-spark-connector/project/project/
+geode-pulse/screenshots/
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dfb87a59/artifacts-jstewartgeode999/test/gemfire-jstewartgeode999-files.tgz
--
diff --git a/artifacts-jstewartgeode999/test/gemfire-jstewartgeode999-files.tgz 
b/artifacts-jstewartgeode999/test/gemfire-jstewartgeode999-files.tgz
new file mode 100644
index 000..a15d245
Binary files /dev/null and 
b/artifacts-jstewartgeode999/test/gemfire-jstewartgeode999-files.tgz differ

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dfb87a59/geode-pulse/build.gradle
--
diff --git a/geode-pulse/build.gradle b/geode-pulse/build.gradle
index c58da78..ef29ab3 100755
--- a/geode-pulse/build.gradle
+++ b/geode-pulse/build.gradle
@@ -68,6 +68,11 @@ dependencies {
   testCompile project(':geode-core')
   testCompile files(project(':geode-core').sourceSets.test.output)
 
+  testCompile(group: 'com.codeborne', name: 'phantomjsdriver', version: 
project.'phantomjsdriver.version') {
+  exclude module: 'selenium-remote-driver' //by artifact name
+  exclude module: 'selenium-java' //by artifact name
+  }
+
   testCompile 'org.seleniumhq.selenium:selenium-firefox-driver:' + 
project.'selenium.version'
   testCompile 'org.seleniumhq.selenium:selenium-api:' + 
project.'selenium.version'
   testCompile 'org.seleniumhq.selenium:selenium-remote-driver:' + 
project.'selenium.version'

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dfb87a59/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/driver/PulseUITest.java
--
diff --git 
a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/driver/PulseUITest.java
 
b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/driver/PulseUITest.java
index a4062e5..ced298b 100644
--- 
a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/driver/PulseUITest.java
+++ 
b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/driver/PulseUITest.java
@@ -16,7 +16,7 @@
  */
 package org.apache.geode.tools.pulse.testbed.driver;
 
-import static org.apache.geode.tools.pulse.tests.PulseAbstractTest.*;
+import static org.apache.geode.tools.pulse.tests.ui.PulseAbstractTest.*;
 import static org.junit.Assert.*;
 
 import java.net.InetAddress;

[46/50] [abbrv] incubator-geode git commit: GEODE-1353: Added listeners to slow down the receiver.

[udo]

GEODE-1353: Added listeners to slow down the receiver.

* Added a listener on after create to slow down the receiver.
* This was done to avoid the need for a very large number of puts.
* When region size is more than 5 it can initiate the destroy region
* While the puts have been reduced to 2000 from 20,000
* This will make sure the queue is not empty.


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

Branch: refs/heads/feature/GEODE-1874
Commit: 56836e59f39a273432b6e64904c41c7854f6446f
Parents: 5c50954
Author: nabarun 
Authored: Tue Oct 4 16:21:26 2016 -0700
Committer: nabarun 
Committed: Tue Oct 18 14:13:19 2016 -0700

--
 .../wan/serial/SerialWANStatsDUnitTest.java | 43 
 1 file changed, 25 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/56836e59/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
--
diff --git 
a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
 
b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
index 4db4890..ceca847 100644
--- 
a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
+++ 
b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
@@ -379,54 +379,61 @@ public class SerialWANStatsDUnitTest extends WANTestBase {
* 1 region and sender configured on local site and 1 region and a 
* receiver configured on remote site. Puts to the local region are in 
progress.
* Remote region is destroyed in the middle.
+   *
+   * Better fix : slowed down the receiver after every create event, So a huge 
number of puts is not required.
+   *
* 
* @throws Exception
*/
-  @Category(FlakyTest.class) // GEODE-1353
   @Test
   public void testReplicatedSerialPropagationWithRemoteRegionDestroy() throws 
Exception {
-  int numEntries = 2;
+  int numEntries = 2000;
 Integer lnPort = (Integer)vm0.invoke(() -> 
WANTestBase.createFirstLocatorWithDSId( 1 ));
 Integer nyPort = (Integer)vm1.invoke(() -> 
WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 
 //these are part of remote site
 vm2.invoke(() -> WANTestBase.createCache( nyPort ));
+
+//create one RR (RR_1) on remote site
+vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+  testName + "_RR_1", null, isOffHeap()  ));
+
+
 vm2.invoke(() -> WANTestBase.createReceiver());
 
+//This slows down the receiver
+vm2.invoke(() -> addListenerToSleepAfterCreateEvent(1000, testName + 
"_RR_1"));
+
+
 //these are part of local site
 vm4.invoke(() -> WANTestBase.createCache( lnPort ));
 vm5.invoke(() -> WANTestBase.createCache( lnPort ));
 vm6.invoke(() -> WANTestBase.createCache( lnPort ));
 vm7.invoke(() -> WANTestBase.createCache( lnPort ));
 
+//create one RR (RR_1) on local site
+vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+  testName + "_RR_1", "ln", isOffHeap()  ));
+vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+  testName + "_RR_1", "ln", isOffHeap()  ));
+vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+  testName + "_RR_1", "ln", isOffHeap()  ));
+vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+  testName + "_RR_1", "ln", isOffHeap()  ));
+
 //senders are created on local site
 vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
 false, 100, 100, false, false, null, true ));
 vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
 false, 100, 100, false, false, null, true ));
 
-//create one RR (RR_1) on remote site
-vm2.invoke(() -> WANTestBase.createReplicatedRegion(
-testName + "_RR_1", null, isOffHeap()  ));
-//This is to cause a scenario where we have received at least X events and 
want to slow the receiver
-vm2.invoke(() -> WANTestBase.longPauseAfterNumEvents(500, 200));
 //start the senders on local site
 startSenderInVMs("ln", vm4, vm5);
 
-//create one RR (RR_1) on local site
-vm4.invoke(() -> WANTestBase.createReplicatedRegion(
-testName + "_RR_1", "ln", isOffHeap()  ));
-vm5.invoke(() -> WANTestBase.createReplicatedRegion(
-testName + "_RR_1", "ln", isOffHeap()  ));
-vm6.invoke(() -> WANTestBase.createReplicatedRegion(
-testName + "_RR_1", "ln", isOffHeap()  ));
-vm7.invoke(() 

[06/50] [abbrv] incubator-geode git commit: GEODE-1180: Resolved as a part of bb44eb6d51144a3c9798d4323eabf3d4beab8cda

[udo]

GEODE-1180: Resolved as a part of bb44eb6d51144a3c9798d4323eabf3d4beab8cda

* Removed the flaky tag


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

Branch: refs/heads/feature/GEODE-1874
Commit: f079f37093979571527f4ab8c67c2f96758ced40
Parents: f223a2e
Author: nabarun 
Authored: Tue Oct 11 14:52:41 2016 -0700
Committer: nabarun 
Committed: Tue Oct 11 14:52:41 2016 -0700

--
 .../cache/wan/parallel/ParallelWANPropagationDUnitTest.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f079f370/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
--
diff --git 
a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
 
b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
index 3836098..c8bf32a 100644
--- 
a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
+++ 
b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/parallel/ParallelWANPropagationDUnitTest.java
@@ -705,7 +705,6 @@ public class ParallelWANPropagationDUnitTest extends 
WANTestBase {
 getTestMethodName() + "_PR", 1000 ));
   }
 
-  @Category(FlakyTest.class) // GEODE-1008 and GEODE-1180: random ports, async 
actions, thread sleeps, time sensitive, waitForCriterion
   @Test
   public void testPartitionedParallelPropagationHA() throws Exception {
 IgnoredException.addIgnoredException("Broken pipe");

[18/50] [abbrv] incubator-geode git commit: Edit README; rm pdf_header

[udo]

Edit README; rm pdf_header


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

Branch: refs/heads/feature/GEODE-1874
Commit: 14a32e2ebaa88726e3d70c9b69c1aacae3f3b4e1
Parents: 0b31275
Author: Joey McAllister 
Authored: Wed Oct 12 13:38:00 2016 -0700
Committer: Joey McAllister 
Committed: Wed Oct 12 13:38:00 2016 -0700

--
 .../master_middleman/source/pdf_header.html |  7 -
 geode-docs/README.md| 27 ++--
 2 files changed, 2 insertions(+), 32 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/14a32e2e/geode-book/master_middleman/source/pdf_header.html
--
diff --git a/geode-book/master_middleman/source/pdf_header.html 
b/geode-book/master_middleman/source/pdf_header.html
deleted file mode 100644
index a1925fd..000
--- a/geode-book/master_middleman/source/pdf_header.html
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-  
-
-
-  
-

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/14a32e2e/geode-docs/README.md
--
diff --git a/geode-docs/README.md b/geode-docs/README.md
index 199906e..9564079 100644
--- a/geode-docs/README.md
+++ b/geode-docs/README.md
@@ -2,7 +2,7 @@
 
 Apache Geode provides the full source for end-user documentation in markdown 
format. The latest check-ins to `incubator-geode/geode-docs` 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.
 
-Bookbinder is a 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.
+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.
 
 This document contains instructions for building and viewing the Geode 
documentation locally.
 
@@ -25,30 +25,7 @@ Bookbinder is meant to be used from within a project called 
a **book**. The book
 
 For Geode, a preconfigured **book** is provided in the directory `geode-book`, 
which gathers content from the directory `geode-docs`. You can use this 
configuration to build HTML for Geode on your local system.
 
-The installed `config.yml` file configures the Geode book for building 
locally. The file configures the local directory for the markdown source files. 
It uses the following configuration:
-
-  ```
-book_repo: apache/incubator-geode/geode-book
-public_host: localhost
-
-sections:
-- repository:
-name: geode-docs
-  directory: docs
-  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: http://geode.incubator.apache.org/community; 
target="_blank">Community
-  support_call_to_action: http://geode.incubator.apache.org/community; target="_blank">Need 
Help?
-  product_link: http://geode.incubator.apache.org/;>Back to Geode Page
-  domain_name: apache.org
-  book_title_short: Geode Docs
-
-broken_link_exclusions: iefix|using_custom_classes|arrowhead|cppdocs|DotNetDocs
-  ```
+The installed `config.yml` file configures the Geode book for building 
locally. The file configures the local directory for the markdown source files.
 
 ## Building the Documentation
 

[15/50] [abbrv] incubator-geode git commit: GEODE-1966: Unauthorized users cannot access pulseVersion details

[udo]

GEODE-1966: Unauthorized users cannot access pulseVersion details


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

Branch: refs/heads/feature/GEODE-1874
Commit: 6054e00431b1e3a0826b1e6937c867da3fb6e6ce
Parents: dfb87a5
Author: Jared Stewart 
Authored: Mon Oct 10 16:59:07 2016 -0700
Committer: Jinmei Liao 
Committed: Wed Oct 12 09:47:10 2016 -0700

--
 .../src/main/webapp/WEB-INF/spring-security.xml |   1 -
 .../tools/pulse/tests/ui/PulseAbstractTest.java |  11 +-
 .../pulse/tests/ui/PulseAnonymousUserTest.java  | 149 +++
 3 files changed, 158 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6054e004/geode-pulse/src/main/webapp/WEB-INF/spring-security.xml
--
diff --git a/geode-pulse/src/main/webapp/WEB-INF/spring-security.xml 
b/geode-pulse/src/main/webapp/WEB-INF/spring-security.xml
index 7efc356..b4fccf0 100644
--- a/geode-pulse/src/main/webapp/WEB-INF/spring-security.xml
+++ b/geode-pulse/src/main/webapp/WEB-INF/spring-security.xml
@@ -28,7 +28,6 @@



-   




http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6054e004/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAbstractTest.java
--
diff --git 
a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAbstractTest.java
 
b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAbstractTest.java
index 709a831..ad8f67b 100644
--- 
a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAbstractTest.java
+++ 
b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAbstractTest.java
@@ -198,7 +198,7 @@ public abstract class PulseAbstractTest extends 
PulseBaseTest {
 passwordElement.sendKeys(password);
 passwordElement.submit();
 
-Thread.sleep(3000);
+driver.get(pulseURL + "/clusterDetail.html");
 WebElement userNameOnPulsePage = (new WebDriverWait(driver, 10)).until(new 
ExpectedCondition() {
   @Override
   public WebElement apply(WebDriver d) {
@@ -207,7 +207,6 @@ public abstract class PulseAbstractTest extends 
PulseBaseTest {
 });
 assertNotNull(userNameOnPulsePage);
 driver.navigate().refresh();
-Thread.sleep(7000);
   }
 
   private static void setUpWebDriver() {
@@ -229,6 +228,7 @@ public abstract class PulseAbstractTest extends 
PulseBaseTest {
 
   @Before
   public void setup() throws Exception {
+driver.get(pulseURL + "/clusterDetail.html");
 // Make sure we go to the home page first
 
searchByXPathAndClick(PulseTestLocators.TopNavigation.clusterViewLinkXpath);
   }
@@ -975,4 +975,11 @@ public abstract class PulseAbstractTest extends 
PulseBaseTest {
 // Assert data regions are displayed
 assertTrue(driver.findElement(By.id("treeDemo_1")).isDisplayed());
   }
+
+  @Test
+  public void userCannotGetToPulseDetails() {
+driver.get(pulseURL + "/pulse/pulseVersion");
+
+assertTrue(driver.getPageSource().contains("sourceRevision"));
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6054e004/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAnonymousUserTest.java
--
diff --git 
a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAnonymousUserTest.java
 
b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAnonymousUserTest.java
new file mode 100644
index 000..1cf4ad4
--- /dev/null
+++ 
b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAnonymousUserTest.java
@@ -0,0 +1,149 @@
+/*
+ * 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 

[41/50] [abbrv] incubator-geode git commit: GEODE-2009: add FlakyTest category to testCreateAlterDestroyUpdatesSharedConfig

[udo]

GEODE-2009: add FlakyTest category to testCreateAlterDestroyUpdatesSharedConfig


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

Branch: refs/heads/feature/GEODE-1874
Commit: 7330733e31ea9fde5452ae983bb99d255f4ed2fc
Parents: 474ff41
Author: Kirk Lund 
Authored: Mon Oct 17 12:18:35 2016 -0700
Committer: Kirk Lund 
Committed: Mon Oct 17 16:30:19 2016 -0700

--
 .../cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7330733e/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
index 5fa06d9..effe294 100644
--- 
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateAlterDestroyRegionCommandsDUnitTest.java
@@ -785,6 +785,7 @@ public class CreateAlterDestroyRegionCommandsDUnitTest 
extends CliCommandTestBas
   /**
* Asserts that creating, altering and destroying regions correctly updates 
the shared configuration.
*/
+  @Category(FlakyTest.class) // GEODE-2009
   @Test
   public void testCreateAlterDestroyUpdatesSharedConfig() {
 disconnectAllFromDS();

[50/50] [abbrv] incubator-geode git commit: Merge branch 'feature/GEODE-1874' of https://git-wip-us.apache.org/repos/asf/incubator-geode into feature/GEODE-1874

[udo]

Merge branch 'feature/GEODE-1874' of 
https://git-wip-us.apache.org/repos/asf/incubator-geode into feature/GEODE-1874


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

Branch: refs/heads/feature/GEODE-1874
Commit: c330e5e567eeada8d606aad61a881134335bca40
Parents: 3a88f07 fb725ed
Author: Udo Kohlmeyer <ukohlme...@pivotal.io>
Authored: Wed Oct 19 09:52:44 2016 -0700
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Wed Oct 19 09:52:44 2016 -0700

--

--

[02/50] [abbrv] incubator-geode git commit: GEODE-1952 Add geode-book dir to build docs

[udo]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e9b44af4/geode-book/master_middleman/source/subnavs/geode-subnav.erb
--
diff --git a/geode-book/master_middleman/source/subnavs/geode-subnav.erb 
b/geode-book/master_middleman/source/subnavs/geode-subnav.erb
new file mode 100644
index 000..12ff6b2
--- /dev/null
+++ b/geode-book/master_middleman/source/subnavs/geode-subnav.erb
@@ -0,0 +1,3082 @@
+
+
+Doc Index
+
+
+
+
+Apache Geode 1.0.0-incubating 
Documentation
+
+
+Getting 
Started with Apache Geode
+
+
+About Apache Geode
+
+
+Main Features of Apache 
Geode
+
+
+Prerequisites 
and Installation Instructions
+
+
+Host Machine 
Requirements
+
+
+How to 
Install
+
+
+Setting Up the CLASSPATH
+
+
+How to Uninstall
+
+
+
+
+Apache Geode in 15 
Minutes or Less
+
+
+
+
+Configuring 
and Running a Cluster
+
+
+Overview of the 
Cluster Configuration Service
+
+
+Tutorial—Creating
 and Using a Cluster Configuration
+
+
+Deploying
 Application JARs to Apache Geode Members
+
+
+Using Member 
Groups
+
+
+Exporting and 
Importing Cluster Configurations
+
+
+Cluster
 Configuration Files and Troubleshooting
+
+
+Loading 
Existing Configuration Files into Cluster Configuration
+
+
+Using gfsh to Manage a 
Remote Cluster Over HTTP or HTTPS
+
+
+Deploying 
Configuration Files without the Cluster Configuration Service
+
+
+Main Steps to 
Deploying Configuration Files
+
+
+Default File 
Specifications and Search Locations
+
+
+Changing the File 
Specifications
+
+
+Deploying 
Configuration Files in JAR Files
+
+
+
+
+Starting Up and 
Shutting Down Your System
+
+
+Running Geode Locator 
Processes
+
+
+Running Geode 
Server Processes
+
+
+Managing System 
Output Files
+
+
+Firewall 
Considerations
+
+
+Firewalls and 
Connections
+
+
+Firewalls and Ports
+
+
+
+
+
+
+Basic 
Configuration and Programming
+
+
+
+Distributed System and Cache Configuration
+
+
+Distributed
 System Members
+
+
+Setting
 Properties
+
+
+Options for 
Configuring the Cache and Data Regions
+
+
+
+Local and Remote 
Membership and Caching
+

[05/50] [abbrv] incubator-geode git commit: GEODE-1952 Remove old redirects

[udo]

GEODE-1952 Remove old redirects


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

Branch: refs/heads/feature/GEODE-1874
Commit: 7592ba1027e51ae84dcfbed297534522557fbbec
Parents: e9b44af
Author: Joey McAllister 
Authored: Tue Oct 11 14:38:11 2016 -0700
Committer: Joey McAllister 
Committed: Tue Oct 11 14:38:11 2016 -0700

--
 geode-book/redirects.rb | 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7592ba10/geode-book/redirects.rb
--
diff --git a/geode-book/redirects.rb b/geode-book/redirects.rb
index 3f223dc..d71841a 100644
--- a/geode-book/redirects.rb
+++ b/geode-book/redirects.rb
@@ -1,5 +1,3 @@
 r301 %r{/releases/latest/javadoc/(.*)}, 
'http://geode.incubator.apache.org/releases/latest/javadoc/$1'
-r301 %r{/docs-gemfire/latest/cpp_api/(.*)}, 
'http://data-docs-samples.cfapps.io/docs-gemfire/latest/cpp_api/$1'
-r301 %r{/docs-gemfire/latest/net_api/(.*)}, 
'http://data-docs-samples.cfapps.io/docs-gemfire/latest/net_api/$1'
 rewrite '/', '/docs/about_geode.html'
 rewrite '/index.html', '/docs/about_geode.html'

[03/50] [abbrv] incubator-geode git commit: GEODE-1952 Add geode-book dir to build docs

[udo]

GEODE-1952 Add geode-book dir to build docs


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

Branch: refs/heads/feature/GEODE-1874
Commit: e9b44af4e996ac739cd632704e925d525b9fcca1
Parents: 1c98ba5
Author: Joey McAllister 
Authored: Tue Oct 11 14:24:40 2016 -0700
Committer: Joey McAllister 
Committed: Tue Oct 11 14:24:40 2016 -0700

--
 geode-book/.gitignore   |2 +
 geode-book/Gemfile  |5 +
 geode-book/Gemfile.lock |  203 ++
 geode-book/config.yml   |   23 +
 .../master_middleman/source/images/favicon.ico  |  Bin 0 -> 1317 bytes
 .../master_middleman/source/index.html.erb  |7 +
 .../master_middleman/source/javascripts/book.js |   16 +
 .../source/javascripts/waypoints/context.js |  300 ++
 .../source/javascripts/waypoints/group.js   |  105 +
 .../javascripts/waypoints/noframeworkAdapter.js |  213 ++
 .../source/javascripts/waypoints/sticky.js  |   63 +
 .../source/javascripts/waypoints/waypoint.js|  160 +
 .../source/layouts/_book-footer.erb |7 +
 .../master_middleman/source/layouts/_title.erb  |6 +
 .../master_middleman/source/pdf_header.html |7 +
 .../source/stylesheets/book-styles.css.scss |3 +
 .../stylesheets/partials/_book-base-values.scss |0
 .../source/stylesheets/partials/_book-vars.scss |   19 +
 .../source/subnavs/geode-subnav.erb | 3082 ++
 geode-book/redirects.rb |5 +
 20 files changed, 4226 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e9b44af4/geode-book/.gitignore
--
diff --git a/geode-book/.gitignore b/geode-book/.gitignore
new file mode 100644
index 000..0cae826
--- /dev/null
+++ b/geode-book/.gitignore
@@ -0,0 +1,2 @@
+output
+final_app

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e9b44af4/geode-book/Gemfile
--
diff --git a/geode-book/Gemfile b/geode-book/Gemfile
new file mode 100644
index 000..f66d333
--- /dev/null
+++ b/geode-book/Gemfile
@@ -0,0 +1,5 @@
+source "https://rubygems.org;
+
+gem 'bookbindery'
+
+gem 'libv8', '3.16.14.7'

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e9b44af4/geode-book/Gemfile.lock
--
diff --git a/geode-book/Gemfile.lock b/geode-book/Gemfile.lock
new file mode 100644
index 000..3c483c0
--- /dev/null
+++ b/geode-book/Gemfile.lock
@@ -0,0 +1,203 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+activesupport (4.2.7.1)
+  i18n (~> 0.7)
+  json (~> 1.7, >= 1.7.7)
+  minitest (~> 5.1)
+  thread_safe (~> 0.3, >= 0.3.4)
+  tzinfo (~> 1.1)
+addressable (2.4.0)
+ansi (1.5.0)
+bookbindery (9.12.0)
+  ansi (~> 1.4)
+  css_parser
+  elasticsearch
+  fog-aws (~> 0.7.1)
+  font-awesome-sass
+  git (~> 1.2.8)
+  middleman (~> 3.4.0)
+  middleman-livereload (~> 3.4.3)
+  middleman-syntax (~> 2.0)
+  nokogiri (= 1.6.7.2)
+  puma
+  rack-rewrite
+  redcarpet (~> 3.2.3)
+  rouge (!= 1.9.1)
+  therubyracer
+  thor
+builder (3.2.2)
+capybara (2.4.4)
+  mime-types (>= 1.16)
+  nokogiri (>= 1.3.3)
+  rack (>= 1.0.0)
+  rack-test (>= 0.5.4)
+  xpath (~> 2.0)
+chunky_png (1.3.6)
+coffee-script (2.4.1)
+  coffee-script-source
+  execjs
+coffee-script-source (1.10.0)
+compass (1.0.3)
+  chunky_png (~> 1.2)
+  compass-core (~> 1.0.2)
+  compass-import-once (~> 1.0.5)
+  rb-fsevent (>= 0.9.3)
+  rb-inotify (>= 0.9)
+  sass (>= 3.3.13, < 3.5)
+compass-core (1.0.3)
+  multi_json (~> 1.0)
+  sass (>= 3.3.0, < 3.5)
+compass-import-once (1.0.5)
+  sass (>= 3.2, < 3.5)
+css_parser (1.4.5)
+  addressable
+elasticsearch (2.0.0)
+  elasticsearch-api (= 2.0.0)
+  elasticsearch-transport (= 2.0.0)
+elasticsearch-api (2.0.0)
+  multi_json
+elasticsearch-transport (2.0.0)
+  faraday
+  multi_json
+em-websocket (0.5.1)
+  eventmachine (>= 0.12.9)
+  http_parser.rb (~> 0.6.0)
+erubis (2.7.0)
+eventmachine (1.2.0.1)
+excon (0.51.0)
+execjs (2.7.0)
+faraday (0.9.2)
+  multipart-post (>= 1.2, < 3)
+ffi (1.9.14)
+fog-aws (0.7.6)
+  fog-core (~> 1.27)
+  fog-json (~> 1.0)
+  fog-xml (~> 0.1)

[19/50] [abbrv] incubator-geode git commit: GEODE-999: remove accidentally checked in file.

[udo]

GEODE-999: remove accidentally checked in file.


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

Branch: refs/heads/feature/GEODE-1874
Commit: 582694d3d67511095531abc43f0646c22b038c7f
Parents: 313bbab
Author: Jinmei Liao 
Authored: Thu Oct 13 09:01:34 2016 -0700
Committer: Jinmei Liao 
Committed: Thu Oct 13 09:01:34 2016 -0700

--
 .../test/gemfire-jstewartgeode999-files.tgz   | Bin 877528 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/582694d3/artifacts-jstewartgeode999/test/gemfire-jstewartgeode999-files.tgz
--
diff --git a/artifacts-jstewartgeode999/test/gemfire-jstewartgeode999-files.tgz 
b/artifacts-jstewartgeode999/test/gemfire-jstewartgeode999-files.tgz
deleted file mode 100644
index a15d245..000
Binary files 
a/artifacts-jstewartgeode999/test/gemfire-jstewartgeode999-files.tgz and 
/dev/null differ

[10/50] [abbrv] incubator-geode git commit: GEODE-1979: refactor SecurityClusterConfig to remove the flakiness.

[udo]

GEODE-1979: refactor SecurityClusterConfig to remove the flakiness.

* add more test cases to cover more scenarios


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

Branch: refs/heads/feature/GEODE-1874
Commit: e15657e9de8bffdc8fa25249fcee86c46ce79928
Parents: 584337b
Author: Jinmei Liao 
Authored: Tue Oct 11 09:43:33 2016 -0700
Committer: Jinmei Liao 
Committed: Wed Oct 12 09:42:04 2016 -0700

--
 .../ClusterConfigWithoutSecurityDUnitTest.java  | 102 ++
 .../SecurityClusterConfigDUnitTest.java | 107 +--
 .../SecurityWithoutClusterConfigDUnitTest.java  |  92 
 .../security/StartServerAuthorizationTest.java  |  73 +
 .../rules/LocatorServerConfigurationRule.java   |  79 +++---
 .../LuceneClusterConfigurationDUnitTest.java|  24 +
 6 files changed, 223 insertions(+), 254 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e15657e9/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
new file mode 100644
index 000..3854bb1
--- /dev/null
+++ 
b/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
@@ -0,0 +1,102 @@
+/*
+ * 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.security;
+
+import static org.apache.geode.distributed.ConfigurationProperties.*;
+import static org.assertj.core.api.Java6Assertions.*;
+import static org.junit.Assert.*;
+
+import java.util.Properties;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.GemFireConfigException;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.internal.i18n.LocalizedStrings;
+import org.apache.geode.security.templates.SimpleSecurityManager;
+import org.apache.geode.test.dunit.IgnoredException;
+import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.dunit.rules.LocatorServerConfigurationRule;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.SecurityTest;
+
+@Category({ DistributedTest.class, SecurityTest.class })
+
+public class ClusterConfigWithoutSecurityDUnitTest extends 
JUnit4DistributedTestCase {
+
+  @Rule
+  public LocatorServerConfigurationRule lsRule = new 
LocatorServerConfigurationRule(this);
+
+  @Before
+  public void before() throws Exception {
+
IgnoredException.addIgnoredException(LocalizedStrings.GEMFIRE_CACHE_SECURITY_MISCONFIGURATION.toString());
+
IgnoredException.addIgnoredException(LocalizedStrings.GEMFIRE_CACHE_SECURITY_MISCONFIGURATION_2.toString());
+lsRule.getLocatorVM(new Properties());
+  }
+
+  @After
+  public void after() {
+IgnoredException.removeAllExpectedExceptions();
+  }
+
+  // when locator is not secured, a secured server should be allowed to start 
with its own security manager
+  // if use-cluster-config is false
+  @Test
+  public void 
serverShouldBeAllowedToStartWithSecurityIfNotUsingClusterConfig() throws 
Exception {
+Properties props = new Properties();
+props.setProperty(SECURITY_MANAGER, SimpleSecurityManager.class.getName());
+props.setProperty(SECURITY_POST_PROCESSOR, 
PDXPostProcessor.class.getName());
+
+props.setProperty("use-cluster-configuration", "false");
+
+// initial security properties 

[34/50] [abbrv] incubator-geode git commit: Merge remote-tracking branch 'origin/release/1.0.0-incubating' into develop

[udo]

Merge remote-tracking branch 'origin/release/1.0.0-incubating' 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/40c19179
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/40c19179
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/40c19179

Branch: refs/heads/feature/GEODE-1874
Commit: 40c19179bce99586ab6efef21f3e836a4b628733
Parents: a7b9ac1 a0de4c9
Author: Dan Smith 
Authored: Fri Oct 14 16:17:34 2016 -0700
Committer: Dan Smith 
Committed: Fri Oct 14 16:17:34 2016 -0700

--
 extensions/geode-modules-assembly/build.gradle  |   12 +-
 extensions/geode-modules-hibernate/build.gradle |   42 -
 .../geode/modules/hibernate/EnumType.java   |   57 -
 .../geode/modules/hibernate/GemFireCache.java   |  238 --
 .../modules/hibernate/GemFireCacheListener.java |   54 -
 .../modules/hibernate/GemFireCacheProvider.java |  200 -
 .../hibernate/GemFireQueryCacheFactory.java |   39 -
 .../modules/hibernate/GemFireRegionFactory.java |  221 --
 .../modules/hibernate/internal/Access.java  |  257 --
 .../ClientServerRegionFactoryDelegate.java  |  201 --
 .../hibernate/internal/CollectionAccess.java|  224 --
 .../hibernate/internal/EntityRegionWriter.java  |   87 -
 .../hibernate/internal/EntityVersion.java   |   27 -
 .../hibernate/internal/EntityVersionImpl.java   |   50 -
 .../hibernate/internal/EntityWrapper.java   |   89 -
 .../hibernate/internal/GemFireBaseRegion.java   |  166 -
 .../internal/GemFireCollectionRegion.java   |   59 -
 .../hibernate/internal/GemFireEntityRegion.java |  187 -
 .../internal/GemFireQueryResultsRegion.java |  113 -
 .../modules/hibernate/internal/KeyWrapper.java  |   92 -
 .../internal/NonStrictReadWriteAccess.java  |   83 -
 .../hibernate/internal/ReadOnlyAccess.java  |   55 -
 .../hibernate/internal/ReadWriteAccess.java |   36 -
 .../internal/RegionFactoryDelegate.java |  146 -
 .../hibernate/internal/TransactionalAccess.java |   25 -
 .../java/org/apache/geode/modules/Event.java|   67 -
 .../geode/modules/HibernateJUnitTest.java   |  416 ---
 .../java/org/apache/geode/modules/Owner.java|  185 -
 .../java/org/apache/geode/modules/Person.java   |   72 -
 .../org/apache/geode/modules/SecondVMTest.java  |   95 -
 .../src/test/resources/log4j.properties |   16 -
 .../org/apache/geode/modules/Event.hbm.xml  |   32 -
 .../org/apache/geode/modules/Person.hbm.xml |   36 -
 geode-book/.gitignore   |2 +
 geode-book/Gemfile  |   22 +
 geode-book/Gemfile.lock |  203 ++
 geode-book/README.md|   60 +
 geode-book/config.yml   |   37 +
 .../master_middleman/source/images/favicon.ico  |  Bin 0 -> 1317 bytes
 .../master_middleman/source/index.html.erb  |   23 +
 .../master_middleman/source/javascripts/book.js |   31 +
 .../source/javascripts/waypoints/context.js |  315 ++
 .../source/javascripts/waypoints/group.js   |  120 +
 .../javascripts/waypoints/noframeworkAdapter.js |  228 ++
 .../source/javascripts/waypoints/sticky.js  |   78 +
 .../source/javascripts/waypoints/waypoint.js|  175 +
 .../source/layouts/_book-footer.erb |   23 +
 .../master_middleman/source/layouts/_title.erb  |   21 +
 .../source/stylesheets/book-styles.css.scss |   18 +
 .../stylesheets/partials/_book-base-values.scss |   14 +
 .../source/stylesheets/partials/_book-vars.scss |   33 +
 .../source/subnavs/geode-subnav.erb | 3098 
 geode-book/redirects.rb |   18 +
 geode-docs/.gitignore   |6 +
 geode-docs/CONTRIBUTE.md|   33 +
 geode-docs/about_geode.html.md.erb  |   26 +
 geode-docs/basic_config/book_intro.html.md.erb  |   40 +
 .../chapter_overview.html.md.erb|   40 +
 ...uted_system_member_configuration.html.md.erb |   51 +
 .../config_concepts/local_vs_remote.html.md.erb |   29 +
 .../chapter_overview.html.md.erb|   32 +
 .../managing_data_entries.html.md.erb   |  146 +
 .../using_custom_classes.html.md.erb|   51 +
 .../data_regions/chapter_overview.html.md.erb   |   65 +
 .../create_a_region_with_API.html.md.erb|   80 +
 .../create_a_region_with_cacheXML.html.md.erb   |   85 +
 .../create_a_region_with_gfsh.html.md.erb   |   55 +
 .../creating_custom_attributes.html.md.erb  |   64 +
 .../managing_data_regions.html.md.erb   |  222 ++
 .../managing_region_attributes.html.md.erb  |  113 +
 .../new_region_existing_data.html.md.erb|   28 +
 .../data_regions/region_naming.html.md.erb  |   31 +
 

[38/50] [abbrv] incubator-geode git commit: GEODE-2004: Create/update/delete query through rest api should require DATA:READ instead of DATA:WRITE

[udo]

GEODE-2004: Create/update/delete query through rest api should require 
DATA:READ instead of DATA:WRITE

* This closes #262


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

Branch: refs/heads/feature/GEODE-1874
Commit: cf09ac94ddbd3c0a8dca9a94eac53d95871f1691
Parents: 5abe957
Author: Kevin Duling 
Authored: Mon Oct 17 11:02:54 2016 -0700
Committer: Jinmei Liao 
Committed: Mon Oct 17 11:55:44 2016 -0700

--
 .../geode/rest/internal/web/RestSecurityIntegrationTest.java   | 6 +++---
 .../rest/internal/web/controllers/QueryAccessController.java   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cf09ac94/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
--
diff --git 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
index ef019a4..6e91894 100644
--- 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
+++ 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityIntegrationTest.java
@@ -138,7 +138,7 @@ public class RestSecurityIntegrationTest {
 assertEquals(401, getCode(response));
 response = doPost("/queries?id=0=", "stranger", "1234567", "");
 assertEquals(403, getCode(response));
-response = doPost("/queries?id=0=", "dataWriter", "1234567", "");
+response = doPost("/queries?id=0=", "dataReader", "1234567", "");
 // because we're only testing the security of the endpoint, not the 
endpoint functionality, a 500 is acceptable
 assertEquals(500, getCode(response));
   }
@@ -149,7 +149,7 @@ public class RestSecurityIntegrationTest {
 assertEquals(401, getCode(response));
 response = doPost("/queries/id", "stranger", "1234567", "{\"id\" : 
\"foo\"}");
 assertEquals(403, getCode(response));
-response = doPost("/queries/id", "dataWriter", "1234567", "{\"id\" : 
\"foo\"}");
+response = doPost("/queries/id", "dataReader", "1234567", "{\"id\" : 
\"foo\"}");
 // because we're only testing the security of the endpoint, not the 
endpoint functionality, a 500 is acceptable
 assertEquals(500, getCode(response));
   }
@@ -160,7 +160,7 @@ public class RestSecurityIntegrationTest {
 assertEquals(401, getCode(response));
 response = doPut("/queries/id", "stranger", "1234567", "{\"id\" : 
\"foo\"}");
 assertEquals(403, getCode(response));
-response = doPut("/queries/id", "dataWriter", "1234567", "{\"id\" : 
\"foo\"}");
+response = doPut("/queries/id", "dataReader", "1234567", "{\"id\" : 
\"foo\"}");
 // We should get a 404 because we're trying to update a query that doesn't 
exist
 assertEquals(404, getCode(response));
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cf09ac94/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/QueryAccessController.java
--
diff --git 
a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/QueryAccessController.java
 
b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/QueryAccessController.java
index e43e5e6..d13c99c 100644
--- 
a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/QueryAccessController.java
+++ 
b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/QueryAccessController.java
@@ -137,7 +137,7 @@ public class QueryAccessController extends 
AbstractBaseController {
 @ApiResponse( code = 409, message = "QueryId already assigned to other 
query." ),
 @ApiResponse( code = 500, message = "GemFire throws an error or 
exception." )
   } )
-  @PreAuthorize("@securityService.authorize('DATA', 'WRITE')")
+  @PreAuthorize("@securityService.authorize('DATA', 'READ')")
   public ResponseEntity create(@RequestParam("id") final String queryId,
   @RequestParam(value = "q", required = false) 
String oqlInUrl,
   @RequestBody(required = false) final String 
oqlInBody)
@@ -234,7 +234,7 @@ public class QueryAccessController extends 
AbstractBaseController {
   } )
   @ResponseBody
   @ResponseStatus(HttpStatus.OK)
-  @PreAuthorize("@securityService.authorize('DATA', 'WRITE')")
+  

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

[udo]

Merge remote-tracking branch 'origin/develop' into develop


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

Branch: refs/heads/feature/GEODE-1874
Commit: 3068fb6946795f9f9790d0fb29d7c5f8068f99ac
Parents: 40c1917 de62159
Author: Dan Smith 
Authored: Fri Oct 14 16:21:32 2016 -0700
Committer: Dan Smith 
Committed: Fri Oct 14 16:21:32 2016 -0700

--
 .gitignore  |3 +
 .../internal/web/RestSecurityDUnitTest.java |  180 ---
 .../web/RestSecurityEndpointsDUnitTest.java |  422 ---
 .../web/RestSecurityIntegrationTest.java|  497 +
 .../client/internal/ExecuteFunctionOp.java  |4 +-
 .../ExecuteRegionFunctionSingleHopOp.java   |2 -
 .../internal/index/CompactMapRangeIndex.java|9 +-
 .../internal/InternalDistributedSystem.java |   68 +-
 .../membership/InternalDistributedMember.java   |7 +-
 .../cache/AbstractBucketRegionQueue.java|   34 +-
 .../geode/internal/cache/BucketRegionQueue.java |   59 +-
 .../geode/internal/cache/GemFireCacheImpl.java  |6 +-
 .../cache/execute/ServerFunctionExecutor.java   |5 +-
 .../execute/ServerRegionFunctionExecutor.java   |3 +-
 .../util/SynchronizedResultCollector.java   |   57 +
 .../internal/cache/tier/sockets/HandShake.java  |8 +-
 .../parallel/ParallelGatewaySenderQueue.java|   35 +-
 .../wan/serial/SerialGatewaySenderQueue.java|   26 +-
 .../security/IntegratedSecurityService.java |   29 +-
 .../internal/security/SecurityService.java  |7 +-
 .../geode/security/ResourcePermission.java  |4 +-
 .../AutoConnectionSourceImplJUnitTest.java  |   27 +
 .../MapRangeIndexMaintenanceJUnitTest.java  |  617 ++-
 .../cache/execute/FunctionServiceBase.java  |1 +
 .../ha/BlockingHARegionQueueJUnitTest.java  |  182 ++-
 .../internal/cache/ha/Bug48571DUnitTest.java|   13 +-
 .../cache/ha/HARegionQueueJUnitTest.java|  252 ++---
 .../tier/sockets/HAInterestPart2DUnitTest.java  |3 +-
 .../ParallelGatewaySenderQueueJUnitTest.java|  134 ++-
 .../management/ClientHealthStatsDUnitTest.java  |2 +
 .../cli/commands/QueueCommandsDUnitTest.java|1 +
 .../SharedConfigurationUsingDirDUnitTest.java   |1 +
 .../security/AccessControlMBeanJUnitTest.java   |7 +-
 ...CacheServerMBeanAuthenticationJUnitTest.java |7 +-
 .../CacheServerMBeanAuthorizationJUnitTest.java |   13 +-
 .../CacheServerMBeanShiroJUnitTest.java |   30 +-
 .../security/CacheServerStartupRule.java|   74 ++
 .../security/CliCommandsSecurityTest.java   |9 +-
 .../security/DataCommandsSecurityTest.java  |   11 +-
 .../DiskStoreMXBeanSecurityJUnitTest.java   |9 +-
 .../GatewayReceiverMBeanSecurityTest.java   |9 +-
 .../GatewaySenderMBeanSecurityTest.java |9 +-
 .../security/GfshCommandsPostProcessorTest.java |   30 +-
 .../security/GfshCommandsSecurityTest.java  |   48 +-
 .../security/GfshShellConnectionRule.java   |5 +-
 .../security/JMXConnectionConfiguration.java|   33 -
 .../security/JavaRmiServerNameTest.java |   28 +-
 .../JsonAuthorizationCacheStartRule.java|   86 --
 .../LockServiceMBeanAuthorizationJUnitTest.java |   11 +-
 .../security/MBeanSecurityJUnitTest.java|   10 +-
 .../security/MBeanServerConnectionRule.java |  130 ---
 .../ManagerMBeanAuthorizationJUnitTest.java |9 +-
 .../security/MemberMBeanSecurityJUnitTest.java  |   13 +-
 .../security/ResourcePermissionTest.java|   25 +-
 .../internal/security/ShiroCacheStartRule.java  |   64 --
 .../security/AbstractSecureServerDUnitTest.java |  104 +-
 ...lusterConfigWithEmbededLocatorDUnitTest.java |   67 ++
 .../ClusterConfigWithoutSecurityDUnitTest.java  |  100 ++
 .../security/IntegratedClientAuthDUnitTest.java |   19 +-
 .../NoShowValue1PostProcessorDUnitTest.java |8 +-
 .../security/PDXPostProcessorDUnitTest.java |   18 +-
 .../geode/security/PostProcessorDUnitTest.java  |   10 +-
 .../SecurityClusterConfigDUnitTest.java |  134 +--
 .../SecurityWithoutClusterConfigDUnitTest.java  |  100 +-
 .../security/StartServerAuthorizationTest.java  |   72 +-
 .../dunit/rules/ConnectionConfiguration.java|   34 +
 .../rules/LocatorServerConfigurationRule.java   |  141 ---
 .../dunit/rules/LocatorServerStartupRule.java   |  133 +++
 .../geode/test/dunit/rules/LocatorStarter.java  |   74 ++
 .../dunit/rules/MBeanServerConnectionRule.java  |  132 +++
 .../geode/test/dunit/rules/ServerStarter.java   |   99 ++
 .../geode/security/CQClientAuthDunitTest.java   |6 +-
 

[40/50] [abbrv] incubator-geode git commit: GEODE-706 Fixed race condition between expiry thread and put thread.

[udo]

GEODE-706 Fixed race condition between expiry thread and put thread.

There was possibility that expiry thread destroying the entry and
another thread doing update on same key. In this case expiry thread
cancel's existing task and update thread adds expiry task. But this
tasks are refer by regionEntry, which is same for both the threads.
So in this case if expiry thread cancel's task after update thread
then that entry will never expire.


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

Branch: refs/heads/feature/GEODE-1874
Commit: a3bd256648e30b0bf04c565a8f21d00868c29806
Parents: f1df6fc
Author: Hitesh Khamesra 
Authored: Fri Oct 14 14:00:25 2016 -0700
Committer: Hitesh Khamesra 
Committed: Mon Oct 17 14:30:46 2016 -0700

--
 .../geode/internal/cache/AbstractRegionMap.java  |  4 ++--
 .../geode/internal/cache/EntryEventImpl.java |  9 +
 .../geode/internal/cache/EntryExpiryTask.java|  3 ++-
 .../apache/geode/internal/cache/LocalRegion.java | 19 +++
 4 files changed, 28 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a3bd2566/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 5861e9a..e02c7e1 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
@@ -1513,9 +1513,9 @@ public abstract class AbstractRegionMap implements 
RegionMap {
   } finally {
 if (opCompleted) {
   if (re != null) {
-owner.cancelExpiryTask(re);
+owner.cancelExpiryTask(re, event.getExpiryTask());
   } else if (tombstone != null) {
-owner.cancelExpiryTask(tombstone);
+owner.cancelExpiryTask(tombstone, event.getExpiryTask());
   }
 }
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a3bd2566/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java 
b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java
index 6a964c0..d059aab 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryEventImpl.java
@@ -73,6 +73,7 @@ public class EntryEventImpl
   // PACKAGE FIELDS //
   public transient LocalRegion region;
   private transient RegionEntry re;
+  private transient ExpiryTask expiryTask;
 
   protected KeyInfo keyInfo;
 
@@ -2853,4 +2854,12 @@ public class EntryEventImpl
   public boolean isOldValueOffHeap() {
 return isOffHeapReference(this.oldValue);
   }
+
+  public ExpiryTask getExpiryTask() {
+return expiryTask;
+  }
+
+  public void setExpiryTask(ExpiryTask expiryTask) {
+this.expiryTask = expiryTask;
+  }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a3bd2566/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java 
b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java
index 816f32f..0c20d32 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/EntryExpiryTask.java
@@ -117,6 +117,7 @@ public class EntryExpiryTask extends ExpiryTask {
 @Released EntryEventImpl event = EntryEventImpl.create(
 lr, Operation.EXPIRE_DESTROY, key, null,
 createExpireEntryCallback(lr, key), false, lr.getMyId());
+event.setExpiryTask(this);
 try {
 event.setPendingSecondaryExpireDestroy(isPending);
 if (lr.generateEventID()) {
@@ -229,7 +230,7 @@ public class EntryExpiryTask extends ExpiryTask {
 // so the next call to addExpiryTaskIfAbsent will
 // add a new task instead of doing nothing, which would
 // erroneously cancel expiration for this key.
-

[44/50] [abbrv] incubator-geode git commit: GEODE-2007: fix unchecked warnings

[udo]

GEODE-2007: fix unchecked warnings


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

Branch: refs/heads/feature/GEODE-1874
Commit: a53c4b1509867a1847b8a21ef8b926911f874bb1
Parents: 7330733
Author: Kirk Lund 
Authored: Mon Oct 17 12:49:00 2016 -0700
Committer: Kirk Lund 
Committed: Mon Oct 17 16:30:19 2016 -0700

--
 .../apache/geode/modules/session/catalina/DeltaSession7.java  | 3 +--
 .../modules/session/Tomcat8SessionsClientServerDUnitTest.java | 3 ++-
 .../org/apache/geode/internal/cache/GemFireCacheImpl.java | 2 +-
 .../org/apache/geode/internal/cache/ha/HARegionQueue.java | 7 ---
 .../cache/tier/sockets/DeltaPropagationWithCQDUnitTest.java   | 4 ++--
 .../test/java/org/apache/geode/OldClientSupportDUnitTest.java | 4 ++--
 6 files changed, 12 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a53c4b15/extensions/geode-modules-tomcat7/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession7.java
--
diff --git 
a/extensions/geode-modules-tomcat7/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession7.java
 
b/extensions/geode-modules-tomcat7/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession7.java
index 0df05ff..c0dfe23 100644
--- 
a/extensions/geode-modules-tomcat7/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession7.java
+++ 
b/extensions/geode-modules-tomcat7/src/main/java/org/apache/geode/modules/session/catalina/DeltaSession7.java
@@ -535,8 +535,7 @@ public class DeltaSession7 extends StandardSession 
implements DataSerializable,
 }
   }
 
-  @SuppressWarnings({"unchecked", "rawtypes"})
-  protected ConcurrentMap readInAttributes(final DataInput in) throws 
IOException, ClassNotFoundException {
+  protected ConcurrentMap readInAttributes(final DataInput in) 
throws IOException, ClassNotFoundException {
 return DataSerializer.readObject(in);
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a53c4b15/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
--
diff --git 
a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
 
b/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
index 8b29048..384689e 100644
--- 
a/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
+++ 
b/extensions/geode-modules-tomcat8/src/test/java/org/apache/geode/modules/session/Tomcat8SessionsClientServerDUnitTest.java
@@ -19,6 +19,7 @@ package org.apache.geode.modules.session;
 import static org.apache.geode.distributed.ConfigurationProperties.*;
 import static org.apache.geode.internal.cache.CacheServerLauncher.serverPort;
 
+import java.util.List;
 import java.util.Properties;
 
 import org.junit.experimental.categories.Category;
@@ -49,7 +50,7 @@ public class Tomcat8SessionsClientServerDUnitTest extends 
TestSessionsTomcat8Bas
   @Override
   public void preTearDown() {
 vm0.invoke(() -> {
-  GemFireCacheImpl.getInstance().getCacheServers().forEach(e -> 
((CacheServer)e).stop());
+  (GemFireCacheImpl.getInstance().getCacheServers()).forEach(cacheServer 
-> cacheServer.stop());
 });
 server.stopContainer();
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a53c4b15/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
index 6c195e7..f673ded 100755
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
@@ -4015,7 +4015,7 @@ public class GemFireCacheImpl implements InternalCache, 
ClientCache, HasCachePer
 }
   }
 
-  public List getCacheServers() {
+  public List getCacheServers() {
 List cacheServersWithoutReceiver = null;
 if (!allCacheServers.isEmpty()) {
 Iterator allCacheServersIterator = allCacheServers.iterator();

[39/50] [abbrv] incubator-geode git commit: GEODE-1883 AuthInitializer should be made optional

[udo]

GEODE-1883 AuthInitializer should be made optional

Documentation of how a cache client may set its credentials
for authentication is revised to no longer state that the
client can set the two security properties. When this
bug is fixed, the documentation should be revised again.


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

Branch: refs/heads/feature/GEODE-1874
Commit: f1df6fc5920d0d1eebd210e816e61ad44074d39d
Parents: cf09ac9
Author: Karen Miller 
Authored: Mon Oct 17 12:58:33 2016 -0700
Committer: Karen Miller 
Committed: Mon Oct 17 12:58:33 2016 -0700

--
 .../implementing_authentication.html.md.erb | 22 
 1 file changed, 22 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f1df6fc5/geode-docs/managing/security/implementing_authentication.html.md.erb
--
diff --git 
a/geode-docs/managing/security/implementing_authentication.html.md.erb 
b/geode-docs/managing/security/implementing_authentication.html.md.erb
index 374a95e..c66be1a 100644
--- a/geode-docs/managing/security/implementing_authentication.html.md.erb
+++ b/geode-docs/managing/security/implementing_authentication.html.md.erb
@@ -77,6 +77,7 @@ sender or receiver.
 
 ## How a Cache Client Sets Its Credential
 
+
+
+In order to connect with a locator or a server that does authentication,
+a client will need to set its credential, composed of the two properties
+`security-username` and `security-password`.
+To accomplish this:
 
 - Implement the `getCredentials` method of the `AuthInitialize` interface
 for the client.

[48/50] [abbrv] incubator-geode git commit: GEODE-1874: Changed setNextNeighbor to not create HashMap for every p2p invocation

[udo]

GEODE-1874: Changed setNextNeighbor to not create HashMap for every p2p 
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/358fca74
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/358fca74
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/358fca74

Branch: refs/heads/feature/GEODE-1874
Commit: 358fca74568a33c40ffbfd741c85b996e9c69769
Parents: e130e5b
Author: Udo Kohlmeyer <ukohlme...@pivotal.io>
Authored: Wed Oct 12 11:54:33 2016 +1100
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Wed Oct 19 08:41:29 2016 -0700

--
 .../membership/gms/fd/GMSHealthMonitor.java | 394 ++-
 1 file changed, 210 insertions(+), 184 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/358fca74/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
index aafb498..97a413c 100644
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
@@ -16,9 +16,7 @@
  */
 package org.apache.geode.distributed.internal.membership.gms.fd;
 
-import static 
org.apache.geode.internal.DataSerializableFixedID.HEARTBEAT_REQUEST;
-import static 
org.apache.geode.internal.DataSerializableFixedID.HEARTBEAT_RESPONSE;
-import static 
org.apache.geode.internal.DataSerializableFixedID.SUSPECT_MEMBERS_MESSAGE;
+import static org.apache.geode.internal.DataSerializableFixedID.*;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -29,7 +27,19 @@ import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketTimeoutException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Timer;
+import java.util.TimerTask;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutorService;
@@ -40,7 +50,7 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.*;
+import java.util.stream.Collectors;
 
 import org.apache.logging.log4j.Logger;
 import org.jgroups.util.UUID;
@@ -69,7 +79,7 @@ import 
org.apache.geode.internal.security.SecurableCommunicationChannel;
 
 /**
  * Failure Detection
- * 
+ * 
  * This class make sure that each member is alive and communicating to this 
member.
  * To make sure that we create the ring of members based on current view. On 
this
  * ring, each member make sure that next-member in ring is communicating with 
it.
@@ -77,17 +87,16 @@ import 
org.apache.geode.internal.security.SecurableCommunicationChannel;
  * member has not communicated in last period(member-timeout) then we check 
whether
  * this member is still alive or not. Based on that we informed probable 
coordinators
  * to remove that member from view.
- * 
+ * 
  * It has {@link #suspect(InternalDistributedMember, String)} api, which can 
be used
  * to initiate suspect processing for any member. First is checks whether the 
member is
  * responding or not. Then it informs probable coordinators to remove that 
member from
  * view.
- * 
+ * 
  * It has {@link #checkIfAvailable(DistributedMember, String, boolean)} api to 
see
  * if that member is alive. Then based on removal flag it initiates the 
suspect processing
  * for that member.
- * 
- * */
+ */
 @SuppressWarnings({ "SynchronizationOnLocalVariableOrMethodParameter", 
"NullableProblems" })
 public class GMSHealthMonitor implements HealthMonitor, MessageHandler {
 
@@ -99,9 +108,11 @@ public class GMSHealthMonitor implements HealthMonitor, 
MessageHandler {
   volatile private boolean isStopping = false;
   private final AtomicInteger requestId = new AtomicInteger();
 
-  /** membership logger */
+  /**
+   * membership logger
+   */
   private static final Logger logger = Services.getLogger();
-  
+
   /**
* The number of recipients of periodic heartbeats.  The recipients will
* be selected 

[37/50] [abbrv] incubator-geode git commit: GEODE-1993: allow LocatorServerStartupRule to save server's ports as well.

[udo]

GEODE-1993: allow LocatorServerStartupRule to save server's ports as well.

* added more tetss


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

Branch: refs/heads/feature/GEODE-1874
Commit: 5abe957ca1cd42eeaf82549c275711e6e94dddec
Parents: 1fb0d0a
Author: Jinmei Liao 
Authored: Mon Oct 17 08:08:39 2016 -0700
Committer: Jinmei Liao 
Committed: Mon Oct 17 08:08:39 2016 -0700

--
 .../ClusterConfigWithoutSecurityDUnitTest.java  |   4 +-
 .../security/PeerAuthenticatorDUnitTest.java|  63 
 ...eerSecurityWithEmbeddedLocatorDUnitTest.java | 102 +++
 .../SecurityClusterConfigDUnitTest.java |  10 +-
 .../SecurityWithoutClusterConfigDUnitTest.java  |   2 +-
 .../security/StartServerAuthorizationTest.java  |   4 +-
 .../dunit/rules/LocatorServerStartupRule.java   |  12 ++-
 .../LuceneClusterConfigurationDUnitTest.java|   2 +-
 8 files changed, 140 insertions(+), 59 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5abe957c/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
index 72dbd1a..1bbfa0f 100644
--- 
a/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/security/ClusterConfigWithoutSecurityDUnitTest.java
@@ -71,7 +71,7 @@ public class ClusterConfigWithoutSecurityDUnitTest extends 
JUnit4DistributedTest
 
 // initial security properties should only contain initial set of values
 ServerStarter serverStarter = new ServerStarter(props);
-serverStarter.startServer(lsRule.getLocatorPort(0));
+serverStarter.startServer(lsRule.getPort(0));
 DistributedSystem ds = serverStarter.cache.getDistributedSystem();
 
 // after cache is created, the configuration won't chagne
@@ -92,7 +92,7 @@ public class ClusterConfigWithoutSecurityDUnitTest extends 
JUnit4DistributedTest
 
 ServerStarter serverStarter = new ServerStarter(props);
 
-assertThatThrownBy(() -> 
serverStarter.startServer(lsRule.getLocatorPort(0)))
+assertThatThrownBy(() -> serverStarter.startServer(lsRule.getPort(0)))
   .isInstanceOf(GemFireConfigException.class)
   
.hasMessage(LocalizedStrings.GEMFIRE_CACHE_SECURITY_MISCONFIGURATION.toLocalizedString());
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5abe957c/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
index bb147c7..b12ea43 100644
--- 
a/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
@@ -20,73 +20,50 @@ package org.apache.geode.security;
 import static org.apache.geode.distributed.ConfigurationProperties.*;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import java.io.File;
 import java.util.Properties;
 
 import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import org.apache.geode.distributed.Locator;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.security.templates.DummyAuthenticator;
-import org.apache.geode.test.dunit.Host;
 import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
+import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
+import org.apache.geode.test.dunit.rules.ServerStarter;
 import org.apache.geode.test.junit.categories.DistributedTest;
 import org.apache.geode.test.junit.categories.SecurityTest;
 
 @Category({ DistributedTest.class, SecurityTest.class })
 public class PeerAuthenticatorDUnitTest extends JUnit4DistributedTestCase {
-  protected VM locator = null;
-  protected VM server = null;
-  protected VM server1 = null;
+  @Rule
+  public LocatorServerStartupRule lsRule = new LocatorServerStartupRule();
 
   @Before
   public void before() throws Exception {
-final Host host = Host.getHost(0);
-

[36/50] [abbrv] incubator-geode git commit: Reverting gradle.properties change that came from the release branch

[udo]

Reverting gradle.properties change that came from the release branch

The release type should be SNAPSHOT on 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/1fb0d0a9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/1fb0d0a9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/1fb0d0a9

Branch: refs/heads/feature/GEODE-1874
Commit: 1fb0d0a9d7105e49593dd7366b2337ad2e88417a
Parents: 3068fb6
Author: Dan Smith 
Authored: Fri Oct 14 16:33:40 2016 -0700
Committer: Dan Smith 
Committed: Fri Oct 14 16:33:40 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1fb0d0a9/gradle.properties
--
diff --git a/gradle.properties b/gradle.properties
index e97463e..ed2cd86 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -29,7 +29,7 @@ releaseQualifier =
 # -SNAPSHOT - development version
 #- release
 # This is only really relevant for Maven artifacts.
-releaseType = 
+releaseType = -SNAPSHOT
 
 # Set the buildId to add build metadata that can be viewed from
 # gfsh or pulse (`gfsh version --full`). Can be set using

[07/50] [abbrv] incubator-geode git commit: GEODE-1952 Update docs README, config

[udo]

GEODE-1952 Update docs README, config


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

Branch: refs/heads/feature/GEODE-1874
Commit: 36d1f39d68a847dc574e267c51efa89f9c980bd6
Parents: 7592ba1
Author: Joey McAllister 
Authored: Tue Oct 11 15:54:54 2016 -0700
Committer: Joey McAllister 
Committed: Tue Oct 11 15:54:54 2016 -0700

--
 geode-book/config.yml |  9 ++---
 geode-docs/README.md  | 92 +-
 2 files changed, 44 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/36d1f39d/geode-book/config.yml
--
diff --git a/geode-book/config.yml b/geode-book/config.yml
index 1a74e82..74003f0 100644
--- a/geode-book/config.yml
+++ b/geode-book/config.yml
@@ -1,6 +1,5 @@
 book_repo: apache/incubator-geode/geode-book
-
-public_host: http://geode.incubator.apache.org/docs/
+public_host: localhost
 
 sections:
 - repository:
@@ -11,13 +10,11 @@ sections:
 template_variables:
   support_url: http://geode.incubator.apache.org/community
   product_url: http://geode.incubator.apache.org/
-  book_title: Apache Geode (Incubating) Documentation (Develop)
-  cse_id: 012029519579280034868:3hzywhss5ik
+  book_title: Apache Geode (Incubating) Documentation
   support_link: http://geode.incubator.apache.org/community; 
target="_blank">Community
   support_call_to_action: http://geode.incubator.apache.org/community; target="_blank">Need 
Help?
   product_link: http://geode.incubator.apache.org/;>Back to Geode Page
-  ga_account_id: UA-39702075-1
   domain_name: apache.org
-  book_title_short: Geode Docs (Develop)
+  book_title_short: Geode Docs
 
 broken_link_exclusions: iefix|using_custom_classes|arrowhead|cppdocs|DotNetDocs

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/36d1f39d/geode-docs/README.md
--
diff --git a/geode-docs/README.md b/geode-docs/README.md
index a018ca1..bc70325 100644
--- a/geode-docs/README.md
+++ b/geode-docs/README.md
@@ -1,93 +1,83 @@
 # Project Geode End-User Documentation
 
-The latest check-ins to `project-geode/docs` are automatically built and 
published to .
+Apache Geode provides the full source for end-user documentation in markdown 
format. The latest check-ins to `incubator-geode/geode-docs` 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.
 
-Project Geode provides the full source for end-user documentation in markdown 
format. The markdown can be built into HTML using 
[Bookbinder](https://github.com/pivotal-cf/bookbinder).
+Bookbinder is a 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.
 
-Bookbinder is a gem that binds together 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.
+This document contains instructions for building and viewing the Geode 
documentation locally, as well as for publishing it to the Geode website. It 
contains the sections:
 
-This document contains instructions for building the local Geode documentation 
and publishing it to Cloud Foundry or Pivotal Web Services. It contains the 
sections:
-
-- [Bookbinder Usage](#usage)
 - [Prerequisites](#prereq)
+- [Bookbinder Usage](#usage)
 - [Building the Documentation](#building)
 - [Publishing the Documentation](#publishing)
-- [Getting More Information](#moreinfo)
 
-[]()
+## Prerequisites
 
-## Bookbinder Usage
+Bookbinder requires Ruby version 2.0.0-p195 or higher.
 
-Bookbinder is meant to be used from within a project called a **book**. The 
book includes a configuration file that describes which documentation 
repositories to use as source materials. Bookbinder provides a set of scripts 
to aggregate those repositories and publish them to various locations.
+Follow the instructions below to 

[27/50] [abbrv] incubator-geode git commit: Fix README numbering, anchors

[udo]

Fix README numbering, anchors


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

Branch: refs/heads/feature/GEODE-1874
Commit: d8afffb508856d29a2a68c8555259d961e67d77f
Parents: 952e7e3
Author: Joey McAllister 
Authored: Wed Oct 12 14:49:46 2016 -0700
Committer: Karen Miller 
Committed: Fri Oct 14 14:51:03 2016 -0700

--
 geode-docs/README.md | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d8afffb5/geode-docs/README.md
--
diff --git a/geode-docs/README.md b/geode-docs/README.md
index 9564079..9f83260 100644
--- a/geode-docs/README.md
+++ b/geode-docs/README.md
@@ -6,9 +6,9 @@ Bookbinder is a Ruby gem that binds  a unified documentation 
web application fro
 
 This document contains instructions for building and viewing the Geode 
documentation locally.
 
-- [Prerequisites](#prereq)
-- [Bookbinder Usage](#usage)
-- [Building the Documentation](#building)
+- [Prerequisites](#prerequisites)
+- [Bookbinder Usage](#bookbinder-usage)
+- [Building the Documentation](#building-the-documentation)
 
 ## Prerequisites
 
@@ -43,7 +43,7 @@ The installed `config.yml` file configures the Geode book for 
building locally.
 
   Bookbinder converts the markdown source into HTML, which it puts in the 
`final_app` directory.
 
-5. To view the local documentation, do the following:
+3. To view the local documentation, do the following:
 
   ```
   $ cd final_app

[16/50] [abbrv] incubator-geode git commit: GEODE-1532: Fix Pulse Clickjacking vuln.

[udo]

GEODE-1532: Fix Pulse Clickjacking vuln.

* Removed firefox driver dependency
* This closes #256


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

Branch: refs/heads/feature/GEODE-1874
Commit: a78fa7537dfd656521649d57245ecd7fa05b2d31
Parents: 6054e00
Author: Jared Stewart 
Authored: Mon Oct 10 18:48:01 2016 -0700
Committer: Jinmei Liao 
Committed: Wed Oct 12 09:52:40 2016 -0700

--
 geode-pulse/build.gradle |  1 -
 geode-pulse/src/main/webapp/WEB-INF/spring-security.xml  |  5 +
 .../geode/tools/pulse/testbed/driver/PulseUITest.java| 11 +--
 3 files changed, 14 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a78fa753/geode-pulse/build.gradle
--
diff --git a/geode-pulse/build.gradle b/geode-pulse/build.gradle
index ef29ab3..3d19dea 100755
--- a/geode-pulse/build.gradle
+++ b/geode-pulse/build.gradle
@@ -73,7 +73,6 @@ dependencies {
   exclude module: 'selenium-java' //by artifact name
   }
 
-  testCompile 'org.seleniumhq.selenium:selenium-firefox-driver:' + 
project.'selenium.version'
   testCompile 'org.seleniumhq.selenium:selenium-api:' + 
project.'selenium.version'
   testCompile 'org.seleniumhq.selenium:selenium-remote-driver:' + 
project.'selenium.version'
   testCompile 'org.seleniumhq.selenium:selenium-support:' + 
project.'selenium.version'

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a78fa753/geode-pulse/src/main/webapp/WEB-INF/spring-security.xml
--
diff --git a/geode-pulse/src/main/webapp/WEB-INF/spring-security.xml 
b/geode-pulse/src/main/webapp/WEB-INF/spring-security.xml
index b4fccf0..2842f64 100644
--- a/geode-pulse/src/main/webapp/WEB-INF/spring-security.xml
+++ b/geode-pulse/src/main/webapp/WEB-INF/spring-security.xml
@@ -47,6 +47,11 @@

+   
+   
+   
+   
+   




http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a78fa753/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/driver/PulseUITest.java
--
diff --git 
a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/driver/PulseUITest.java
 
b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/driver/PulseUITest.java
index ced298b..5a02edc 100644
--- 
a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/driver/PulseUITest.java
+++ 
b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/testbed/driver/PulseUITest.java
@@ -31,7 +31,8 @@ import org.junit.experimental.categories.Category;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
-import org.openqa.selenium.firefox.FirefoxDriver;
+import org.openqa.selenium.phantomjs.PhantomJSDriver;
+import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.support.ui.ExpectedCondition;
 import org.openqa.selenium.support.ui.WebDriverWait;
 
@@ -77,7 +78,13 @@ public class PulseUITest {
 
 pulseURL = "http://; + host + ":" + port + context;
 Thread.sleep(1000); //wait till tomcat settles down
-driver = new FirefoxDriver();
+
+DesiredCapabilities capabilities = new DesiredCapabilities();
+capabilities.setJavascriptEnabled(true);
+capabilities.setCapability("takesScreenshot", true);
+capabilities.setCapability("phantomjs.page.settings.userAgent", 
"Mozilla/5.0 (Windows NT 6.1; Win64; x64; rv:16.0) Gecko/20121026 
Firefox/16.0");
+
+driver = new PhantomJSDriver(capabilities);
 driver.manage().window().maximize();//required to make all elements visible
 
 Thread.sleep(5000); //wait till pulse starts polling threads...

[29/50] [abbrv] incubator-geode git commit: GEODE-1952 Add output, final_app dirs to rat exclusions

[udo]

GEODE-1952 Add output, final_app dirs to rat exclusions


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

Branch: refs/heads/feature/GEODE-1874
Commit: d573de2ba5bc98c452699a6654861bcf748745cf
Parents: e9669d6
Author: Joey McAllister 
Authored: Thu Oct 13 20:47:50 2016 -0700
Committer: Karen Miller 
Committed: Fri Oct 14 14:51:04 2016 -0700

--
 gradle/rat.gradle | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d573de2b/gradle/rat.gradle
--
diff --git a/gradle/rat.gradle b/gradle/rat.gradle
index 0b01d81..27366a4 100644
--- a/gradle/rat.gradle
+++ b/gradle/rat.gradle
@@ -94,11 +94,15 @@ rat {
 '**/publickeyfile',
 '**/*.dat',
 
+// Geode docs
+'geode-book/Gemfile.lock',
+'geode-book/output/**',
+'geode-book/final_app/**',
+
 // other text files
 'geode-spark-connector/project/plugins.sbt',
 'geode-spark-connector/project/build.properties',
 '**/log4j*.xml',
-'geode-book/Gemfile.lock',
 
 // modules
 'extensions/**/log4j.properties',

[12/50] [abbrv] incubator-geode git commit: GEODE-999: Converted from Firefox driver to PhantomJS driver to run UITests in headless mode

[udo]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dfb87a59/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAbstractTest.java
--
diff --git 
a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAbstractTest.java
 
b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAbstractTest.java
new file mode 100644
index 000..709a831
--- /dev/null
+++ 
b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAbstractTest.java
@@ -0,0 +1,978 @@
+/*
+ * 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.tools.pulse.tests.ui;
+
+import static org.junit.Assert.*;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.DecimalFormat;
+import java.util.List;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+
+import com.jayway.awaitility.Awaitility;
+import org.apache.commons.io.FileUtils;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.Ignore;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TestRule;
+import org.junit.rules.TestWatcher;
+import org.junit.runner.Description;
+import org.openqa.selenium.By;
+import org.openqa.selenium.JavascriptExecutor;
+import org.openqa.selenium.OutputType;
+import org.openqa.selenium.TakesScreenshot;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.interactions.Actions;
+import org.openqa.selenium.phantomjs.PhantomJSDriver;
+import org.openqa.selenium.remote.DesiredCapabilities;
+import org.openqa.selenium.support.ui.ExpectedCondition;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+import org.openqa.selenium.support.ui.WebDriverWait;
+
+import org.apache.geode.internal.admin.SSLConfig;
+import org.apache.geode.management.internal.JettyHelper;
+import org.apache.geode.test.junit.rules.RetryRule;
+import org.apache.geode.tools.pulse.internal.data.PulseConstants;
+import org.apache.geode.tools.pulse.tests.JMXProperties;
+import org.apache.geode.tools.pulse.tests.PulseTestLocators;
+import org.apache.geode.tools.pulse.tests.Server;
+
+@SuppressWarnings("deprecated")
+public abstract class PulseAbstractTest extends PulseBaseTest {
+
+  private static String jmxPropertiesFile;
+  private static String path;
+
+  private static org.eclipse.jetty.server.Server jetty = null;
+  private static Server server = null;
+  private static String pulseURL = null;
+  public static WebDriver driver;
+
+  /* Constants for executing Data Browser queries */
+  public static final String QUERY_TYPE_ONE = "query1";
+  public static final String QUERY_TYPE_TWO = "query2";
+  public static final String QUERY_TYPE_THREE = "query3";
+  public static final String QUERY_TYPE_FOUR = "query4";
+  public static final String QUERY_TYPE_FIVE = "query5";
+  public static final String QUERY_TYPE_SIX = "query6";
+  public static final String QUERY_TYPE_SEVENE = "query7";
+
+  private static final String DATA_VIEW_LABEL = "Data View";
+  private static final String CLUSTER_VIEW_MEMBERS_ID = 
"clusterTotalMembersText";
+  private static final String CLUSTER_VIEW_SERVERS_ID = "clusterServersText";
+  private static final String CLUSTER_VIEW_LOCATORS_ID = "clusterLocatorsText";
+  private static final String CLUSTER_VIEW_REGIONS_ID = 
"clusterTotalRegionsText";
+  private static final String CLUSTER_CLIENTS_ID = "clusterClientsText";
+  private static final String CLUSTER_FUNCTIONS_ID = "clusterFunctions";
+  private static final String CLUSTER_UNIQUECQS_ID = "clusterUniqueCQs";
+  private static final String CLUSTER_SUBSCRIPTION_ID = 
"clusterSubscriptionsText";
+  private static final String CLUSTER_MEMORY_USAGE_ID = "currentMemoryUsage";
+  private static final String CLUSTER_THROUGHPUT_WRITES_ID = 
"currentThroughputWrites";
+  private static final String CLUSTER_GCPAUSES_ID = "currentGCPauses";
+  private static final String CLUSTER_WRITEPERSEC_ID = "writePerSec";
+  private static final String CLUSTER_READPERSEC_ID = "readPerSec";
+  private static final 

[23/50] [abbrv] incubator-geode git commit: GEODE-2000 Now ClientMembershipListener returns host on which CacheServer is bind

[udo]

GEODE-2000 Now ClientMembershipListener returns host on which
CacheServer is bind


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

Branch: refs/heads/feature/GEODE-1874
Commit: 8a080323070dbbc1d7037612d0d8e1188dcf1507
Parents: f2c3ca4
Author: Hitesh Khamesra 
Authored: Wed Oct 12 15:18:21 2016 -0700
Committer: Hitesh Khamesra 
Committed: Thu Oct 13 14:38:14 2016 -0700

--
 .../membership/InternalDistributedMember.java   |  7 -
 .../internal/cache/tier/sockets/HandShake.java  |  8 +++---
 .../AutoConnectionSourceImplJUnitTest.java  | 27 
 3 files changed, 38 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8a080323/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 775fa24..3c16bb3 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
@@ -1031,6 +1031,7 @@ public class InternalDistributedMember
 int port = in.readInt();
 
 this.hostName = DataSerializer.readString(in);
+
 this.hostName = SocketCreator.resolve_dns? 
SocketCreator.getCanonicalHostName(inetAddr, hostName) : 
inetAddr.getHostAddress();
 
 int flags = in.readUnsignedByte();
@@ -1210,7 +1211,11 @@ public class InternalDistributedMember
   }
 
   public String getHost() {
-return this.netMbr.getInetAddress().getCanonicalHostName();
+return this.hostName;
+  }
+  
+  public void setHost(String h) {
+this.hostName = h;
   }
 
   public int getProcessId() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8a080323/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
index d63dfa0..885b61b 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/HandShake.java
@@ -1320,7 +1320,7 @@ public class HandShake implements ClientHandShake
   int qSize = dis.readInt();
 
   // Read the server member
-  member = readServerMember(dis);
+  member = readServerMember(dis, location);
   serverQStatus = new ServerQueueStatus(epType, qSize,member);
 
   // Read the message (if any)
@@ -1439,7 +1439,7 @@ public class HandShake implements ClientHandShake
 return sqs;
   }
 
-  protected DistributedMember readServerMember(DataInputStream p_dis) throws 
IOException {
+  public static DistributedMember readServerMember(DataInputStream p_dis, 
ServerLocation serverLocation) throws IOException {
 
 byte[] memberBytes = DataSerializer.readByteArray(p_dis);
 ByteArrayInputStream bais = new ByteArrayInputStream(memberBytes);
@@ -1449,7 +1449,9 @@ public class HandShake implements ClientHandShake
   dis = new VersionedDataInputStream(dis, v);
 }
 try {
-  return (DistributedMember)DataSerializer.readObject(dis);
+  InternalDistributedMember ids = 
(InternalDistributedMember)DataSerializer.readObject(dis);
+  ids.setHost(serverLocation.getHostName());
+  return ids;
 }
 catch (EOFException e) {
   throw e;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8a080323/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
index fb4b970..ab6f626 100644
--- 
a/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/cache/client/internal/AutoConnectionSourceImplJUnitTest.java
@@ -17,6 +17,7 @@
 package 

[42/50] [abbrv] incubator-geode git commit: GEODE-2005: fix javadoc warning and format

[udo]

GEODE-2005: fix javadoc warning and format


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

Branch: refs/heads/feature/GEODE-1874
Commit: 3d173b1852facd50bc6396521bf862dd442bfa46
Parents: a3bd256
Author: Kirk Lund 
Authored: Mon Oct 17 10:43:02 2016 -0700
Committer: Kirk Lund 
Committed: Mon Oct 17 16:30:19 2016 -0700

--
 .../web/controllers/CommonCrudController.java   | 23 ++--
 1 file changed, 12 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3d173b18/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/CommonCrudController.java
--
diff --git 
a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/CommonCrudController.java
 
b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/CommonCrudController.java
index 2bcb31b..30c8b3a 100644
--- 
a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/CommonCrudController.java
+++ 
b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/controllers/CommonCrudController.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.geode.rest.internal.web.controllers;
 
 import java.util.ArrayList;
@@ -48,21 +47,20 @@ import 
org.apache.geode.rest.internal.web.exception.GemfireRestException;
 import org.apache.geode.rest.internal.web.util.ArrayUtils;
 import org.apache.geode.rest.internal.web.util.JSONUtils;
 
-
 /**
  * The CommonCrudController serves REST Requests related to listing regions, 
  * listing keys in region, delete keys or delete all data in region.
- * 
+ *
  * @since GemFire 8.0
  */
-
 @SuppressWarnings("unused")
 public abstract class CommonCrudController extends AbstractBaseController {
   
   private static final Logger logger = LogService.getLogger();
   
   /**
-   * list all available resources (Regions) in the GemFire cluster
+   * List all available resources (Regions) in the GemFire cluster
+   *
* @return JSON document containing result
*/
   @RequestMapping(method = RequestMethod.GET, produces = { 
MediaType.APPLICATION_JSON_VALUE, MediaType.APPLICATION_JSON_VALUE })
@@ -89,7 +87,8 @@ public abstract class CommonCrudController extends 
AbstractBaseController {
   
   /**
* List all keys for the given region in the GemFire cluster
-   * @param region gemfire region
+   *
+   * @param  region gemfire region
* @return JSON document containing result
*/
   @RequestMapping(method = RequestMethod.GET, value = "/{region}/keys",
@@ -122,8 +121,9 @@ public abstract class CommonCrudController extends 
AbstractBaseController {
   
   /**
* Delete data for single key or specific keys in region
-   * @param region gemfire region
-   * @param keys for which data is requested
+   *
+   * @param  region gemfire region
+   * @param  keys for which data is requested
* @return JSON document containing result
*/
   @RequestMapping(method = RequestMethod.DELETE, value = "/{region}/{keys}",
@@ -153,7 +153,8 @@ public abstract class CommonCrudController extends 
AbstractBaseController {
 
   /**
* Delete all data in region
-   * @param region gemfire region
+   *
+   * @param  region gemfire region
* @return JSON document containing result
*/
   @RequestMapping(method = RequestMethod.DELETE, value = "/{region}")
@@ -180,8 +181,8 @@ public abstract class CommonCrudController extends 
AbstractBaseController {
   }
 
   /**
-   * Ping is not secured so that it may not be used to determine a valid 
username/password
-   * @return
+   * Ping is not secured so that it may not be used to determine a valid
+   * username/password
*/
   @RequestMapping(method = { RequestMethod.GET, RequestMethod.HEAD }, value = 
"/ping")
   @ApiOperation(

[21/50] [abbrv] incubator-geode git commit: GEODE-1981: Wrapping user ResultCollector in synchronized wrapper

[udo]

GEODE-1981: Wrapping user ResultCollector in synchronized wrapper

When executing a function from a client, we can be adding results to the
result collector from multiple threads. Our docs claim the user should
not have to synchronize their result collector. One code path was already
synchronizing on the collector when adding results. However, if the
function returned an exception we were not synchronizing.

Adding a SynchronizedResultCollector and wrapping the users collector in
that to ensure that there will be no unsynchronized access of the result
collector.


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

Branch: refs/heads/feature/GEODE-1874
Commit: f2c3ca489cc0826a96c30c4ffa9464cab8402b94
Parents: c2ddc96
Author: Dan Smith 
Authored: Wed Oct 12 13:54:28 2016 -0700
Committer: Dan Smith 
Committed: Thu Oct 13 11:13:18 2016 -0700

--
 .../client/internal/ExecuteFunctionOp.java  |  4 +-
 .../ExecuteRegionFunctionSingleHopOp.java   |  2 -
 .../cache/execute/ServerFunctionExecutor.java   |  5 +-
 .../execute/ServerRegionFunctionExecutor.java   |  3 +-
 .../util/SynchronizedResultCollector.java   | 57 
 5 files changed, 63 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f2c3ca48/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 6597b68..55b0fb0 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
@@ -569,9 +569,7 @@ public class ExecuteFunctionOp {
   else {
 DistributedMember memberID = 
(DistributedMember)((ArrayList)resultResponse)
 .get(1);
-synchronized (resultCollector) {
-  resultCollector.addResult(memberID, result); 
   
-}
+resultCollector.addResult(memberID, result);
 FunctionStats.getFunctionStats(this.functionId)
 .incResultsReceived();
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f2c3ca48/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionSingleHopOp.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionSingleHopOp.java
 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionSingleHopOp.java
index 51ea8e4..f94c598 100644
--- 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionSingleHopOp.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ExecuteRegionFunctionSingleHopOp.java
@@ -396,10 +396,8 @@ public class ExecuteRegionFunctionSingleHopOp {
   else {
 DistributedMember memberID = 
(DistributedMember)((ArrayList)resultResponse)
 .get(1);
-synchronized (this.resultCollector) {
   this.resultCollector
   .addResult(memberID, result);
-}
 FunctionStats.getFunctionStats(this.functionId,
 
this.executor.getRegion().getSystem()).incResultsReceived();
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f2c3ca48/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerFunctionExecutor.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerFunctionExecutor.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerFunctionExecutor.java
index 4295898..1db6e86 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerFunctionExecutor.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/execute/ServerFunctionExecutor.java
@@ -33,6 +33,7 @@ import org.apache.geode.cache.execute.FunctionException;
 import org.apache.geode.cache.execute.FunctionService;
 import org.apache.geode.cache.execute.ResultCollector;
 import 

[30/50] [abbrv] incubator-geode git commit: GEODE-1952 Move docs build README; edit build instructions

[udo]

GEODE-1952 Move docs build README; edit build instructions


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

Branch: refs/heads/feature/GEODE-1874
Commit: a0de4c93f53dc51b1b1ca3489c66f3f8e0a62fa3
Parents: d573de2
Author: Joey McAllister 
Authored: Fri Oct 14 12:13:15 2016 -0700
Committer: Karen Miller 
Committed: Fri Oct 14 14:51:04 2016 -0700

--
 geode-book/README.md | 61 ++-
 geode-docs/CONTRIBUTE.md |  8 +++---
 geode-docs/README.md | 53 -
 3 files changed, 63 insertions(+), 59 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a0de4c93/geode-book/README.md
--
diff --git a/geode-book/README.md b/geode-book/README.md
index a1c1602..198becc 100644
--- a/geode-book/README.md
+++ b/geode-book/README.md
@@ -1 +1,60 @@
-For information about writing, editing, building, and publishing the Apache 
Geode documentation, please view the `README.md` and `CONTRIBUTING.md` files in 
the `geode-docs` directory.
\ No newline at end of file
+# Apache Geode End-User Documentation
+
+Apache Geode provides the full source for end-user documentation in markdown 
format (see `../geode-docs/CONTRIBUTE.md`). The latest check-ins to 
`incubator-geode/geode-docs` 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.
+
+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.
+
+This document contains instructions for building and viewing the Geode 
documentation locally.
+
+- [Prerequisites](#prerequisites)
+- [Bookbinder Usage](#bookbinder-usage)
+- [Building the Documentation](#building-the-documentation)
+
+## Prerequisites
+
+Bookbinder requires Ruby version 2.0.0-p195 or higher.
+
+Follow the instructions below to install Bookbinder:
+
+1. Add gem "bookbindery" to your Gemfile.
+2. Run `bundle install` to install the dependencies specified in your Gemfile.
+
+## Bookbinder Usage
+
+Bookbinder is meant to be used from within a project called a **book**. The 
book includes a configuration file that describes which documentation 
repositories to use as source materials. Bookbinder provides a set of scripts 
to aggregate those repositories and publish them to various locations.
+
+For Geode, a preconfigured **book** is provided in the directory `geode-book`, 
which gathers content from the directory `geode-docs`. You can use this 
configuration to build HTML for Geode on your local system.
+
+The installed `config.yml` file configures the Geode book for building 
locally. The file configures the local directory for the markdown source files.
+
+## Building the Documentation
+
+1. The GemFile in the `geode-book` directory already defines the `gem 
"bookbindery"` dependency. Make sure you are in the `geode-book` directory and 
enter:
+
+```
+  $ bundle install
+```
+
+   Note: You will not have to run `bundle install` on subsequent builds.
+
+2. To build the documentation locally using the installed `config.yml` file, 
enter:
+
+```
+  $ bundle exec bookbinder bind local
+```
+   Bookbinder converts the markdown source into HTML, which it puts in the 
`final_app` directory.
+
+3. Navigate to the `geode-book/final_app/` and enter:
+
+  ```
+  $ bundle install
+  ```
+   Note: You will not have to run `bundle install` on subsequent builds.
+
+4. To start the website locally, enter:
+
+  ```
+  $ rackup
+  ```
+
+   You can now view the local documentation at . 
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a0de4c93/geode-docs/CONTRIBUTE.md
--
diff --git a/geode-docs/CONTRIBUTE.md b/geode-docs/CONTRIBUTE.md
index 979474e..8ff2502 100644
--- a/geode-docs/CONTRIBUTE.md
+++ b/geode-docs/CONTRIBUTE.md
@@ -6,6 +6,8 @@ Apache Geode welcomes your contributions to the community's 
documentation effort
 - [Working with Images and Graphics](#working-with-images-and-graphics)
 - [Writing Guidelines](#writing-guidelines)
 
+For instructions 

[22/50] [abbrv] incubator-geode git commit: GEODE-1991: Removing sleeps from HARegionQueueJUnitTest

[udo]

GEODE-1991: Removing sleeps from HARegionQueueJUnitTest

Getting rid of a bunch of sleeps in HARegionQueueJUnitTest to fix a
bunch of tests with race conditions. Tests of expiration were sleeping
for short amounts of time and then asserting that expiration happened or
didn't. Changing these sleeps to use Awailitily.


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

Branch: refs/heads/feature/GEODE-1874
Commit: c2ddc96c9e1bbbfaec156e1a9985979bda7b3e36
Parents: 08adacd
Author: Dan Smith 
Authored: Tue Oct 11 16:46:18 2016 -0700
Committer: Dan Smith 
Committed: Thu Oct 13 11:13:18 2016 -0700

--
 .../ha/BlockingHARegionQueueJUnitTest.java  | 182 ++
 .../cache/ha/HARegionQueueJUnitTest.java| 252 +++
 2 files changed, 172 insertions(+), 262 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c2ddc96c/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java
index 48fb3a2..436cc0c 100755
--- 
a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/BlockingHARegionQueueJUnitTest.java
@@ -22,6 +22,9 @@ import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import java.io.IOException;
+import java.util.concurrent.TimeUnit;
+
+import com.jayway.awaitility.Awaitility;
 
 import org.junit.Ignore;
 import org.junit.Test;
@@ -82,39 +85,30 @@ public class BlockingHARegionQueueJUnitTest extends 
HARegionQueueJUnitTest
* 
*/
   @Test
-  public void testBlockingPutAndTake()
+  public void testBlockingPutAndTake() throws InterruptedException, 
IOException, ClassNotFoundException
   {
-try {
-  HARegionQueueAttributes hrqa = new HARegionQueueAttributes();
-  hrqa.setBlockingQueueCapacity(1);
-  final HARegionQueue hrq = 
this.createHARegionQueue("testBlockingPutAndTake",
-  hrqa);
-  hrq.setPrimary(true);//fix for 40314 - capacity constraint is checked 
for primary only.
-  EventID id1 = new EventID(new byte[] { 1 }, 1, 1);
-  hrq.put(new ConflatableObject("key1", "val1", id1, false, "testing"));
-  Thread t1 = new Thread(new Runnable() {
-public void run() {
-  try{
-  EventID id2 = new EventID(new byte[] { 1 }, 1, 2);
-  hrq.put(new ConflatableObject("key1", "val2", id2, false, 
"testing"));
-  }catch(Exception e) {
-encounteredException=true;
-  }
+HARegionQueueAttributes hrqa = new HARegionQueueAttributes();
+hrqa.setBlockingQueueCapacity(1);
+final HARegionQueue hrq = 
this.createHARegionQueue("testBlockingPutAndTake",
+hrqa);
+hrq.setPrimary(true);//fix for 40314 - capacity constraint is checked for 
primary only.
+EventID id1 = new EventID(new byte[] { 1 }, 1, 1);
+hrq.put(new ConflatableObject("key1", "val1", id1, false, "testing"));
+Thread t1 = new Thread(new Runnable() {
+  public void run() {
+try{
+EventID id2 = new EventID(new byte[] { 1 }, 1, 2);
+hrq.put(new ConflatableObject("key1", "val2", id2, false, "testing"));
+}catch(Exception e) {
+  encounteredException=true;
 }
-  });
-  t1.start();
-  Thread.sleep(4000);
-  assertTrue(t1.isAlive());
-  Conflatable conf = (Conflatable)hrq.take();
-  assertNotNull(conf);
-  Thread.sleep(2000);
-  assertTrue(!t1.isAlive());  
-
-}
-catch (Exception e) {
-  e.printStackTrace();
-  fail("Test failed because of exception " + e);
-}
+  }
+});
+t1.start();
+Awaitility.await().atMost(1, TimeUnit.MINUTES).until(() -> t1.isAlive());
+Conflatable conf = (Conflatable)hrq.take();
+assertNotNull(conf);
+Awaitility.await().atMost(1, TimeUnit.MINUTES).until(() -> !t1.isAlive());
   }
 
   /**
@@ -123,45 +117,37 @@ public class BlockingHARegionQueueJUnitTest extends 
HARegionQueueJUnitTest
* 
*/
   @Test
-  public void testBlockingPutAndPeekRemove()
+  public void testBlockingPutAndPeekRemove() throws InterruptedException, 
IOException, ClassNotFoundException
   {
-try {
-  HARegionQueueAttributes hrqa = new HARegionQueueAttributes();
-  

[49/50] [abbrv] incubator-geode git commit: GEODE-1874: Changed setNextNeighbor to not create HashMap for every p2p invocation

[udo]

GEODE-1874: Changed setNextNeighbor to not create HashMap for every p2p 
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/3a88f07a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3a88f07a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3a88f07a

Branch: refs/heads/feature/GEODE-1874
Commit: 3a88f07aa519c4bb83ca3309987eb987b91a2edd
Parents: 358fca7
Author: Udo Kohlmeyer <ukohlme...@pivotal.io>
Authored: Thu Oct 13 10:46:44 2016 +1100
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Wed Oct 19 08:41:29 2016 -0700

--
 .../internal/membership/gms/fd/GMSHealthMonitor.java | 15 ++-
 1 file changed, 6 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3a88f07a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
index 97a413c..b3598cd 100644
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
@@ -374,15 +374,14 @@ public class GMSHealthMonitor implements HealthMonitor, 
MessageHandler {
*/
   private void contactedBy(InternalDistributedMember sender, long timeStamp) {
 TimeStamp cTS = new TimeStamp(timeStamp);
-    //TODO Udo: why putIfAbsent. Surely only put is required
 cTS = memberTimeStamps.putIfAbsent(sender, cTS);
 if (cTS != null && cTS.getTime() < timeStamp) {
   cTS.setTime(timeStamp);
 }
 if (suspectedMemberInView.remove(sender) != null) {
   logger.info("No longer suspecting {}", sender);
+  setNextNeighbor(currentView, null);
 }
-setNextNeighbor(currentView, null);
   }
 
 
@@ -834,7 +833,7 @@ public class GMSHealthMonitor implements HealthMonitor, 
MessageHandler {
 }
 
 List allMembers = newView.getMembers();
-
+//
 //Set checkAllSuspected = new 
HashSet<>(allMembers);
 //checkAllSuspected.removeAll(suspectedMemberInView.keySet());
 //checkAllSuspected.remove(localAddress);
@@ -1066,10 +1065,7 @@ public class GMSHealthMonitor implements HealthMonitor, 
MessageHandler {
 
   private void processHeartbeat(HeartbeatMessage m) {
 this.stats.incHeartbeatsReceived();
-if (m.getRequestId() < 0) {
-  // a periodic heartbeat
-  contactedBy(m.getSender(), System.currentTimeMillis());
-} else {
+if (m.getRequestId() >= 0) {
   Response resp = requestIdVsResponse.get(m.getRequestId());
   logger.trace("Got heartbeat from member {}. {}", m.getSender(), (resp != 
null ? "Check thread still waiting" : "Check thread is not waiting"));
   if (resp != null) {
@@ -1078,9 +1074,10 @@ public class GMSHealthMonitor implements HealthMonitor, 
MessageHandler {
   resp.notify();
 }
   }
-  //we got heartbeat lets update timestamp
-  contactedBy(m.getSender(), System.currentTimeMillis());
+
 }
+//we got heartbeat lets update timestamp
+contactedBy(m.getSender(), System.currentTimeMillis());
   }
 
   /**

[25/50] [abbrv] incubator-geode git commit: Merge feature/GEODE-1952 into feature/GEODE-1952-3

[udo]

Merge feature/GEODE-1952 into feature/GEODE-1952-3


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

Branch: refs/heads/feature/GEODE-1874
Commit: 952e7e324026709325dd347fd0ca9db6cb6418b7
Parents: 38aa36f 14a32e2
Author: Karen Miller 
Authored: Fri Oct 14 14:44:27 2016 -0700
Committer: Karen Miller 
Committed: Fri Oct 14 14:44:27 2016 -0700

--
 geode-book/.gitignore   |2 +
 geode-book/Gemfile  |5 +
 geode-book/Gemfile.lock |  203 ++
 geode-book/README.md|1 +
 geode-book/config.yml   |   20 +
 .../master_middleman/source/images/favicon.ico  |  Bin 0 -> 1317 bytes
 .../master_middleman/source/index.html.erb  |7 +
 .../master_middleman/source/javascripts/book.js |   16 +
 .../source/javascripts/waypoints/context.js |  300 ++
 .../source/javascripts/waypoints/group.js   |  105 +
 .../javascripts/waypoints/noframeworkAdapter.js |  213 ++
 .../source/javascripts/waypoints/sticky.js  |   63 +
 .../source/javascripts/waypoints/waypoint.js|  160 +
 .../source/layouts/_book-footer.erb |7 +
 .../master_middleman/source/layouts/_title.erb  |6 +
 .../source/stylesheets/book-styles.css.scss |3 +
 .../stylesheets/partials/_book-base-values.scss |0
 .../source/stylesheets/partials/_book-vars.scss |   19 +
 .../source/subnavs/geode-subnav.erb | 3082 
 geode-book/redirects.rb |3 +
 geode-docs/.gitignore   |6 +
 geode-docs/CONTRIBUTE.md|   63 +
 geode-docs/README.md|   53 +
 geode-docs/about_geode.html.md.erb  |   26 +
 geode-docs/basic_config/book_intro.html.md.erb  |   40 +
 .../chapter_overview.html.md.erb|   40 +
 ...uted_system_member_configuration.html.md.erb |   51 +
 .../config_concepts/local_vs_remote.html.md.erb |   29 +
 .../chapter_overview.html.md.erb|   32 +
 .../managing_data_entries.html.md.erb   |  146 +
 .../using_custom_classes.html.md.erb|   51 +
 .../data_regions/chapter_overview.html.md.erb   |   65 +
 .../create_a_region_with_API.html.md.erb|   80 +
 .../create_a_region_with_cacheXML.html.md.erb   |   85 +
 .../create_a_region_with_gfsh.html.md.erb   |   55 +
 .../creating_custom_attributes.html.md.erb  |   64 +
 .../managing_data_regions.html.md.erb   |  222 ++
 .../managing_region_attributes.html.md.erb  |  113 +
 .../new_region_existing_data.html.md.erb|   28 +
 .../data_regions/region_naming.html.md.erb  |   31 +
 .../data_regions/region_shortcuts.html.md.erb   |  115 +
 .../store_retrieve_region_shortcuts.html.md.erb |   77 +
 .../setting_distributed_properties.html.md.erb  |   81 +
 .../the_cache/chapter_overview.html.md.erb  |   48 +
 .../intro_cache_management.html.md.erb  |   96 +
 .../managing_a_client_cache.html.md.erb |   84 +
 .../managing_a_multiuser_cache.html.md.erb  |   66 +
 .../managing_a_peer_server_cache.html.md.erb|   81 +
 .../managing_a_secure_cache.html.md.erb |   67 +
 .../setting_cache_initializer.html.md.erb   |   76 +
 .../setting_cache_properties.html.md.erb|   39 +
 .../configuring/chapter_overview.html.md.erb|   84 +
 .../deploying_application_jars.html.md.erb  |  131 +
 .../cluster_config/export-import.html.md.erb|   56 +
 .../gfsh_config_troubleshooting.html.md.erb |   75 +
 .../gfsh_load_from_shared_dir.html.md.erb   |   44 +
 .../cluster_config/gfsh_persist.html.md.erb |  125 +
 .../cluster_config/gfsh_remote.html.md.erb  |   78 +
 .../persisting_configurations.html.md.erb   |  337 ++
 .../using_member_groups.html.md.erb |   44 +
 .../running/change_file_spec.html.md.erb|   57 +
 .../running/default_file_specs.html.md.erb  |   76 +
 .../deploy_config_files_intro.html.md.erb   |   34 +
 .../running/deploying_config_files.html.md.erb  |   45 +
 .../deploying_config_jar_files.html.md.erb  |   52 +
 .../running/firewall_ports_config.html.md.erb   |   32 +
 .../running/firewalls_connections.html.md.erb   |   35 +
 .../running/firewalls_multisite.html.md.erb |   87 +
 .../running/firewalls_ports.html.md.erb |  246 ++
 .../running/managing_output_files.html.md.erb   |   33 +
 .../running/running_the_cacheserver.html.md.erb |  199 +
 .../running/running_the_locator.html.md.erb |  257 ++
 .../starting_up_shutting_down.html.md.erb   |  146 +
 

[13/50] [abbrv] incubator-geode git commit: GEODE-999: Converted from Firefox driver to PhantomJS driver to run UITests in headless mode

[udo]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dfb87a59/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/PulseAutomatedTest.java
--
diff --git 
a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/PulseAutomatedTest.java
 
b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/PulseAutomatedTest.java
deleted file mode 100644
index 778acf9..000
--- 
a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/PulseAutomatedTest.java
+++ /dev/null
@@ -1,784 +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.
- *
- */
-/**
-* This test class contains automated tests for Pulse application related to
-* 1. Different grid data validations for example - Topology, Server Group, 
Redundancy Zone
-* 2. Data Browser
-* 3. 
-* 
-*
-* @version 1.0
-* @since GemFire   2014-04-02
-*/
-package org.apache.geode.tools.pulse.tests;
-
-import static org.junit.Assert.*;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.List;
-
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-import org.openqa.selenium.By;
-import org.openqa.selenium.WebElement;
-
-import org.apache.geode.test.junit.categories.UITest;
-
-@Category(UITest.class)
-public class PulseAutomatedTest extends PulseAbstractTest {
-
-   @BeforeClass
-   public static void beforeClassSetup() throws Exception {
-   setUpServer("pulseUser", "12345", "pulse-auth.json");
-   }
-
-   @Test
-   public void serverGroupGridDataValidation() {
-   navigateToServerGroupGridView();
-   validateServerGroupGridData();
-   }
-
-   @Test
-   public void redundancyZonesGridDataValidation() {
-   navigateToRedundancyZonesGridView();
-   validateRedundancyZonesGridData();
-   }
-
-   @Test
-   public void topologyGridDataValidation() {
-   navigateToTopologyGridView();
-   validateTopologyGridData();
-   }
-
-   @Test
-   public void dataViewGridDataValidation() {
-   navigateToDataPrespectiveGridView();
-   validateDataPrespectiveGridData();
-   }
-
-   @Test
-   public void regionDetailsGridDataValidation() {
-   navigateToRegionDetailsGridView();
-   validateRegionDetailsGridData();
-
-   }
-
-   @Test
-   public void regionDetailsNavigationTest() {
-   navigateToRegionDetailsView();
-   assertEquals("/R2", 
getTextUsingId(PulseTestLocators.RegionDetailsView.regionNameDivId));
-   }
-
-   @Test
-   public void regionName() {
-   navigateToRegionDetailsView();
-   assertEquals(getPropertyValue("region.R2.name"), 
getTextUsingId(PulseTestLocators.RegionDetailsView.regionNameDivId));
-   }
-
-   @Test
-   public void regionPath() {
-   navigateToRegionDetailsView();
-   assertEquals(getPropertyValue("region.R2.fullPath"),
-   
getTextUsingId(PulseTestLocators.RegionDetailsView.regionPathId));
-   }
-
-   @Test
-   public void regionType() {
-   navigateToRegionDetailsView();
-   assertEquals(getPropertyValue("region.R2.regionType"),
-   
getTextUsingId(PulseTestLocators.RegionDetailsView.regionTypeId));
-   }
-
-   @Test
-   public void regionMembers() {
-   navigateToRegionDetailsView();
-   assertEquals(getPropertyValue("region.R2.memberCount"),
-   
getTextUsingId(PulseTestLocators.RegionDetailsView.regionMembersTextId));
-   }
-
-   @Test
-   public void regionEmptyNodes() {
-   navigateToRegionDetailsView();
-   assertEquals(getPropertyValue("region.R2.emptyNodes"),
-   
getTextUsingId(PulseTestLocators.RegionDetailsView.regionEmptyNodesId));
-   }
-
-   @Test
-   public void regionEntryCount() {
-   navigateToRegionDetailsView();
-   

[04/50] [abbrv] incubator-geode git commit: GEODE-1586: Test assumed to fixed by ff2637d7aeadd0beda581d5c2422803f167021e1

[udo]

GEODE-1586: Test assumed to fixed by ff2637d7aeadd0beda581d5c2422803f167021e1

* Removing the Flaky Tag


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

Branch: refs/heads/feature/GEODE-1874
Commit: f223a2e5b7cdad4a181c95fb78817bb297bdb578
Parents: 29e4948
Author: nabarun 
Authored: Tue Oct 11 14:26:08 2016 -0700
Committer: nabarun 
Committed: Tue Oct 11 14:26:08 2016 -0700

--
 .../wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f223a2e5/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
--
diff --git 
a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
 
b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
index e06e564..b755661 100644
--- 
a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
+++ 
b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java
@@ -586,7 +586,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest 
extends WANTestBase {
 getTestMethodName(), 1000 ));
   }
   
-  @Category(FlakyTest.class) // GEODE-1586
+
   @Test
   public void testPartitionedParallelPropagationHA() throws Exception {
 IgnoredException.addIgnoredException(SocketException.class.getName()); // 
for Connection reset

[26/50] [abbrv] incubator-geode git commit: GEODE-1952 Add Apache license to new files; add Gemfile.lock to rat.gradle

[udo]

GEODE-1952 Add Apache license to new files; add Gemfile.lock to rat.gradle


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

Branch: refs/heads/feature/GEODE-1874
Commit: e9669d6123725e12cbd2b0c5a145fc36b615c292
Parents: 131e99e
Author: Joey McAllister 
Authored: Thu Oct 13 16:22:56 2016 -0700
Committer: Karen Miller 
Committed: Fri Oct 14 14:51:03 2016 -0700

--
 geode-book/.gitignore  |  4 ++--
 geode-book/Gemfile | 17 +
 geode-book/Gemfile.lock|  2 +-
 geode-book/config.yml  | 17 +
 geode-book/master_middleman/source/index.html.erb  | 16 
 .../master_middleman/source/javascripts/book.js| 15 +++
 .../source/javascripts/waypoints/context.js| 15 +++
 .../source/javascripts/waypoints/group.js  | 15 +++
 .../javascripts/waypoints/noframeworkAdapter.js| 15 +++
 .../source/javascripts/waypoints/sticky.js | 15 +++
 .../source/javascripts/waypoints/waypoint.js   | 15 +++
 .../source/layouts/_book-footer.erb| 16 
 .../master_middleman/source/layouts/_title.erb | 17 -
 .../source/stylesheets/book-styles.css.scss| 15 +++
 .../stylesheets/partials/_book-base-values.scss| 14 ++
 .../source/stylesheets/partials/_book-vars.scss| 16 +++-
 .../source/subnavs/geode-subnav.erb| 16 
 geode-book/redirects.rb| 15 +++
 gradle/rat.gradle  |  4 +++-
 19 files changed, 253 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e9669d61/geode-book/.gitignore
--
diff --git a/geode-book/.gitignore b/geode-book/.gitignore
index 0cae826..30545a4 100644
--- a/geode-book/.gitignore
+++ b/geode-book/.gitignore
@@ -1,2 +1,2 @@
-output
-final_app
+output/
+final_app/

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e9669d61/geode-book/Gemfile
--
diff --git a/geode-book/Gemfile b/geode-book/Gemfile
index f66d333..b61bbdc 100644
--- a/geode-book/Gemfile
+++ b/geode-book/Gemfile
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
 source "https://rubygems.org;
 
 gem 'bookbindery'

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e9669d61/geode-book/Gemfile.lock
--
diff --git a/geode-book/Gemfile.lock b/geode-book/Gemfile.lock
index 3c483c0..1fb5a4c 100644
--- a/geode-book/Gemfile.lock
+++ b/geode-book/Gemfile.lock
@@ -200,4 +200,4 @@ DEPENDENCIES
   libv8 (= 3.16.14.7)
 
 BUNDLED WITH
-   1.11.2
+   1.13.1

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e9669d61/geode-book/config.yml
--
diff --git a/geode-book/config.yml b/geode-book/config.yml
index 74003f0..b2f999a 100644
--- a/geode-book/config.yml
+++ b/geode-book/config.yml
@@ -1,3 +1,20 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or 

[08/50] [abbrv] incubator-geode git commit: GEODE-1952 Add book README; edit docs README, CONTRIBUTE

[udo]

GEODE-1952 Add book README; edit docs README, CONTRIBUTE


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

Branch: refs/heads/feature/GEODE-1874
Commit: 0b31275966beaf4039afd913b8644c81a32c1758
Parents: 36d1f39
Author: Joey McAllister 
Authored: Tue Oct 11 17:29:12 2016 -0700
Committer: Joey McAllister 
Committed: Tue Oct 11 17:29:12 2016 -0700

--
 geode-book/README.md |  1 +
 geode-docs/CONTRIBUTE.md | 10 +-
 geode-docs/README.md |  9 +
 3 files changed, 7 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0b312759/geode-book/README.md
--
diff --git a/geode-book/README.md b/geode-book/README.md
new file mode 100644
index 000..a1c1602
--- /dev/null
+++ b/geode-book/README.md
@@ -0,0 +1 @@
+For information about writing, editing, building, and publishing the Apache 
Geode documentation, please view the `README.md` and `CONTRIBUTING.md` files in 
the `geode-docs` directory.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0b312759/geode-docs/CONTRIBUTE.md
--
diff --git a/geode-docs/CONTRIBUTE.md b/geode-docs/CONTRIBUTE.md
index dd97f47..7345cb3 100644
--- a/geode-docs/CONTRIBUTE.md
+++ b/geode-docs/CONTRIBUTE.md
@@ -12,10 +12,10 @@ Project Geode welcomes your contributions to the 
community's documentation effor
 
 We use the fork-and-pull collaboration method on GitHub:
 
-1. In your GitHub account, fork the gemfire/docs-geode-md repository.
+1. In your GitHub account, fork the `apache/incubator-geode` repository.
 2. Create a local clone of your fork.
-3. Make changes and commit them in your fork.
-4. In the gemfire/docs-geode-md repository, create a pull request.
+3. Make changes in the `geode-docs` directory and commit them in your fork.
+4. In the `apache/incubator-geode` repository, create a pull request.
 
 See [Using Pull 
Requests](https://help.github.com/articles/using-pull-requests/) on GitHub for 
more about the fork-and-pull collaboration method.
 
@@ -23,7 +23,7 @@ See [Using Pull 
Requests](https://help.github.com/articles/using-pull-requests/)
 
 ## Document Source Files and Tools
 
-Project Geode documentation source files are written in markdown. Image files 
include .gif and .png graphics and editable image files in the open source SVG 
format.
+Project Geode documentation source files are written in markdown. Image files 
include .gif and .png graphics and editable image files in the open-source SVG 
format.
 
 - [Working with Markdown Files](#markdown)
 - [Working with Images and Graphics](#images)
@@ -38,7 +38,7 @@ You can edit markdown files in any text editor. For more, 
read [Daring Fireball'
 
 ### Working with Images and Graphics
 
-Image files in .gif or .png format are in the `images` directory in the 
Project Geode docs repo. Images in .svg format are in the `images_svg` 
directory.
+Image files in .gif or .png format are in the `docs/images` directory in the 
Project Geode docs repo. Images in .svg format are in the `docs/images_svg` 
directory.
 
 Most of the Project Geode image files have been converted to the open source 
SVG format. You can insert SVG images directly into an XML topic and modify 
images using a SVG editor.
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0b312759/geode-docs/README.md
--
diff --git a/geode-docs/README.md b/geode-docs/README.md
index bc70325..199906e 100644
--- a/geode-docs/README.md
+++ b/geode-docs/README.md
@@ -4,12 +4,11 @@ Apache Geode provides the full source for end-user 
documentation in markdown for
 
 Bookbinder is a 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.
 
-This document contains instructions for building and viewing the Geode 
documentation locally, as well as for publishing it to the Geode website. It 
contains the sections:
+This document contains instructions for building and viewing the Geode 
documentation locally.
 
 - [Prerequisites](#prereq)
 - [Bookbinder Usage](#usage)
 - [Building the Documentation](#building)
-- [Publishing the Documentation](#publishing)
 
 ## 

[09/50] [abbrv] incubator-geode git commit: GEODE-1986: correctly set the flag indicating if cluster configuration service is running or not on a locator.

[udo]

GEODE-1986: correctly set the flag indicating if cluster configuration service 
is running or not on a locator.


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

Branch: refs/heads/feature/GEODE-1874
Commit: 584337b323b3713ec95dbb8934862dc83a65757f
Parents: f079f37
Author: Jinmei Liao 
Authored: Tue Oct 11 14:01:33 2016 -0700
Committer: Jinmei Liao 
Committed: Wed Oct 12 09:40:26 2016 -0700

--
 .../internal/InternalDistributedSystem.java | 68 +++-
 .../geode/internal/cache/GemFireCacheImpl.java  |  6 +-
 ...lusterConfigWithEmbededLocatorDUnitTest.java | 67 +++
 3 files changed, 107 insertions(+), 34 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/584337b3/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
index 17303c1..848a86e 100644
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/InternalDistributedSystem.java
@@ -98,15 +98,13 @@ import org.apache.geode.internal.offheap.MemoryAllocator;
 import org.apache.geode.internal.offheap.OffHeapStorage;
 import org.apache.geode.internal.statistics.DummyStatisticsImpl;
 import org.apache.geode.internal.statistics.GemFireStatSampler;
-import org.apache.geode.internal.statistics.platform.LinuxProcFsStatistics;
 import org.apache.geode.internal.statistics.LocalStatisticsImpl;
-import org.apache.geode.internal.statistics.platform.OsStatisticsFactory;
 import org.apache.geode.internal.statistics.StatisticsImpl;
 import org.apache.geode.internal.statistics.StatisticsManager;
 import org.apache.geode.internal.statistics.StatisticsTypeFactoryImpl;
+import org.apache.geode.internal.statistics.platform.LinuxProcFsStatistics;
+import org.apache.geode.internal.statistics.platform.OsStatisticsFactory;
 import org.apache.geode.internal.tcp.ConnectionTable;
-import org.apache.geode.internal.util.concurrent.StoppableCondition;
-import org.apache.geode.internal.util.concurrent.StoppableReentrantLock;
 import org.apache.geode.management.ManagementException;
 import org.apache.geode.security.GemFireSecurityException;
 
@@ -733,39 +731,45 @@ public class InternalDistributedSystem extends 
DistributedSystem implements OsSt
*/
   private void startInitLocator() throws InterruptedException {
 String locatorString = this.originalConfig.getStartLocator();
-if (locatorString.length() > 0) {
-  // when reconnecting we don't want to join with a colocated locator 
unless
-  // there is a quorum of the old members available
-  if (attemptingToReconnect && !this.isConnected) {
-if (this.quorumChecker != null) {
-  logger.info("performing a quorum check to see if location services 
can be started early");
-  if (!quorumChecker.checkForQuorum(3 * 
this.config.getMemberTimeout())) {
-logger.info("quorum check failed - not allowing location services 
to start early");
-return;
-  }
-  logger.info("Quorum check passed - allowing location services to 
start early");
+if (locatorString.length()==0) {
+  return;
+}
+
+// when reconnecting we don't want to join with a colocated locator unless
+// there is a quorum of the old members available
+if (attemptingToReconnect && !this.isConnected) {
+  if (this.quorumChecker != null) {
+logger.info("performing a quorum check to see if location services can 
be started early");
+if (!quorumChecker.checkForQuorum(3 * this.config.getMemberTimeout())) 
{
+  logger.info("quorum check failed - not allowing location services to 
start early");
+  return;
 }
+logger.info("Quorum check passed - allowing location services to start 
early");
   }
-  DistributionLocatorId locId = new DistributionLocatorId(locatorString);
-  try {
-this.startedLocator = InternalLocator.createLocator(locId.getPort(), 
null, null, this.logWriter, // LOG: this is after IDS has created 
LogWriterLoggers and Appenders
-  this.securityLogWriter, // LOG: this is after IDS has created 
LogWriterLoggers and Appenders
-  locId.getHost(), locId.getHostnameForClients(), 

[20/50] [abbrv] incubator-geode git commit: GEODE-1999: Fix offheap memory leak when exception is thrown during basicDestroy call to remove GatewaySenderEventImpl from the sender queue

[udo]

GEODE-1999: Fix offheap memory leak when exception is thrown during 
basicDestroy call to remove GatewaySenderEventImpl from the sender queue

Using try and finally to make sure the offheap reference will be released.
Make similar changes for the parrellel wan queue as well.
Also release offheap memory if a virtualPut failed to put the 
GatewaySenderEvent into the sender queue.


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

Branch: refs/heads/feature/GEODE-1874
Commit: 08adacd2cfb93533ec016a82a0f71d7110e1819d
Parents: 582694d
Author: eshu 
Authored: Thu Oct 13 10:44:53 2016 -0700
Committer: eshu 
Committed: Thu Oct 13 10:44:53 2016 -0700

--
 .../cache/AbstractBucketRegionQueue.java| 34 +--
 .../geode/internal/cache/BucketRegionQueue.java | 59 +++-
 .../wan/serial/SerialGatewaySenderQueue.java| 26 ++---
 3 files changed, 68 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/08adacd2/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java
index 8fa8597..7ae1249 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractBucketRegionQueue.java
@@ -357,31 +357,31 @@ public abstract class AbstractBucketRegionQueue extends 
BucketRegion {
   boolean ifOld, Object expectedOldValue, boolean requireOldValue,
   long lastModified, boolean overwriteDestroyed) throws TimeoutException,
   CacheWriterException {
-boolean success = super.virtualPut(event, ifNew, ifOld, expectedOldValue,
-requireOldValue, lastModified, overwriteDestroyed);
-if (success) {
-  if (logger.isDebugEnabled()) {
-logger.debug("Key : > {}", event.getKey());
+try {
+  boolean success = super.virtualPut(event, ifNew, ifOld, expectedOldValue,
+  requireOldValue, lastModified, overwriteDestroyed);
+  if (success) {
+if (logger.isDebugEnabled()) {
+  logger.debug("Key : > {}", event.getKey());
+}  
+  } else {
+GatewaySenderEventImpl.release(event.getRawNewValue());
   }
-  //@Unretained Object ov = event.getRawOldValue();
-  //if (ov instanceof GatewaySenderEventImpl) {
-  //  ((GatewaySenderEventImpl)ov).release();
-  //}
-   GatewaySenderEventImpl.release(event.getRawOldValue());
+  return success;
+} finally {
+  GatewaySenderEventImpl.release(event.getRawOldValue());
 }
-return success;
 
   }
   @Override
   protected void basicDestroy(final EntryEventImpl event,
   final boolean cacheWrite, Object expectedOldValue)
   throws EntryNotFoundException, CacheWriterException, TimeoutException {
-super.basicDestroy(event, cacheWrite, expectedOldValue);
-//@Unretained Object rov = event.getRawOldValue();
-//if (rov instanceof GatewaySenderEventImpl) {
-//  ((GatewaySenderEventImpl) rov).release();
-//}
-   GatewaySenderEventImpl.release(event.getRawOldValue());
+try {
+  super.basicDestroy(event, cacheWrite, expectedOldValue);
+} finally {
+  GatewaySenderEventImpl.release(event.getRawOldValue());
+}
   }
 
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/08adacd2/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegionQueue.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegionQueue.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegionQueue.java
index 294b616..ecc659a 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegionQueue.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/BucketRegionQueue.java
@@ -257,34 +257,38 @@ public class BucketRegionQueue extends 
AbstractBucketRegionQueue {
   boolean ifOld, Object expectedOldValue, boolean requireOldValue,
   long lastModified, boolean overwriteDestroyed) throws TimeoutException,
   CacheWriterException {
-boolean success = super.virtualPut(event, ifNew, ifOld, expectedOldValue,
-requireOldValue, lastModified, overwriteDestroyed);
-
-if (success) {
-  

[28/50] [abbrv] incubator-geode git commit: GEODE-1952: Change Project G to Apache G; other edits

[udo]

GEODE-1952: Change Project G to Apache G; other edits


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

Branch: refs/heads/feature/GEODE-1874
Commit: 131e99eeb7e2971f0aa51ffdf23624138cca5652
Parents: d8afffb
Author: Joey McAllister 
Authored: Wed Oct 12 17:56:09 2016 -0700
Committer: Karen Miller 
Committed: Fri Oct 14 14:51:03 2016 -0700

--
 geode-docs/CONTRIBUTE.md | 48 +--
 geode-docs/README.md |  2 +-
 2 files changed, 11 insertions(+), 39 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/131e99ee/geode-docs/CONTRIBUTE.md
--
diff --git a/geode-docs/CONTRIBUTE.md b/geode-docs/CONTRIBUTE.md
index 7345cb3..979474e 100644
--- a/geode-docs/CONTRIBUTE.md
+++ b/geode-docs/CONTRIBUTE.md
@@ -1,54 +1,26 @@
-# Contributing to the Project Geode Documentation
+# Contributing to the Apache Geode Documentation
 
-Project Geode welcomes your contributions to the community's documentation 
efforts. You can participate by writing new content, reviewing and editing 
existing content, or fixing bugs. This document covers the following topics:
+Apache Geode welcomes your contributions to the community's documentation 
efforts. You can participate by writing new content, reviewing and editing 
existing content, or fixing bugs. This document covers the following topics:
 
-- [How to Contribute](#contribute)
-- [Document Source Files and Tools](#source_tools)
-- [Writing Guidelines](#guidelines)
+- [Working with Markdown Files](#working-with-markdown-files)
+- [Working with Images and Graphics](#working-with-images-and-graphics)
+- [Writing Guidelines](#writing-guidelines)
 
-[]()
-
-## How to Contribute
-
-We use the fork-and-pull collaboration method on GitHub:
-
-1. In your GitHub account, fork the `apache/incubator-geode` repository.
-2. Create a local clone of your fork.
-3. Make changes in the `geode-docs` directory and commit them in your fork.
-4. In the `apache/incubator-geode` repository, create a pull request.
-
-See [Using Pull 
Requests](https://help.github.com/articles/using-pull-requests/) on GitHub for 
more about the fork-and-pull collaboration method.
-
-[]()
-
-## Document Source Files and Tools
-
-Project Geode documentation source files are written in markdown. Image files 
include .gif and .png graphics and editable image files in the open-source SVG 
format.
-
-- [Working with Markdown Files](#markdown)
-- [Working with Images and Graphics](#images)
-
-[]()
-
-### Working with Markdown Files
+## Working with Markdown Files
 
 You can edit markdown files in any text editor. For more, read [Daring 
Fireball's Markdown Syntax 
page](https://daringfireball.net/projects/markdown/syntax).
 
-[]()
-
-### Working with Images and Graphics
+## Working with Images and Graphics
 
-Image files in .gif or .png format are in the `docs/images` directory in the 
Project Geode docs repo. Images in .svg format are in the `docs/images_svg` 
directory.
+Image files in .gif or .png format are in the `docs/images` directory in the 
Apache Geode docs repo. Images in .svg format are in the `docs/images_svg` 
directory.
 
-Most of the Project Geode image files have been converted to the open source 
SVG format. You can insert SVG images directly into an XML topic and modify 
images using a SVG editor.
+Most of the Apache Geode image files have been converted to the open source 
SVG format. You can insert SVG images directly into an XML topic and modify 
images using a SVG editor.
 
 The Wikipedia page [Comparison of Vector Graphics 
Editors](http://en.wikipedia.org/wiki/Comparison_of_vector_graphics_editors) 
provides a list and comparison of commercial and free vector graphics editors. 
Note, however, that not all of these programs support the SVG format.
 
-[]()
-
 ## Writing Guidelines
 
-The most important advice we can provide for working with the Project Geode 
docs is to spend some time becoming familiar with the existing source files and 
the structure of the project directory. In particular, note the following 
conventions and tips:
+The most important advice we can provide for working with the Apache Geode 
docs is to spend some time becoming familiar with the existing source files and 
the structure of the project directory. In particular, note the following 
conventions and tips:
 
 - Top-level subdirectories organize topics into "books": basic_config, 
configuring, developing, etc.
 

[11/50] [abbrv] incubator-geode git commit: GEODE-999: Converted from Firefox driver to PhantomJS driver to run UITests in headless mode

[udo]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dfb87a59/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseBaseTest.java
--
diff --git 
a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseBaseTest.java
 
b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseBaseTest.java
new file mode 100644
index 000..8cfac53
--- /dev/null
+++ 
b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseBaseTest.java
@@ -0,0 +1,697 @@
+/*
+ * 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.tools.pulse.tests.ui;
+
+import static org.junit.Assert.*;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.concurrent.TimeUnit;
+
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.interactions.Actions;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+import org.openqa.selenium.support.ui.WebDriverWait;
+
+import org.apache.geode.tools.pulse.tests.JMXProperties;
+import org.apache.geode.tools.pulse.tests.Member;
+import org.apache.geode.tools.pulse.tests.PulseTestData;
+import org.apache.geode.tools.pulse.tests.PulseTestLocators;
+import org.apache.geode.tools.pulse.tests.Region;
+
+public class PulseBaseTest {
+
+  public static int maxWaitTime = 20;
+
+  WebElement element = null;
+
+   public WebElement findElementUsingId(String id) {
+   return PulseAbstractTest.driver.findElement(By.id(id));
+   }
+   public WebElement findElementUsingXpath(String xpath) {
+   return PulseAbstractTest.driver.findElement(By.xpath(xpath));
+   }
+
+   public void clickElementUsingId(String id) {
+   findElementUsingId(id).click();
+   }
+
+   public void clickElementUsingXpath(String xpath) {
+   findElementUsingXpath(xpath).click();
+   }
+
+   public void enterTextUsingId(String id, String textToEnter) {
+   findElementUsingId(id).sendKeys(textToEnter);
+
+   }
+
+   public void enterTextUsingXpath(String xpath, String textToEnter) {
+   findElementUsingXpath(xpath).sendKeys(textToEnter);
+   }
+
+   public String getValueFromPropertiesFile(String key) {
+   return JMXProperties.getInstance().getProperty(key);
+   }
+
+   public void sendKeysUsingId(String Id, String textToEnter){
+   findElementById(Id).sendKeys(textToEnter);
+   }
+
+   public void waitForElement(WebElement element) {
+   PulseAbstractTest.driver.manage().timeouts().implicitlyWait(0, 
TimeUnit.SECONDS);
+   WebDriverWait wait = new 
WebDriverWait(PulseAbstractTest.driver, 20);
+   wait.until(ExpectedConditions.visibilityOf(element));
+   }
+
+   public WebElement findElementById(String id) {
+   return PulseAbstractTest.driver.findElement(By.id(id));
+   }
+
+   public WebElement findElementByXpath(String xpath) {
+   return PulseAbstractTest.driver.findElement(By.xpath(xpath));
+   }
+
+   public String getTextUsingXpath(String xpath) {
+   return findElementByXpath(xpath).getText();
+   }
+
+   public String getTextUsingId(String id) {
+   return findElementById(id).getText();
+   }
+
+   public String getPersistanceEnabled(Region r) {
+   String persitance = null;
+
+   if (r.getPersistentEnabled()) {
+   persitance = "ON";
+   } else if (!r.getPersistentEnabled()) {
+   persitance = "OFF";
+   }
+   return persitance;
+   }
+
+   public String getPersistanceEnabled(String trueOrFalse) {
+   String persitance = null;
+
+   if (trueOrFalse.contains("true")) {
+   persitance = "ON";
+   } else if (trueOrFalse.contains("false")) {
+   persitance = "OFF";
+   }
+   return persitance;
+   }
+
+   

[01/50] [abbrv] incubator-geode git commit: GEODE-1952 Add geode-book dir to build docs

[udo]

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-1874 fb725edbc -> c330e5e56


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e9b44af4/geode-book/redirects.rb
--
diff --git a/geode-book/redirects.rb b/geode-book/redirects.rb
new file mode 100644
index 000..3f223dc
--- /dev/null
+++ b/geode-book/redirects.rb
@@ -0,0 +1,5 @@
+r301 %r{/releases/latest/javadoc/(.*)}, 
'http://geode.incubator.apache.org/releases/latest/javadoc/$1'
+r301 %r{/docs-gemfire/latest/cpp_api/(.*)}, 
'http://data-docs-samples.cfapps.io/docs-gemfire/latest/cpp_api/$1'
+r301 %r{/docs-gemfire/latest/net_api/(.*)}, 
'http://data-docs-samples.cfapps.io/docs-gemfire/latest/net_api/$1'
+rewrite '/', '/docs/about_geode.html'
+rewrite '/index.html', '/docs/about_geode.html'

[32/50] [abbrv] incubator-geode git commit: GEODE-1993: refactor tests to use rules rather than abstract classes

[udo]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de621597/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshShellConnectionRule.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshShellConnectionRule.java
 
b/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshShellConnectionRule.java
index 4d1bae9..da7a883 100644
--- 
a/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshShellConnectionRule.java
+++ 
b/geode-core/src/test/java/org/apache/geode/management/internal/security/GfshShellConnectionRule.java
@@ -25,10 +25,11 @@ import 
org.apache.geode.management.internal.cli.result.CommandResult;
 import org.apache.geode.management.internal.cli.result.ErrorResultData;
 import org.apache.geode.management.internal.cli.result.ResultBuilder;
 import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
+import org.apache.geode.test.dunit.rules.ConnectionConfiguration;
 import org.apache.geode.test.junit.rules.DescribedExternalResource;
 
 /**
- * Class which eases the creation of MBeans for security testing. When 
combined with {@link JMXConnectionConfiguration}
+ * Class which eases the creation of MBeans for security testing. When 
combined with {@link ConnectionConfiguration}
  * it allows for the creation of per-test connections with different 
user/password combinations.
  */
 public class GfshShellConnectionRule extends DescribedExternalResource {
@@ -53,7 +54,7 @@ public class GfshShellConnectionRule extends 
DescribedExternalResource {
   }
 
   protected void before(Description description) throws Throwable {
-JMXConnectionConfiguration config = 
description.getAnnotation(JMXConnectionConfiguration.class);
+ConnectionConfiguration config = 
description.getAnnotation(ConnectionConfiguration.class);
 if(config==null)
   return;
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de621597/geode-core/src/test/java/org/apache/geode/management/internal/security/JMXConnectionConfiguration.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/management/internal/security/JMXConnectionConfiguration.java
 
b/geode-core/src/test/java/org/apache/geode/management/internal/security/JMXConnectionConfiguration.java
deleted file mode 100644
index 4f57baa..000
--- 
a/geode-core/src/test/java/org/apache/geode/management/internal/security/JMXConnectionConfiguration.java
+++ /dev/null
@@ -1,33 +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.management.internal.security;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * This annotation is intended to be used with {@link 
MBeanServerConnectionRule} in order to configure a per-test JMX
- * connection with a specific user and password.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD})
-public @interface JMXConnectionConfiguration {
-  String user();
-  String password();
-}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de621597/geode-core/src/test/java/org/apache/geode/management/internal/security/JavaRmiServerNameTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/management/internal/security/JavaRmiServerNameTest.java
 
b/geode-core/src/test/java/org/apache/geode/management/internal/security/JavaRmiServerNameTest.java
index c544e6f..e885344 100644
--- 
a/geode-core/src/test/java/org/apache/geode/management/internal/security/JavaRmiServerNameTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/management/internal/security/JavaRmiServerNameTest.java
@@ -23,11 +23,13 @@ import static org.junit.Assert.*;
 
 import java.util.Properties;
 
+import org.junit.After;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import org.apache.geode.cache.CacheFactory;
 import 

[33/50] [abbrv] incubator-geode git commit: GEODE-1993: refactor tests to use rules rather than abstract classes

[udo]

GEODE-1993: refactor tests to use rules rather than abstract classes

* created ServerStarter and LocatorStarter in the rule package
* refacterred LocatorServerConfigurationRule
* refactor tests to use these rules


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

Branch: refs/heads/feature/GEODE-1874
Commit: de62159780496c3362a1b6ac840e87bba019bc62
Parents: b065993
Author: Jinmei Liao 
Authored: Wed Oct 12 09:30:15 2016 -0700
Committer: Jinmei Liao 
Committed: Fri Oct 14 14:59:26 2016 -0700

--
 .../internal/web/RestSecurityDUnitTest.java | 557 ---
 .../web/RestSecurityIntegrationTest.java| 497 +
 .../security/IntegratedSecurityService.java |   2 +-
 .../security/AccessControlMBeanJUnitTest.java   |   7 +-
 ...CacheServerMBeanAuthenticationJUnitTest.java |   7 +-
 .../CacheServerMBeanAuthorizationJUnitTest.java |  13 +-
 .../CacheServerMBeanShiroJUnitTest.java |  30 +-
 .../security/CacheServerStartupRule.java|  74 +++
 .../security/CliCommandsSecurityTest.java   |   9 +-
 .../security/DataCommandsSecurityTest.java  |  11 +-
 .../DiskStoreMXBeanSecurityJUnitTest.java   |   9 +-
 .../GatewayReceiverMBeanSecurityTest.java   |   9 +-
 .../GatewaySenderMBeanSecurityTest.java |   9 +-
 .../security/GfshCommandsPostProcessorTest.java |  30 +-
 .../security/GfshCommandsSecurityTest.java  |  48 +-
 .../security/GfshShellConnectionRule.java   |   5 +-
 .../security/JMXConnectionConfiguration.java|  33 --
 .../security/JavaRmiServerNameTest.java |  28 +-
 .../JsonAuthorizationCacheStartRule.java|  86 ---
 .../LockServiceMBeanAuthorizationJUnitTest.java |  11 +-
 .../security/MBeanSecurityJUnitTest.java|  10 +-
 .../security/MBeanServerConnectionRule.java | 130 -
 .../ManagerMBeanAuthorizationJUnitTest.java |   9 +-
 .../security/MemberMBeanSecurityJUnitTest.java  |  13 +-
 .../security/ResourcePermissionTest.java|  25 +-
 .../internal/security/ShiroCacheStartRule.java  |  64 ---
 .../security/AbstractSecureServerDUnitTest.java | 104 +---
 .../ClusterConfigWithoutSecurityDUnitTest.java  |  26 +-
 .../security/IntegratedClientAuthDUnitTest.java |  19 +-
 .../NoShowValue1PostProcessorDUnitTest.java |   8 +-
 .../security/PDXPostProcessorDUnitTest.java |  18 +-
 .../geode/security/PostProcessorDUnitTest.java  |  10 +-
 .../SecurityClusterConfigDUnitTest.java |  46 +-
 .../SecurityWithoutClusterConfigDUnitTest.java  |  16 +-
 .../security/StartServerAuthorizationTest.java  |  17 +-
 .../dunit/rules/ConnectionConfiguration.java|  34 ++
 .../rules/LocatorServerConfigurationRule.java   | 148 -
 .../dunit/rules/LocatorServerStartupRule.java   | 133 +
 .../geode/test/dunit/rules/LocatorStarter.java  |  74 +++
 .../dunit/rules/MBeanServerConnectionRule.java  | 132 +
 .../geode/test/dunit/rules/ServerStarter.java   |  99 
 .../geode/security/CQClientAuthDunitTest.java   |   6 +-
 .../security/CQPDXPostProcessorDUnitTest.java   |  19 +-
 .../security/CQPostProcessorDunitTest.java  |  10 +-
 .../LuceneClusterConfigurationDUnitTest.java|  25 +-
 .../web/controllers/CommonCrudController.java   |   4 +-
 .../web/controllers/PdxBasedCrudController.java |   4 +-
 .../web/security/RestSecurityService.java   |   2 +-
 48 files changed, 1382 insertions(+), 1298 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de621597/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityDUnitTest.java
--
diff --git 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityDUnitTest.java
 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityDUnitTest.java
deleted file mode 100644
index 59e00c8..000
--- 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityDUnitTest.java
+++ /dev/null
@@ -1,557 +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
- * 

[31/50] [abbrv] incubator-geode git commit: GEODE-1993: refactor tests to use rules rather than abstract classes

[udo]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de621597/geode-cq/src/test/java/org/apache/geode/security/CQClientAuthDunitTest.java
--
diff --git 
a/geode-cq/src/test/java/org/apache/geode/security/CQClientAuthDunitTest.java 
b/geode-cq/src/test/java/org/apache/geode/security/CQClientAuthDunitTest.java
index 2386af1..cc0a191 100644
--- 
a/geode-cq/src/test/java/org/apache/geode/security/CQClientAuthDunitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/security/CQClientAuthDunitTest.java
@@ -43,8 +43,10 @@ import org.apache.geode.test.junit.categories.SecurityTest;
 @Category({ DistributedTest.class, SecurityTest.class })
 public class CQClientAuthDunitTest extends AbstractSecureServerDUnitTest {
 
-  public CQClientAuthDunitTest(){
-this.postProcessor = SamplePostProcessor.class;
+  public Properties getProperties(){
+Properties  properties = super.getProperties();
+properties.setProperty(SECURITY_POST_PROCESSOR, 
SamplePostProcessor.class.getName());
+return properties;
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de621597/geode-cq/src/test/java/org/apache/geode/security/CQPDXPostProcessorDUnitTest.java
--
diff --git 
a/geode-cq/src/test/java/org/apache/geode/security/CQPDXPostProcessorDUnitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/security/CQPDXPostProcessorDUnitTest.java
index 12f08ec..470b722 100644
--- 
a/geode-cq/src/test/java/org/apache/geode/security/CQPDXPostProcessorDUnitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/security/CQPDXPostProcessorDUnitTest.java
@@ -17,11 +17,14 @@
 
 package org.apache.geode.security;
 
+import static org.apache.geode.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
 import java.util.concurrent.TimeUnit;
 
 import com.jayway.awaitility.Awaitility;
@@ -53,6 +56,7 @@ import 
org.apache.geode.test.junit.runners.CategoryWithParameterizedRunnerFactor
 
@Parameterized.UseParametersRunnerFactory(CategoryWithParameterizedRunnerFactory.class)
 public class CQPDXPostProcessorDUnitTest extends AbstractSecureServerDUnitTest 
{
   private static byte[] BYTES = {1,0};
+  private static int jmxPort = AvailablePortHelper.getRandomAvailableTCPPort();
 
   @Parameterized.Parameters
   public static Collection parameters(){
@@ -60,11 +64,20 @@ public class CQPDXPostProcessorDUnitTest extends 
AbstractSecureServerDUnitTest {
 return Arrays.asList(params);
   }
 
+  public Properties getProperties(){
+Properties  properties = super.getProperties();
+properties.setProperty(SECURITY_POST_PROCESSOR, 
PDXPostProcessor.class.getName());
+properties.setProperty("security-pdx", pdxPersistent+"");
+properties.setProperty(JMX_MANAGER_PORT, jmxPort+"");
+return properties;
+  }
+
+  public Map getData(){
+return new HashMap();
+  }
+
   public CQPDXPostProcessorDUnitTest(boolean pdxPersistent){
-this.postProcessor = PDXPostProcessor.class;
 this.pdxPersistent = pdxPersistent;
-this.jmxPort = AvailablePortHelper.getRandomAvailableTCPPort();
-values = new HashMap();
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de621597/geode-cq/src/test/java/org/apache/geode/security/CQPostProcessorDunitTest.java
--
diff --git 
a/geode-cq/src/test/java/org/apache/geode/security/CQPostProcessorDunitTest.java
 
b/geode-cq/src/test/java/org/apache/geode/security/CQPostProcessorDunitTest.java
index e2b555a..32632ef 100644
--- 
a/geode-cq/src/test/java/org/apache/geode/security/CQPostProcessorDunitTest.java
+++ 
b/geode-cq/src/test/java/org/apache/geode/security/CQPostProcessorDunitTest.java
@@ -17,8 +17,11 @@
 
 package org.apache.geode.security;
 
+import static 
org.apache.geode.distributed.ConfigurationProperties.SECURITY_POST_PROCESSOR;
 import static org.junit.Assert.*;
 
+import java.util.Properties;
+
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -40,10 +43,13 @@ import org.apache.geode.test.junit.categories.SecurityTest;
 @Category({ DistributedTest.class, SecurityTest.class })
 public class CQPostProcessorDunitTest extends AbstractSecureServerDUnitTest {
 
-  public CQPostProcessorDunitTest(){
-this.postProcessor = SamplePostProcessor.class;
+  public Properties getProperties(){
+Properties  properties = super.getProperties();
+properties.setProperty(SECURITY_POST_PROCESSOR, 
SamplePostProcessor.class.getName());
+return properties;
   }
 
+
   @Test
   public void testPostProcess(){
 String query = "select * from /AuthRegion";

[47/50] [abbrv] incubator-geode git commit: GEODE-1927: more protection from seeing com.gemstone.gemfire packaged objects

[udo]

GEODE-1927: more protection from seeing com.gemstone.gemfire packaged objects

DeadlockDetector can read an archive of dependencies across the distributed
system.  This adds a small ObjectInputStream modification to its method that
reads these archives to let it handle those created before the package rename.


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

Branch: refs/heads/feature/GEODE-1874
Commit: e130e5b62bcb2d3c561be90f46407dc49f100b4a
Parents: 56836e5
Author: Bruce Schuchardt 
Authored: Tue Oct 18 15:47:20 2016 -0700
Committer: Bruce Schuchardt 
Committed: Tue Oct 18 15:49:59 2016 -0700

--
 .../internal/deadlock/DeadlockDetector.java | 33 ++--
 1 file changed, 30 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e130e5b6/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetector.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetector.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetector.java
index 2c70418..65a521a 100644
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetector.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/deadlock/DeadlockDetector.java
@@ -19,7 +19,10 @@ package org.apache.geode.distributed.internal.deadlock;
 import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
 import java.io.ObjectInputStream;
+import java.io.ObjectStreamClass;
 import java.io.Serializable;
 import java.lang.management.LockInfo;
 import java.lang.management.ManagementFactory;
@@ -314,13 +317,37 @@ public class DeadlockDetector {
   System.exit(-1);
 }
 
-ObjectInputStream ois = new ObjectInputStream(new BufferedInputStream(new 
FileInputStream(file)));
+ObjectInputStream ois = new DDObjectInputStream(new 
BufferedInputStream(new FileInputStream(file)));
 DependencyGraph graph = (DependencyGraph) ois.readObject();
 
 return graph;
   }
-  
-  
+
+  private static class DDObjectInputStream extends ObjectInputStream {
+
+/**
+ * Creates a new DDObjectInputStream that delegates
+ * its behavior to a given InputStream.
+ */
+public DDObjectInputStream(InputStream stream) throws IOException {
+  super(stream);
+}
+
+@Override
+protected Class resolveClass(ObjectStreamClass desc) throws IOException, 
ClassNotFoundException {
+
+  String className = desc.getName();
+  if (className.startsWith("com.gemstone.gemfire")) {
+className = "org.apache.geode" + 
className.substring("com.gemstone.gemfire".length());
+  } try {
+Class clazz = Class.forName(className);
+return clazz;
+  } catch (ClassNotFoundException ex) {
+return super.resolveClass(desc);
+  }
+}
+  }
+
   private static void printHelp() {
 System.out.println("DeadlockDetector reads serialized graphs of the state 
of the distributed");
 System.out.println("system created by collectDependencies.");

[43/50] [abbrv] incubator-geode git commit: GEODE-2006: add FlakyTest category to testSelectCommand

[udo]

GEODE-2006: add FlakyTest category to testSelectCommand

Also, remove unused serial 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/474ff41e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/474ff41e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/474ff41e

Branch: refs/heads/feature/GEODE-1874
Commit: 474ff41e9ff4f357baaea27e6b4da7d4328f2231
Parents: 3d173b1
Author: Kirk Lund 
Authored: Mon Oct 17 11:06:12 2016 -0700
Committer: Kirk Lund 
Committed: Mon Oct 17 16:30:19 2016 -0700

--
 .../internal/cli/commands/GemfireDataCommandsDUnitTest.java| 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/474ff41e/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
index 5417ccb..8be6d99 100644
--- 
a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTest.java
@@ -91,7 +91,6 @@ import org.apache.geode.test.junit.categories.FlakyTest;
 @SuppressWarnings("serial")
 public class GemfireDataCommandsDUnitTest extends CliCommandTestBase {
 
-  private static final long serialVersionUID = 1L;
   private static final String REGION_NAME = "FunctionCommandsReplicatedRegion";
   private static final String REBALANCE_REGION_NAME = 
"GemfireDataCommandsDUnitTestRegion";
   private static final String REBALANCE_REGION2_NAME = 
"GemfireDataCommandsDUnitTestRegion2";
@@ -522,6 +521,7 @@ public class GemfireDataCommandsDUnitTest extends 
CliCommandTestBase {
 validateResult(cmdResult, true);
   }
 
+  @Category(FlakyTest.class) // GEODE-2006
   @Test
   public void testSelectCommand() {
 setupForSelect();

[45/50] [abbrv] incubator-geode git commit: GEODE-2011: add FlakyTest to category to testNonPersistentServerRestartAutoSerializer

[udo]

GEODE-2011: add FlakyTest to category to 
testNonPersistentServerRestartAutoSerializer


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

Branch: refs/heads/feature/GEODE-1874
Commit: 5c50954d12644b95739ee0e754852ea0f88524b8
Parents: a53c4b1
Author: Kirk Lund 
Authored: Mon Oct 17 13:56:30 2016 -0700
Committer: Kirk Lund 
Committed: Mon Oct 17 16:30:20 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5c50954d/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 1afb1ad..22c6571 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
@@ -54,6 +54,7 @@ import org.apache.geode.test.dunit.SerializableRunnable;
 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.geode.test.junit.categories.FlakyTest;
 
 @Category(DistributedTest.class)
 public class PdxClientServerDUnitTest extends JUnit4CacheTestCase {
@@ -187,6 +188,7 @@ 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);

incubator-geode git commit: GEODE-1801: Refactored some redundant logic code

[udo]

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-1801 75d8c3f5d -> 41385e5cb


GEODE-1801: Refactored some redundant logic code


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

Branch: refs/heads/feature/GEODE-1801
Commit: 41385e5cbf39b50648a9fd5407db686105990ee9
Parents: 75d8c3f
Author: Udo Kohlmeyer <ukohlme...@pivotal.io>
Authored: Tue Oct 18 10:37:54 2016 -0700
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Oct 18 10:37:54 2016 -0700

--
 .../cache/client/internal/ClientMetadataService.java  | 14 +-
 1 file changed, 1 insertion(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/41385e5c/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
index d848c9d..f2cdf47 100755
--- 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
@@ -453,19 +453,7 @@ public final class ClientMetadataService {
 this.setMetadataStable(false);
 region.getCachePerfStats().incNonSingleHopsCount();
 if (isRecursive) {
-  try {
-getClientPRMetadata(region);
-  }
-  catch (VirtualMachineError e) {
-SystemFailure.initiateFailure(e);
-throw e;
-  }
-  catch (Throwable e) {
-SystemFailure.checkFailure();
-if (logger.isDebugEnabled()) {
-  logger.debug("An exception occurred while fetching metadata", e);
-}
-  }
+  getClientPRMetadataForRegion(region);
 }
 else {
   synchronized (fetchTaskCountLock) {

incubator-geode git commit: GEODE-1874: Changed setNextNeighbor to not create HashMap for every p2p invocation

[udo]

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-1874 edaa462eb -> fb725edbc


GEODE-1874: Changed setNextNeighbor to not create HashMap for every p2p 
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/fb725edb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/fb725edb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/fb725edb

Branch: refs/heads/feature/GEODE-1874
Commit: fb725edbc3dfa4897b7e7916431c7bf5a2456678
Parents: edaa462
Author: Udo Kohlmeyer <ukohlme...@pivotal.io>
Authored: Thu Oct 13 10:46:44 2016 +1100
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Thu Oct 13 10:46:44 2016 +1100

--
 .../internal/membership/gms/fd/GMSHealthMonitor.java | 15 ++-
 1 file changed, 6 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fb725edb/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
index 97a413c..b3598cd 100644
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
@@ -374,15 +374,14 @@ public class GMSHealthMonitor implements HealthMonitor, 
MessageHandler {
*/
   private void contactedBy(InternalDistributedMember sender, long timeStamp) {
 TimeStamp cTS = new TimeStamp(timeStamp);
-//TODO Udo: why putIfAbsent. Surely only put is required
 cTS = memberTimeStamps.putIfAbsent(sender, cTS);
 if (cTS != null && cTS.getTime() < timeStamp) {
   cTS.setTime(timeStamp);
 }
 if (suspectedMemberInView.remove(sender) != null) {
   logger.info("No longer suspecting {}", sender);
+  setNextNeighbor(currentView, null);
 }
-setNextNeighbor(currentView, null);
   }
 
 
@@ -834,7 +833,7 @@ public class GMSHealthMonitor implements HealthMonitor, 
MessageHandler {
 }
 
 List allMembers = newView.getMembers();
-
+//
 //Set checkAllSuspected = new 
HashSet<>(allMembers);
 //checkAllSuspected.removeAll(suspectedMemberInView.keySet());
 //checkAllSuspected.remove(localAddress);
@@ -1066,10 +1065,7 @@ public class GMSHealthMonitor implements HealthMonitor, 
MessageHandler {
 
   private void processHeartbeat(HeartbeatMessage m) {
 this.stats.incHeartbeatsReceived();
-if (m.getRequestId() < 0) {
-  // a periodic heartbeat
-  contactedBy(m.getSender(), System.currentTimeMillis());
-} else {
+if (m.getRequestId() >= 0) {
   Response resp = requestIdVsResponse.get(m.getRequestId());
   logger.trace("Got heartbeat from member {}. {}", m.getSender(), (resp != 
null ? "Check thread still waiting" : "Check thread is not waiting"));
   if (resp != null) {
@@ -1078,9 +1074,10 @@ public class GMSHealthMonitor implements HealthMonitor, 
MessageHandler {
   resp.notify();
 }
   }
-  //we got heartbeat lets update timestamp
-  contactedBy(m.getSender(), System.currentTimeMillis());
+
 }
+//we got heartbeat lets update timestamp
+contactedBy(m.getSender(), System.currentTimeMillis());
   }
 
   /**

incubator-geode git commit: GEODE-1874: Changed setNextNeighbor to not create HashMap for every p2p invocation

[udo]

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-1874 [created] edaa462eb


GEODE-1874: Changed setNextNeighbor to not create HashMap for every p2p 
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/edaa462e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/edaa462e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/edaa462e

Branch: refs/heads/feature/GEODE-1874
Commit: edaa462eb41c9380d9fd4eca889ccc269fcdbdf3
Parents: 280d2d8
Author: Udo Kohlmeyer <ukohlme...@pivotal.io>
Authored: Wed Oct 12 11:54:33 2016 +1100
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Wed Oct 12 11:54:33 2016 +1100

--
 .../membership/gms/fd/GMSHealthMonitor.java | 394 ++-
 1 file changed, 210 insertions(+), 184 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/edaa462e/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
index aafb498..97a413c 100644
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/gms/fd/GMSHealthMonitor.java
@@ -16,9 +16,7 @@
  */
 package org.apache.geode.distributed.internal.membership.gms.fd;
 
-import static 
org.apache.geode.internal.DataSerializableFixedID.HEARTBEAT_REQUEST;
-import static 
org.apache.geode.internal.DataSerializableFixedID.HEARTBEAT_RESPONSE;
-import static 
org.apache.geode.internal.DataSerializableFixedID.SUSPECT_MEMBERS_MESSAGE;
+import static org.apache.geode.internal.DataSerializableFixedID.*;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -29,7 +27,19 @@ import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.SocketTimeoutException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.Timer;
+import java.util.TimerTask;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutorService;
@@ -40,7 +50,7 @@ import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.*;
+import java.util.stream.Collectors;
 
 import org.apache.logging.log4j.Logger;
 import org.jgroups.util.UUID;
@@ -69,7 +79,7 @@ import 
org.apache.geode.internal.security.SecurableCommunicationChannel;
 
 /**
  * Failure Detection
- * 
+ * 
  * This class make sure that each member is alive and communicating to this 
member.
  * To make sure that we create the ring of members based on current view. On 
this
  * ring, each member make sure that next-member in ring is communicating with 
it.
@@ -77,17 +87,16 @@ import 
org.apache.geode.internal.security.SecurableCommunicationChannel;
  * member has not communicated in last period(member-timeout) then we check 
whether
  * this member is still alive or not. Based on that we informed probable 
coordinators
  * to remove that member from view.
- * 
+ * 
  * It has {@link #suspect(InternalDistributedMember, String)} api, which can 
be used
  * to initiate suspect processing for any member. First is checks whether the 
member is
  * responding or not. Then it informs probable coordinators to remove that 
member from
  * view.
- * 
+ * 
  * It has {@link #checkIfAvailable(DistributedMember, String, boolean)} api to 
see
  * if that member is alive. Then based on removal flag it initiates the 
suspect processing
  * for that member.
- * 
- * */
+ */
 @SuppressWarnings({ "SynchronizationOnLocalVariableOrMethodParameter", 
"NullableProblems" })
 public class GMSHealthMonitor implements HealthMonitor, MessageHandler {
 
@@ -99,9 +108,11 @@ public class GMSHealthMonitor implements HealthMonitor, 
MessageHandler {
   volatile private boolean isStopping = false;
   private final AtomicInteger requestId = new AtomicInteger();
 
-  /** membership logger */
+  /**
+   * membership logger
+   */
   private static final Logger logger = Services.getLogger();
-  
+
   /*

incubator-geode git commit: GEODE-1801: Amended some changes

[udo]

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-1801 e982284d7 -> 75d8c3f5d


GEODE-1801: Amended some changes


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

Branch: refs/heads/feature/GEODE-1801
Commit: 75d8c3f5d2c0ca6f1aa399b4d9493d0c4b1e2fb3
Parents: e982284
Author: Udo Kohlmeyer <ukohlme...@pivotal.io>
Authored: Wed Oct 12 07:35:59 2016 +1100
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Wed Oct 12 07:35:59 2016 +1100

--
 .../client/internal/ClientMetadataService.java  |  97 
 .../geode/internal/cache/GemFireCacheImpl.java  | 226 ---
 2 files changed, 148 insertions(+), 175 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/75d8c3f5/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
index 325322e..d848c9d 100755
--- 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
@@ -16,44 +16,27 @@
  */
 package org.apache.geode.cache.client.internal;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArraySet;
-
-import org.apache.logging.log4j.Logger;
-
 import org.apache.geode.SystemFailure;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.EntryOperation;
-import org.apache.geode.cache.FixedPartitionResolver;
-import org.apache.geode.cache.Operation;
-import org.apache.geode.cache.PartitionResolver;
-import org.apache.geode.cache.Region;
+import org.apache.geode.cache.*;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.distributed.internal.ServerLocation;
-import org.apache.geode.internal.cache.BucketServerLocation66;
-import org.apache.geode.internal.cache.EntryOperationImpl;
-import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.internal.cache.PartitionedRegion;
-import org.apache.geode.internal.cache.PartitionedRegionHelper;
+import org.apache.geode.internal.cache.*;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
+import org.apache.logging.log4j.Logger;
+
+import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArraySet;
 
 /**
  * Maintains {@link ClientPartitionAdvisor} for Partitioned Regions on servers
  * Client operations will consult this service to identify the server locations
  * on which the data for the client operation is residing
  *
+ *
  * @since GemFire 6.5
+ *
  */
 public final class ClientMetadataService {
 
@@ -69,9 +52,7 @@ public final class ClientMetadataService {
 
   public static final int INITIAL_VERSION = 0;
 
-  /**
-   * random number generator used in pruning
-   */
+  /** random number generator used in pruning */
   private final Random rand = new Random();
 
   private volatile boolean isMetadataStable = true;
@@ -146,8 +127,11 @@ public final class ClientMetadataService {
   String partition = ((FixedPartitionResolver) 
resolver).getPartitionName(entryOp, prAdvisor.getFixedPartitionNames());
   if (partition == null) {
 Object[] prms = new Object[] { region.getName(), resolver };
-throw new 
IllegalStateException(LocalizedStrings.PartitionedRegionHelper_FOR_REGION_0_PARTITIONRESOLVER_1_RETURNED_PARTITION_NAME_NULL.toLocalizedString(prms));
-  } else {
+throw new IllegalStateException(
+
LocalizedStrings.PartitionedRegionHelper_FOR_REGION_0_PARTITIONRESOLVER_1_RETURNED_PARTITION_NAME_NULL
+.toLocalizedString(prms));
+  }
+  else {
 bucketId = prAdvisor.assignFixedBucketId(region, partition, 
resolveKey);
 if (bucketId == -1) {
   // scheduleGetPRMetaData((LocalRegion)region);
@@ -161,9 +145,9 @@ public final class ClientMetadataService {
 
 ServerLocation bucketServerLocation = getServerLocation(region, operation, 
bucketId);
 ServerLocation 

[11/20] incubator-geode git commit: GEODE-1914 Removed old dtds from geode source code(kept 7.0 and above)

[udo]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/main/resources/org/apache/geode/cache/doc-files/cache6_0.dtd
--
diff --git 
a/geode-core/src/main/resources/org/apache/geode/cache/doc-files/cache6_0.dtd 
b/geode-core/src/main/resources/org/apache/geode/cache/doc-files/cache6_0.dtd
deleted file mode 100755
index 82bdc11..000
--- 
a/geode-core/src/main/resources/org/apache/geode/cache/doc-files/cache6_0.dtd
+++ /dev/null
@@ -1,862 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  
-
-
-
-
-  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/main/resources/org/apache/geode/cache/doc-files/cache6_1.dtd
--
diff --git 
a/geode-core/src/main/resources/org/apache/geode/cache/doc-files/cache6_1.dtd 
b/geode-core/src/main/resources/org/apache/geode/cache/doc-files/cache6_1.dtd
deleted file mode 100755
index 3215fbc..000
--- 
a/geode-core/src/main/resources/org/apache/geode/cache/doc-files/cache6_1.dtd
+++ /dev/null
@@ -1,871 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  
-
-
-
-
-  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

[08/20] incubator-geode git commit: GEODE-1914 Removed old dtds from geode source code(kept 7.0 and above)

[udo]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/java/org/apache/geode/cache30/CacheXml57DUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/cache30/CacheXml57DUnitTest.java 
b/geode-core/src/test/java/org/apache/geode/cache30/CacheXml57DUnitTest.java
deleted file mode 100644
index 833093d..000
--- a/geode-core/src/test/java/org/apache/geode/cache30/CacheXml57DUnitTest.java
+++ /dev/null
@@ -1,662 +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.cache30;
-
-import static org.junit.Assert.*;
-
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
-import java.util.Arrays;
-import java.util.Properties;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheException;
-import org.apache.geode.cache.CustomExpiry;
-import org.apache.geode.cache.DataPolicy;
-import org.apache.geode.cache.Declarable;
-import org.apache.geode.cache.DynamicRegionFactory;
-import org.apache.geode.cache.ExpirationAttributes;
-import org.apache.geode.cache.InterestPolicy;
-import org.apache.geode.cache.MirrorType;
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.Region.Entry;
-import org.apache.geode.cache.Scope;
-import org.apache.geode.cache.SubscriptionAttributes;
-import org.apache.geode.cache.client.Pool;
-import org.apache.geode.cache.client.PoolFactory;
-import org.apache.geode.cache.client.PoolManager;
-import org.apache.geode.cache.server.CacheServer;
-import org.apache.geode.cache.server.ClientSubscriptionConfig;
-import org.apache.geode.cache.server.ServerLoad;
-import org.apache.geode.cache.server.ServerLoadProbeAdapter;
-import org.apache.geode.cache.server.ServerMetrics;
-import org.apache.geode.internal.AvailablePort;
-import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.internal.cache.PoolFactoryImpl;
-import org.apache.geode.internal.cache.xmlcache.CacheCreation;
-import org.apache.geode.internal.cache.xmlcache.CacheXml;
-import org.apache.geode.internal.cache.xmlcache.Declarable2;
-import org.apache.geode.internal.cache.xmlcache.RegionAttributesCreation;
-import org.apache.geode.internal.cache.xmlcache.RegionCreation;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.test.dunit.Host;
-import org.apache.geode.test.dunit.IgnoredException;
-import org.apache.geode.test.dunit.NetworkUtils;
-import org.apache.geode.test.dunit.SerializableCallable;
-import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
-/**
- * Tests 5.7 cache.xml features.
- * 
- * @since GemFire 5.7
- */
-@Category(DistributedTest.class)
-public class CacheXml57DUnitTest extends CacheXml55DUnitTest {
-
-  private final static String ALIAS1;
-  private final static String ALIAS2;
-
-  static {
-String tmp_alias1 = "localhost";
-String tmp_alias2 = "localhost";
-ALIAS1 = tmp_alias1;
-ALIAS2 = tmp_alias2;
-  }
-
-  @Override
-  protected String getGemFireVersion() {
-return CacheXml.VERSION_5_7;
-  }
-
-  /**
-   * Tests the groups subelement on bridge-server.
-   */
-  @Test
-  public void testDefaultCacheServerGroups() throws CacheException {
-CacheCreation cache = new CacheCreation();
-CacheServer bs = cache.addCacheServer();
-bs.setPort(AvailablePortHelper.getRandomAvailableTCPPort());
-bs.setGroups(CacheServer.DEFAULT_GROUPS);
-testXml(cache);
-Cache c = getCache();
-assertNotNull(c);
-CacheServer server = 
(CacheServer)cache.getCacheServers().iterator().next();
-assertNotNull(server);
-assertEquals(CacheServer.DEFAULT_GROUPS, server.getGroups());
-  }
-
-  @Test
-  public void testOneCacheServerGroups() throws CacheException {
-CacheCreation cache = new CacheCreation();
-CacheServer bs = cache.addCacheServer();
-bs.setPort(AvailablePortHelper.getRandomAvailableTCPPort());
-String[] groups = new String[]{"group1"};
-bs.setGroups(groups);
-

[07/20] incubator-geode git commit: GEODE-1914 Removed old dtds from geode source code(kept 7.0 and above)

[udo]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/java/org/apache/geode/cache30/CacheXml65DUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/cache30/CacheXml65DUnitTest.java 
b/geode-core/src/test/java/org/apache/geode/cache30/CacheXml65DUnitTest.java
deleted file mode 100644
index a12737b..000
--- a/geode-core/src/test/java/org/apache/geode/cache30/CacheXml65DUnitTest.java
+++ /dev/null
@@ -1,1211 +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.cache30;
-
-import static org.junit.Assert.*;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.InetSocketAddress;
-import java.net.UnknownHostException;
-import java.util.Arrays;
-
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import org.apache.geode.cache.AttributesFactory;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheException;
-import org.apache.geode.cache.DataPolicy;
-import org.apache.geode.cache.DiskStore;
-import org.apache.geode.cache.DiskStoreFactory;
-import org.apache.geode.cache.EvictionAction;
-import org.apache.geode.cache.EvictionAttributes;
-import org.apache.geode.cache.InterestPolicy;
-import org.apache.geode.cache.PartitionAttributes;
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.RegionAttributes;
-import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.cache.Scope;
-import org.apache.geode.cache.SubscriptionAttributes;
-import org.apache.geode.cache.TransactionWriter;
-import org.apache.geode.cache.client.ClientRegionShortcut;
-import org.apache.geode.cache.client.Pool;
-import org.apache.geode.cache.client.PoolFactory;
-import org.apache.geode.cache.client.PoolManager;
-import org.apache.geode.cache.server.CacheServer;
-import org.apache.geode.cache.server.ClientSubscriptionConfig;
-import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.internal.cache.LocalRegion;
-import org.apache.geode.internal.cache.xmlcache.CacheCreation;
-import 
org.apache.geode.internal.cache.xmlcache.CacheTransactionManagerCreation;
-import org.apache.geode.internal.cache.xmlcache.CacheXml;
-import org.apache.geode.internal.cache.xmlcache.ClientCacheCreation;
-import org.apache.geode.internal.cache.xmlcache.RegionAttributesCreation;
-import org.apache.geode.internal.cache.xmlcache.RegionCreation;
-import org.apache.geode.internal.cache.xmlcache.ResourceManagerCreation;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.test.dunit.Assert;
-import org.apache.geode.test.dunit.IgnoredException;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
-/**
- * Tests 6.5 cache.xml features.
- * 
- * @since GemFire 6.5
- */
-@Category(DistributedTest.class)
-public class CacheXml65DUnitTest extends CacheXml61DUnitTest {
-  
-  private final static String ALIAS1;
-
-  private final static String ALIAS2;
-  
-  static {
-String tmp_alias1 = "localhost";
-String tmp_alias2 = "localhost";
-//try {
-//  tmp_alias1 = getServerHostName(Host.getHost(0));
-//  InetSocketAddress addr = createINSA(tmp_alias1, 1);
-//  tmp_alias2 = addr.getHostName();
-//}
-//catch (IllegalArgumentException suppress) {
-//  // The runnables dont have a Host object initialized, but they dont 
need
-//  // access to the aliases so its ok to suppress this.
-//}
-//finally {
-  ALIAS1 = tmp_alias1;
-  ALIAS2 = tmp_alias2;
-//}
-  }
-  
-  private static InetSocketAddress createINSA(String host, int port) {
-try {
-  InetAddress hostAddr = InetAddress.getByName(host);
-  return new InetSocketAddress(hostAddr, port);
-}
-catch (UnknownHostException cause) {
-  IllegalArgumentException ex = new IllegalArgumentException(
-  "Unknown host " + host);
-  ex.initCause(cause);
-  throw ex;
-}
-  }
-  // // Constructors
-
-  public CacheXml65DUnitTest() {
-super();
-  }
-
-  // // Helper 

[03/20] incubator-geode git commit: GEODE-1972: Move Geode Hibernate module to a feature branch

[udo]

GEODE-1972: Move Geode Hibernate module to a feature branch


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

Branch: refs/heads/feature/GEODE-1801
Commit: 371b6fba0c4d421b3b62e85a0b45f5e2f81525fc
Parents: fa14107
Author: Jason Huynh <huyn...@gmail.com>
Authored: Mon Oct 10 10:37:34 2016 -0700
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Oct 11 14:06:53 2016 +1100

--
 extensions/geode-modules-assembly/build.gradle  |  12 +-
 extensions/geode-modules-hibernate/build.gradle |  42 --
 .../geode/modules/hibernate/EnumType.java   |  57 ---
 .../geode/modules/hibernate/GemFireCache.java   | 238 ---
 .../modules/hibernate/GemFireCacheListener.java |  54 ---
 .../modules/hibernate/GemFireCacheProvider.java | 200 -
 .../hibernate/GemFireQueryCacheFactory.java |  39 --
 .../modules/hibernate/GemFireRegionFactory.java | 221 --
 .../modules/hibernate/internal/Access.java  | 257 
 .../ClientServerRegionFactoryDelegate.java  | 201 -
 .../hibernate/internal/CollectionAccess.java| 224 --
 .../hibernate/internal/EntityRegionWriter.java  |  87 
 .../hibernate/internal/EntityVersion.java   |  27 --
 .../hibernate/internal/EntityVersionImpl.java   |  50 ---
 .../hibernate/internal/EntityWrapper.java   |  89 
 .../hibernate/internal/GemFireBaseRegion.java   | 166 
 .../internal/GemFireCollectionRegion.java   |  59 ---
 .../hibernate/internal/GemFireEntityRegion.java | 187 -
 .../internal/GemFireQueryResultsRegion.java | 113 -
 .../modules/hibernate/internal/KeyWrapper.java  |  92 
 .../internal/NonStrictReadWriteAccess.java  |  83 
 .../hibernate/internal/ReadOnlyAccess.java  |  55 ---
 .../hibernate/internal/ReadWriteAccess.java |  36 --
 .../internal/RegionFactoryDelegate.java | 146 ---
 .../hibernate/internal/TransactionalAccess.java |  25 --
 .../java/org/apache/geode/modules/Event.java|  67 ---
 .../geode/modules/HibernateJUnitTest.java   | 416 ---
 .../java/org/apache/geode/modules/Owner.java| 185 -
 .../java/org/apache/geode/modules/Person.java   |  72 
 .../org/apache/geode/modules/SecondVMTest.java  |  95 -
 .../src/test/resources/log4j.properties |  16 -
 .../org/apache/geode/modules/Event.hbm.xml  |  32 --
 .../org/apache/geode/modules/Person.hbm.xml |  36 --
 gradle/sonar.gradle |   6 -
 settings.gradle |   1 -
 35 files changed, 1 insertion(+), 3685 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/371b6fba/extensions/geode-modules-assembly/build.gradle
--
diff --git a/extensions/geode-modules-assembly/build.gradle 
b/extensions/geode-modules-assembly/build.gradle
index f037aad..5604e12 100644
--- a/extensions/geode-modules-assembly/build.gradle
+++ b/extensions/geode-modules-assembly/build.gradle
@@ -154,15 +154,6 @@ task distTomcat(type: Zip, dependsOn: 
':extensions/geode-modules:assemble') {
   }
 }
 
-task distHibernate(type: Zip, dependsOn: 
':extensions/geode-modules-hibernate:assemble') {
-  archiveName = "Apache_Geode_Modules-${version}-Hibernate.zip"
-
-  into('lib') {
-from getJarArtifact(':extensions/geode-modules')
-from getJarArtifact(':extensions/geode-modules-hibernate')
-  }
-}
-
 task distAppServer(type: Zip, dependsOn: 
':extensions/geode-modules-session:assemble') {
   archiveName = "Apache_Geode_Modules-${version}-AppServer.zip"
 
@@ -204,11 +195,10 @@ task distTcServer30(type: Zip, dependsOn: 
[':extensions/geode-modules:assemble',
 dependencies {
   moduleDistOutputs distTcServer.outputs.files
   moduleDistOutputs distTcServer30.outputs.files
-  moduleDistOutputs distHibernate.outputs.files
   moduleDistOutputs distAppServer.outputs.files
   moduleDistOutputs distTomcat.outputs.files
 }
 
-task dist(type: Task, dependsOn: ['distTcServer', 'distTcServer30', 
'distTomcat', 'distHibernate', 'distAppServer'])
+task dist(type: Task, dependsOn: ['distTcServer', 'distTcServer30', 
'distTomcat', 'distAppServer'])
 
 build.dependsOn dist

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/371b6fba/extensions/geode-modules-hibernate/build.gradle
--
diff --git a/extensions/geode-modules-hibernate/build.gradle 
b/extensions/geode-modules-hibernate/build.gradle
deleted file mode 100644
index 5169b04..000
--- a/extensions/geod

[15/20] incubator-geode git commit: GEODE-1570 - developer REST API should be secured

[udo]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/90ecca2d/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/GeodeAuthentication.java
--
diff --git 
a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/GeodeAuthentication.java
 
b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/GeodeAuthentication.java
new file mode 100644
index 000..c4226f6
--- /dev/null
+++ 
b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/GeodeAuthentication.java
@@ -0,0 +1,37 @@
+/*
+ * 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.rest.internal.web.security;
+
+import 
org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.authority.AuthorityUtils;
+
+class GeodeAuthentication extends UsernamePasswordAuthenticationToken {
+  /**
+   * This constructor should only be used by 
AuthenticationManager or AuthenticationProvider
+   * implementations that are satisfied with producing a trusted (i.e. {@link 
#isAuthenticated()} = true)
+   * authentication token.
+   * @param principal
+   * @param credentials
+   */
+  public GeodeAuthentication(final Object principal,
+ final Object credentials) {
+super(principal, credentials, AuthorityUtils.NO_AUTHORITIES);
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/90ecca2d/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/GeodeAuthenticationProvider.java
--
diff --git 
a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/GeodeAuthenticationProvider.java
 
b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/GeodeAuthenticationProvider.java
new file mode 100644
index 000..c482047
--- /dev/null
+++ 
b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/GeodeAuthenticationProvider.java
@@ -0,0 +1,56 @@
+/*
+ * 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.rest.internal.web.security;
+
+import org.apache.shiro.subject.Subject;
+import org.springframework.security.authentication.AuthenticationProvider;
+import org.springframework.security.authentication.BadCredentialsException;
+import 
org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.stereotype.Component;
+
+import org.apache.geode.internal.security.IntegratedSecurityService;
+import org.apache.geode.security.AuthenticationFailedException;
+
+
+@Component
+public class GeodeAuthenticationProvider implements AuthenticationProvider {
+
+  @Override
+  public Authentication authenticate(Authentication authentication) throws 
AuthenticationException {
+String username = authentication.getName();
+String password = authentication.getCredentials().toString();
+
+try {
+  Subject subject = 
IntegratedSecurityService.getSecurityService().login(username, password);
+  if (subject != null) {
+return new GeodeAuthentication(subject.getPrincipal(), 
authentication.getCredentials());
+  }
+} catch (AuthenticationFailedException 

[20/20] incubator-geode git commit: GEODE-1570: upgrade spring libraries

[udo]

GEODE-1570: upgrade spring libraries

* upgrade the spring libraries and related libraries
* upgrade version numbers in the NOTICE and LICENSE file
* some test refactor


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

Branch: refs/heads/feature/GEODE-1801
Commit: fa14107e096ec76be901954e4de9f86248538026
Parents: c64b61a
Author: Jinmei Liao <jil...@pivotal.io>
Authored: Thu Sep 15 14:17:05 2016 -0700
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Oct 11 14:06:53 2016 +1100

--
 geode-assembly/src/main/dist/NOTICE |  10 +-
 .../internal/web/RestInterfaceJUnitTest.java|  42 +++--
 .../internal/web/RestSecurityDUnitTest.java | 173 +--
 .../src/test/resources/expected_jars.txt|   1 +
 geode-core/build.gradle |   3 +
 .../cli/shell/GfshInitFileJUnitTest.java|  18 +-
 .../security/AbstractSecureServerDUnitTest.java |   1 -
 .../security/GemFireAuthentication.java |   2 +-
 .../security/GemFireAuthenticationProvider.java |   1 -
 .../service/MemberGatewayHubService.java|  11 +-
 geode-pulse/src/main/webapp/Login.html  |   6 +-
 geode-pulse/src/main/webapp/META-INF/NOTICE |   6 +-
 .../webapp/WEB-INF/mvc-dispatcher-servlet.xml   |   8 +-
 .../src/main/webapp/WEB-INF/spring-security.xml |  17 +-
 .../geode/tools/pulse/tests/PulseAuthTest.java  |   2 +-
 .../tools/pulse/tests/PulseAutomatedTest.java   |   2 +-
 geode-web-api/build.gradle  |   1 +
 .../geode/rest/internal/web/util/JSONUtils.java | 105 ++-
 .../rest/internal/web/util/JsonWriter.java  |  16 +-
 geode-web-api/src/main/webapp/META-INF/NOTICE   |   6 +-
 .../src/main/webapp/WEB-INF/geode-servlet.xml   |  14 +-
 geode-web/src/main/webapp/META-INF/NOTICE   |   2 +-
 .../main/webapp/WEB-INF/geode-mgmt-servlet.xml  |   6 +-
 gradle/dependency-resolution.gradle |  19 --
 gradle/dependency-versions.properties   |  20 +--
 25 files changed, 162 insertions(+), 330 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fa14107e/geode-assembly/src/main/dist/NOTICE
--
diff --git a/geode-assembly/src/main/dist/NOTICE 
b/geode-assembly/src/main/dist/NOTICE
index 1924007..412774d 100644
--- a/geode-assembly/src/main/dist/NOTICE
+++ b/geode-assembly/src/main/dist/NOTICE
@@ -26,7 +26,7 @@ Java ClassMate library was originally written by Tatu 
Saloranta (tatu.saloranta@
   
   * Brian Langel
 
-Jackson Core 2.2.0
+Jackson Core 2.8.2
 
   # Jackson JSON processor
 
@@ -242,7 +242,7 @@ Apache Lucene
   from and not be held liable to the user for any such damages as noted
   above as far as the program is concerned.
 
-Spring Framework 4.2.4.RELEASE
+Spring Framework 4.3.2.RELEASE
 Copyright (c) 2002-2015 Pivotal, Inc.
 
   This product is licensed to you under the Apache License, Version 2.0
@@ -254,7 +254,7 @@ Copyright (c) 2002-2015 Pivotal, Inc.
   these subcomponents is subject to the terms and conditions of the
   subcomponent's license, as noted in the license.txt file.
 
-Spring Hateoas 0.12
+Spring Hateoas 0.21.0
 Copyright (c) [2012-2014] Pivotal Software, Inc.
 
   This product is licensed to you under the Apache License, Version 2.0 (the 
"License").  
@@ -265,12 +265,12 @@ Copyright (c) [2012-2014] Pivotal Software, Inc.
   code for the these subcomponents is subject to the terms and
   conditions of the subcomponent's license, as noted in the LICENSE file.
 
-Spring LDAP Core 1.3.2
+Spring LDAP Core 2.1.0
 
This product includes software developed by the Spring LDAP
Project (http://www.springframework.org/ldap).
 
-Spring Shell 1.1.0
+Spring Shell 1.2.0
 
This product includes software developed by the Spring Framework
Project (http://www.springframework.org).

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fa14107e/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java
--
diff --git 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java
 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java
index 0d93518..4e3269e 100644
--- 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java
+++ 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestInterfaceJUnitTest.java
@@ -16,15 +16,41 @@
  */
 package org.apache.geode.rest.internal

[05/20] incubator-geode git commit: GEODE-1914 Removed old dtds from geode source code(kept 7.0 and above)

[udo]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/java/org/apache/geode/internal/JarClassLoaderJUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/internal/JarClassLoaderJUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/internal/JarClassLoaderJUnitTest.java
index 31a72c8..1961fb2 100644
--- 
a/geode-core/src/test/java/org/apache/geode/internal/JarClassLoaderJUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/internal/JarClassLoaderJUnitTest.java
@@ -337,7 +337,7 @@ public class JarClassLoaderJUnitTest {
 stringBuffer.append("");
 stringBuffer.append("http://www.gemstone.com/dtd/cache6_6.dtd\;>");
+stringBuffer.append("  \"http://www.gemstone.com/dtd/cache7_0.dtd\;>");
 stringBuffer.append("");
 stringBuffer.append("  ");
 stringBuffer.append("");
@@ -415,7 +415,7 @@ public class JarClassLoaderJUnitTest {
 stringBuffer.append("");
 stringBuffer.append("http://www.gemstone.com/dtd/cache6_6.dtd\;>");
+stringBuffer.append("  \"http://www.gemstone.com/dtd/cache7_0.dtd\;>");
 stringBuffer.append("");
 stringBuffer.append("  ");
 stringBuffer.append("");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java 
b/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java
index 21accef..f2ba355 100644
--- 
a/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/pdx/PdxSerializableJUnitTest.java
@@ -147,8 +147,8 @@ public class PdxSerializableJUnitTest {
   PrintWriter pw = new PrintWriter(new OutputStreamWriter(baos), true);
   pw.println("");
   pw.println("http://www.gemstone.com/dtd/cache6_6.dtd\;>");
+  pw.println("  \"-//GemStone Systems, Inc.//GemFire Declarative Caching 
7.0//EN\"");
+  pw.println("  \"http://www.gemstone.com/dtd/cache7_0.dtd\;>");
   pw.println("");
   pw.println("  ");
   pw.println("  ");
@@ -224,8 +224,8 @@ public class PdxSerializableJUnitTest {
   PrintWriter pw = new PrintWriter(new OutputStreamWriter(baos), true);
   pw.println("");
   pw.println("http://www.gemstone.com/dtd/cache6_6.dtd\;>");
+  pw.println("  \"-//GemStone Systems, Inc.//GemFire Declarative Caching 
7.0//EN\"");
+  pw.println("  \"http://www.gemstone.com/dtd/cache7_0.dtd\;>");
   pw.println("");
   pw.println("  ");
   pw.println("  ");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/jta/cachejta.xml
--
diff --git a/geode-core/src/test/resources/jta/cachejta.xml 
b/geode-core/src/test/resources/jta/cachejta.xml
index 9a36ee6..40d0a7b 100644
--- a/geode-core/src/test/resources/jta/cachejta.xml
+++ b/geode-core/src/test/resources/jta/cachejta.xml
@@ -17,8 +17,8 @@
 -->
 
 http://www.gemstone.com/dtd/cache6_0.dtd;>
+  "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+  "http://www.gemstone.com/dtd/cache7_0.dtd;>
 



http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest_single_pool.xml
--
diff --git 
a/geode-core/src/test/resources/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest_single_pool.xml
 
b/geode-core/src/test/resources/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest_single_pool.xml
index 92454c4..2a7e8f4 100644
--- 
a/geode-core/src/test/resources/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest_single_pool.xml
+++ 
b/geode-core/src/test/resources/org/apache/geode/cache/client/ClientCacheFactoryJUnitTest_single_pool.xml
@@ -21,8 +21,8 @@
  region's pool connects to a server listening on port 40404.
 -->
 http://www.gemstone.com/dtd/cache6_5.dtd;>
+  "-//GemStone Systems, Inc.//GemFire Declarative Caching 7.0//EN"
+  "http://www.gemstone.com/dtd/cache7_0.dtd;>
 
   
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/resources/org/apache/geode/cache/query/functional/index-creation-with-eviction.xml
--
diff --git 
a/geode-core/src/test/resources/org/apache/geode/cache/query/functional/index-creation-with-eviction.xml
 
b/geode-core/src/test/resources/org/apache/geode/cache/query/functional/index-creation-with-eviction.xml
index 861bb23..f963969 100644
--- 

[06/20] incubator-geode git commit: GEODE-1914 Removed old dtds from geode source code(kept 7.0 and above)

[udo]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java 
b/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
index ededb8d..432c772 100644
--- a/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/cache30/CacheXml66DUnitTest.java
@@ -16,48 +16,139 @@
  */
 package org.apache.geode.cache30;
 
+import static org.apache.geode.distributed.ConfigurationProperties.ROLES;
 import static org.junit.Assert.*;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FilenameFilter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.io.Serializable;
+import java.net.InetAddress;
+import java.net.InetSocketAddress;
+import java.net.UnknownHostException;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
+import org.xml.sax.SAXException;
 
+import com.company.app.DBLoader;
+
+import org.apache.geode.DataSerializable;
+import org.apache.geode.DataSerializer;
+import org.apache.geode.cache.AttributesFactory;
+import org.apache.geode.cache.AttributesMutator;
 import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.CacheException;
 import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.CacheListener;
+import org.apache.geode.cache.CacheLoader;
+import org.apache.geode.cache.CacheLoaderException;
 import org.apache.geode.cache.CacheTransactionManager;
+import org.apache.geode.cache.CacheWriter;
+import org.apache.geode.cache.CacheXmlException;
+import org.apache.geode.cache.CustomExpiry;
+import org.apache.geode.cache.DataPolicy;
 import org.apache.geode.cache.Declarable;
+import org.apache.geode.cache.DiskStore;
+import org.apache.geode.cache.DiskStoreFactory;
+import org.apache.geode.cache.DiskWriteAttributesFactory;
+import org.apache.geode.cache.DynamicRegionFactory;
+import org.apache.geode.cache.EvictionAction;
+import org.apache.geode.cache.EvictionAlgorithm;
+import org.apache.geode.cache.EvictionAttributes;
+import org.apache.geode.cache.ExpirationAction;
+import org.apache.geode.cache.ExpirationAttributes;
 import org.apache.geode.cache.FixedPartitionAttributes;
+import org.apache.geode.cache.InterestPolicy;
+import org.apache.geode.cache.LoaderHelper;
+import org.apache.geode.cache.LossAction;
+import org.apache.geode.cache.MembershipAttributes;
+import org.apache.geode.cache.MirrorType;
 import org.apache.geode.cache.PartitionAttributes;
 import org.apache.geode.cache.PartitionAttributesFactory;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionAttributes;
+import org.apache.geode.cache.RegionExistsException;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.ResumptionAction;
+import org.apache.geode.cache.Scope;
+import org.apache.geode.cache.SubscriptionAttributes;
+import org.apache.geode.cache.TransactionListener;
+import org.apache.geode.cache.TransactionWriter;
+import org.apache.geode.cache.Region.Entry;
 import org.apache.geode.cache.client.ClientCache;
+import org.apache.geode.cache.client.ClientRegionShortcut;
+import org.apache.geode.cache.client.Pool;
+import org.apache.geode.cache.client.PoolFactory;
+import org.apache.geode.cache.client.PoolManager;
+import org.apache.geode.cache.execute.Function;
+import org.apache.geode.cache.execute.FunctionService;
+import org.apache.geode.cache.server.CacheServer;
+import org.apache.geode.cache.server.ClientSubscriptionConfig;
+import org.apache.geode.cache.server.ServerLoad;
+import org.apache.geode.cache.server.ServerLoadProbeAdapter;
+import org.apache.geode.cache.server.ServerMetrics;
+import org.apache.geode.cache.util.ObjectSizer;
 import org.apache.geode.cache.util.TransactionListenerAdapter;
+import org.apache.geode.internal.AvailablePort;
+import org.apache.geode.internal.AvailablePortHelper;
+import org.apache.geode.internal.InternalDataSerializer;
+import org.apache.geode.internal.InternalInstantiator;
+import org.apache.geode.internal.cache.DiskWriteAttributesImpl;
+import org.apache.geode.internal.cache.DistributedRegion;
 import org.apache.geode.internal.cache.FixedPartitionAttributesImpl;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
+import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import 

[10/20] incubator-geode git commit: GEODE-1914 Removed old dtds from geode source code(kept 7.0 and above)

[udo]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/main/resources/org/apache/geode/cache/doc-files/cache6_5.dtd
--
diff --git 
a/geode-core/src/main/resources/org/apache/geode/cache/doc-files/cache6_5.dtd 
b/geode-core/src/main/resources/org/apache/geode/cache/doc-files/cache6_5.dtd
deleted file mode 100755
index 9798748..000
--- 
a/geode-core/src/main/resources/org/apache/geode/cache/doc-files/cache6_5.dtd
+++ /dev/null
@@ -1,949 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  
-
-
-
-
-  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/main/resources/org/apache/geode/cache/doc-files/cache6_6.dtd
--
diff --git 
a/geode-core/src/main/resources/org/apache/geode/cache/doc-files/cache6_6.dtd 
b/geode-core/src/main/resources/org/apache/geode/cache/doc-files/cache6_6.dtd
deleted file mode 100644
index 0a2c2f2..000
--- 
a/geode-core/src/main/resources/org/apache/geode/cache/doc-files/cache6_6.dtd
+++ /dev/null
@@ -1,1006 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  
-
-
-
-
-  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
- 
- 
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/test/java/org/apache/geode/cache/RegionFactoryJUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/cache/RegionFactoryJUnitTest.java 
b/geode-core/src/test/java/org/apache/geode/cache/RegionFactoryJUnitTest.java
index 9f31eb1..6c6b3b6 100644
--- 
a/geode-core/src/test/java/org/apache/geode/cache/RegionFactoryJUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/cache/RegionFactoryJUnitTest.java
@@ -305,8 +305,8 @@ public class RegionFactoryJUnitTest {
   DistributionConfig.DEFAULT_CACHE_XML_FILE.createNewFile();
   FileWriter f = new FileWriter(DistributionConfig.DEFAULT_CACHE_XML_FILE);
   f.write("\n\n"
-+ "http://www.gemstone.com/dtd/cache6_5.dtd\;>\n"
++ "http://www.gemstone.com/dtd/cache7_0.dtd\;>\n"
 + "\n"
 + " \n\n"
-  + "http://www.gemstone.com/dtd/cache6_5.dtd\;>\n"
+  + "http://www.gemstone.com/dtd/cache7_0.dtd\;>\n"
   + "\n"
   + " 

[04/20] incubator-geode git commit: GEODE-1926: Removing the extra getObjectInSerialSenderQueue call

[udo]

GEODE-1926: Removing the extra getObjectInSerialSenderQueue call

* This was causing few tests to hang waiting for queues to drain.


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

Branch: refs/heads/feature/GEODE-1801
Commit: 52ef094368b262f9f355ad582787c515c5e12abc
Parents: 71c6325
Author: nabarun <n...@pivotal.io>
Authored: Mon Oct 10 14:09:43 2016 -0700
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Oct 11 14:06:53 2016 +1100

--
 .../geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java   | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/52ef0943/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
index 28f5f83..79b9d86 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/wan/serial/SerialGatewaySenderQueue.java
@@ -811,7 +811,6 @@ public class SerialGatewaySenderQueue implements 
RegionQueue {
 logger.trace("{}: Trying head key + offset: {}", this, currentKey);
   }
   currentKey = inc(currentKey);
-  object = getObjectInSerialSenderQueue(currentKey);
   if (this.stats != null) {
 this.stats.incEventsNotQueuedConflated();
   }

[16/20] incubator-geode git commit: GEODE-1570 - developer REST API should be secured

[udo]

GEODE-1570 - developer REST API should be secured

* Merged with develop after org.apache package rename
* Moved classes to internal.
* this closes #251


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

Branch: refs/heads/feature/GEODE-1801
Commit: 90ecca2d28000fa618cda18e1b0724b63d9ccac0
Parents: 52ef094
Author: Kevin Duling <kdul...@pivotal.io>
Authored: Wed Sep 21 08:50:46 2016 -0700
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Oct 11 14:06:53 2016 +1100

--
 .../internal/web/RestSecurityDUnitTest.java | 247 +--
 .../web/RestSecurityEndpointsDUnitTest.java | 422 +++
 .../src/main/webapp/WEB-INF/spring-security.xml |   2 +-
 geode-web-api/build.gradle  |   6 +-
 .../web/controllers/AbstractBaseController.java |  54 ++-
 .../web/controllers/BaseControllerAdvice.java   |  78 +++-
 .../web/controllers/CommonCrudController.java   |  87 ++--
 .../controllers/FunctionAccessController.java   |  36 +-
 .../web/controllers/PdxBasedCrudController.java |  44 +-
 .../web/controllers/QueryAccessController.java  | 108 ++---
 .../web/security/GeodeAuthentication.java   |  37 ++
 .../security/GeodeAuthenticationProvider.java   |  56 +++
 .../internal/web/security/GeodeAuthority.java   |  47 +++
 .../web/security/RestSecurityConfiguration.java |  76 
 .../src/main/webapp/WEB-INF/geode-servlet.xml   |  11 +-
 geode-web-api/src/main/webapp/WEB-INF/web.xml   |  20 +-
 gradle/dependency-versions.properties   |   4 +-
 17 files changed, 1116 insertions(+), 219 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/90ecca2d/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityDUnitTest.java
--
diff --git 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityDUnitTest.java
 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityDUnitTest.java
index df146a6..a9d90ed 100644
--- 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityDUnitTest.java
+++ 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityDUnitTest.java
@@ -22,75 +22,236 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
 
+import org.apache.geode.internal.AvailablePortHelper;
+import org.apache.geode.security.AbstractSecureServerDUnitTest;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.SecurityTest;
 import org.apache.http.HttpEntity;
+import org.apache.http.HttpHost;
+import org.apache.http.HttpResponse;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.AuthCache;
 import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.client.methods.HttpDelete;
 import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpHead;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.auth.BasicScheme;
+import org.apache.http.impl.client.BasicAuthCache;
+import org.apache.http.impl.client.BasicCredentialsProvider;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.junit.Test;
+import org.json.JSONTokener;
 import org.junit.experimental.categories.Category;
 
-import org.apache.geode.internal.AvailablePortHelper;
-import org.apache.geode.security.AbstractSecureServerDUnitTest;
-import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.SecurityTest;
 
-@Category({ DistributedTest.class, SecurityTest.class})
+@Category({ DistributedTest.class, SecurityTest.class })
 public class RestSecurityDUnitTest extends AbstractSecureServerDUnitTest {
-  private String endPoint = null;
-  public RestSecurityDUnitTest(){
+
+  public final static String PROTOCOL = "http";
+  public final static String HOSTNAME = "localhost";
+  public final static String CONTEXT =

[14/20] incubator-geode git commit: GEODE-1973: add more tests to cover GMSAuthenticator and SimpleSecurityManager

[udo]

GEODE-1973: add more tests to cover GMSAuthenticator and SimpleSecurityManager

* adding more tests


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

Branch: refs/heads/feature/GEODE-1801
Commit: ebf41ce66125927175dbfcc496bf1be666b348d9
Parents: 952ab6f
Author: Jinmei Liao <jil...@pivotal.io>
Authored: Fri Sep 30 13:13:56 2016 -0700
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Oct 11 14:06:53 2016 +1100

--
 .../templates/SimpleSecurityManager.java| 71 +++
 .../security/PeerAuthenticatorDUnitTest.java| 93 +++
 ...henticatorWithCachelessLocatorDUnitTest.java | 94 
 .../templates/SimpleSecurityManagerTest.java| 80 +
 .../geode/security/CQClientAuthDunitTest.java   | 88 ++
 5 files changed, 426 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ebf41ce6/geode-core/src/main/java/org/apache/geode/security/templates/SimpleSecurityManager.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/security/templates/SimpleSecurityManager.java
 
b/geode-core/src/main/java/org/apache/geode/security/templates/SimpleSecurityManager.java
new file mode 100644
index 000..d4855fe
--- /dev/null
+++ 
b/geode-core/src/main/java/org/apache/geode/security/templates/SimpleSecurityManager.java
@@ -0,0 +1,71 @@
+/*
+ * 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.security.templates;
+
+import java.util.Properties;
+
+import org.apache.geode.security.AuthenticationFailedException;
+import org.apache.geode.security.ResourcePermission;
+import org.apache.geode.security.SecurityManager;
+
+/**
+ * This class provides a simple implementation of {@link SecurityManager} for
+ * authentication and authorization solely based on the username and password 
provided.
+ *
+ * It is meant for demo purpose, not for production.
+ *
+ * Authentiation: All users whose password matches the username are 
authenticated.
+ * e.g. username/password = test/test, user/user, admin/admin
+ *
+ * Authorization: users whose username is a substring (case insensitive) of 
the permission
+ * required are authorized.
+ * e.g. username = data: is authorized for all data operations:
+ *data;
+ *data:manage
+ *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
+ */
+public class SimpleSecurityManager implements SecurityManager {
+  @Override
+  public void init(final Properties securityProps) {}
+
+  @Override
+  public Object authenticate(final Properties credentials) throws 
AuthenticationFailedException {
+String username = credentials.getProperty("security-username");
+String password = credentials.getProperty("security-password");
+if(username!=null && username.equals(password)){
+  return username;
+}
+throw new AuthenticationFailedException("invalid username/password");
+  }
+
+  @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);
+  }
+
+  @Override
+  public void close() {}
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ebf41ce6/geode-core/src/test/java/org/apache/geode/security/PeerAuthenticatorDUnitTest.java
--

[19/20] incubator-geode git commit: Add more tests to flaky category based on recent CI failures

[udo]

Add more tests to flaky category based on recent CI failures


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

Branch: refs/heads/feature/GEODE-1801
Commit: 8f67745a8ce1a42018042b8f75fe36e20561f141
Parents: 371b6fb
Author: Anthony Baker <aba...@apache.org>
Authored: Mon Oct 10 11:52:38 2016 -0700
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Oct 11 14:06:53 2016 +1100

--
 .../internal/cache/execute/FunctionServiceBase.java|  1 +
 .../geode/internal/cache/ha/Bug48571DUnitTest.java | 13 +++--
 .../cache/tier/sockets/HAInterestPart2DUnitTest.java   |  3 ++-
 .../geode/management/ClientHealthStatsDUnitTest.java   |  2 ++
 .../internal/cli/commands/QueueCommandsDUnitTest.java  |  1 +
 .../SharedConfigurationUsingDirDUnitTest.java  |  1 +
 .../geode/security/SecurityClusterConfigDUnitTest.java |  5 -
 .../ConcurrentParallelGatewaySenderDUnitTest.java  |  1 +
 .../ConcurrentWANPropagation_1_DUnitTest.java  |  3 ++-
 9 files changed, 25 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8f67745a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceBase.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceBase.java
 
b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceBase.java
index 5cd1327..030ec60 100644
--- 
a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceBase.java
+++ 
b/geode-core/src/test/java/org/apache/geode/internal/cache/execute/FunctionServiceBase.java
@@ -235,6 +235,7 @@ public abstract class FunctionServiceBase extends 
JUnit4CacheTestCase {
 Assert.assertEquals(0, customCollector.getResult().size());
   }
 
+  @Category(FlakyTest.class) // GEODE-1981
   @Test
   public void customCollectorReturnsResultOfSendException() {
 ResultCollector rc = 
getExecution().withCollector(customCollector).execute((context) -> {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8f67745a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48571DUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48571DUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48571DUnitTest.java
index 4bc7ecb..d3a407f 100644
--- 
a/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48571DUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/internal/cache/ha/Bug48571DUnitTest.java
@@ -16,8 +16,15 @@
  */
 package org.apache.geode.internal.cache.ha;
 
-import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static 
org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_ID;
+import static 
org.apache.geode.distributed.ConfigurationProperties.DURABLE_CLIENT_TIMEOUT;
+import static org.apache.geode.distributed.ConfigurationProperties.LOCATORS;
+import static org.apache.geode.distributed.ConfigurationProperties.LOG_FILE;
+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.STATISTIC_ARCHIVE_FILE;
+import static 
org.apache.geode.distributed.ConfigurationProperties.STATISTIC_SAMPLING_ENABLED;
+import static org.junit.Assert.assertEquals;
 
 import java.util.Collection;
 import java.util.Iterator;
@@ -50,6 +57,7 @@ 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.DistributedTest;
+import org.apache.geode.test.junit.categories.FlakyTest;
 
 @Category(DistributedTest.class)
 public class Bug48571DUnitTest extends JUnit4DistributedTestCase {
@@ -114,6 +122,7 @@ public class Bug48571DUnitTest extends 
JUnit4DistributedTestCase {
 Wait.waitForCriterion(criterion, 15 * 1000, 200, true);
   }
   
+  @Category(FlakyTest.class) // GEODE-510
   @Test
   public void testStatsMatchWithSize() throws Exception {
 IgnoredException.addIgnoredException("Unexpected IOException||Connection 
reset");

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8f67745a/geode-core/src/test/java/org/apache/geode/internal/cache/tier/sockets/HAIn

[13/20] incubator-geode git commit: GEODE-1914 Removed old dtds from geode source code(kept 7.0 and above)

[udo]

GEODE-1914 Removed old dtds from geode source code(kept 7.0 and above)

Deteted old tests and updated test xmls to point 7.0 dtd


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

Branch: refs/heads/feature/GEODE-1801
Commit: 952ab6fa2fa166225d7a7fbfeca9e24852402e38
Parents: 9b6c10b
Author: Hitesh Khamesra <hkhame...@pivotal.io>
Authored: Fri Oct 7 09:43:43 2016 -0700
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Oct 11 14:06:53 2016 +1100

--
 .../javadoc-images/example-client-cache.xml |4 +-
 .../org/apache/geode/admin/doc-files/ds4_0.dtd  |  176 -
 .../org/apache/geode/admin/doc-files/ds5_0.dtd  |  168 -
 .../apache/geode/cache/doc-files/cache3_0.dtd   |  296 --
 .../apache/geode/cache/doc-files/cache4_0.dtd   |  392 --
 .../apache/geode/cache/doc-files/cache4_1.dtd   |  485 --
 .../apache/geode/cache/doc-files/cache5_0.dtd   |  519 --
 .../apache/geode/cache/doc-files/cache5_1.dtd   |  534 --
 .../apache/geode/cache/doc-files/cache5_5.dtd   |  651 ---
 .../apache/geode/cache/doc-files/cache5_7.dtd   |  776 ---
 .../apache/geode/cache/doc-files/cache5_8.dtd   |  794 ---
 .../apache/geode/cache/doc-files/cache6_0.dtd   |  862 ---
 .../apache/geode/cache/doc-files/cache6_1.dtd   |  871 
 .../apache/geode/cache/doc-files/cache6_5.dtd   |  949 
 .../apache/geode/cache/doc-files/cache6_6.dtd   | 1006 
 .../geode/cache/RegionFactoryJUnitTest.java |8 +-
 .../geode/cache30/CacheXml30DUnitTest.java  |  845 ---
 .../geode/cache30/CacheXml40DUnitTest.java  |  152 -
 .../geode/cache30/CacheXml41DUnitTest.java  |  664 ---
 .../geode/cache30/CacheXml45DUnitTest.java  |  424 --
 .../geode/cache30/CacheXml51DUnitTest.java  |  375 --
 .../geode/cache30/CacheXml55DUnitTest.java  |   58 -
 .../geode/cache30/CacheXml57DUnitTest.java  |  662 ---
 .../geode/cache30/CacheXml58DUnitTest.java  |  518 --
 .../geode/cache30/CacheXml60DUnitTest.java  |  346 --
 .../geode/cache30/CacheXml61DUnitTest.java  |   98 -
 .../geode/cache30/CacheXml65DUnitTest.java  | 1211 -
 .../geode/cache30/CacheXml66DUnitTest.java  | 4935 +-
 .../geode/internal/JarClassLoaderJUnitTest.java |4 +-
 .../geode/pdx/PdxSerializableJUnitTest.java |8 +-
 geode-core/src/test/resources/jta/cachejta.xml  |4 +-
 .../ClientCacheFactoryJUnitTest_single_pool.xml |4 +-
 .../functional/index-creation-with-eviction.xml |4 +-
 .../index-creation-without-eviction.xml |4 +-
 .../functional/index-recovery-overflow.xml  |4 +-
 .../query/internal/index/cachequeryindex.xml|2 +-
 .../internal/index/cachequeryindexwitherror.xml |2 +-
 .../cache/query/partitioned/PRIndexCreation.xml |4 +-
 .../geode/cache30/attributesUnordered.xml   |4 +-
 .../org/apache/geode/cache30/badFloat.xml   |6 +-
 .../org/apache/geode/cache30/badInt.xml |6 +-
 .../geode/cache30/badKeyConstraintClass.xml |6 +-
 .../org/apache/geode/cache30/badScope.xml   |4 +-
 .../geode/cache30/callbackNotDeclarable.xml |8 +-
 .../geode/cache30/callbackWithException.xml |8 +-
 .../org/apache/geode/cache30/coLocation.xml |2 +-
 .../org/apache/geode/cache30/ewtest.xml |2 +-
 .../cache30/examples_3_0/example-cache.xml  |4 +-
 .../cache30/examples_4_0/example-cache.xml  |4 +-
 .../apache/geode/cache30/loaderNotLoader.xml|8 +-
 .../org/apache/geode/cache30/malformed.xml  |4 +-
 .../apache/geode/cache30/namedAttributes.xml|6 +-
 .../apache/geode/cache30/partitionedRegion.xml  |4 +-
 .../geode/cache30/partitionedRegion51.xml   |4 +-
 .../org/apache/geode/cache30/sameRootRegion.xml |6 +-
 .../org/apache/geode/cache30/sameSubregion.xml  |6 +-
 .../geode/cache30/unknownNamedAttributes.xml|6 +-
 .../internal/cache/BackupJUnitTest.cache.xml|2 +-
 .../internal/cache/DiskRegCacheXmlJUnitTest.xml |4 +-
 .../cache/PartitionRegionCacheExample1.xml  |2 +-
 .../cache/PartitionRegionCacheExample2.xml  |2 +-
 .../incorrect_bytes_threshold.xml   |2 +-
 .../faultyDiskXMLsForTesting/incorrect_dir.xml  |2 +-
 .../incorrect_dir_size.xml  |2 +-
 .../incorrect_max_oplog_size.xml|2 +-
 .../incorrect_roll_oplogs_value.xml |2 +-
 .../incorrect_sync_value.xml|2 +-
 .../incorrect_time_interval.xml |2 +-
 .../mixed_diskstore_diskdir.xml |2 +-
 .../mixed_diskstore_diskwriteattrs.xml  |2 +-
 ...testDTDFallbackWithNonEnglishLocal.cach

[01/20] incubator-geode git commit: GEODE-1967: Old keys are removed from removedKeyValuesEntries

[udo]

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-1801 9b6c10bc2 -> e982284d7


GEODE-1967: Old keys are removed from removedKeyValuesEntries

* Old keys are removed from removedKeyValuesEntries after the mapping 
is removed from Compact map range indexes.
* New tests were added to handle various scenarios of old keys being 
destroyed and then inserted again.


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

Branch: refs/heads/feature/GEODE-1801
Commit: e982284d70e0413653b4fc65dbab64da90997635
Parents: 8f67745
Author: nabarun <n...@pivotal.io>
Authored: Fri Oct 7 13:57:34 2016 -0700
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Oct 11 14:06:53 2016 +1100

--
 .../internal/index/CompactMapRangeIndex.java|   9 +-
 .../MapRangeIndexMaintenanceJUnitTest.java  | 617 ++-
 2 files changed, 622 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e982284d/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/CompactMapRangeIndex.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/CompactMapRangeIndex.java
 
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/CompactMapRangeIndex.java
index 234dfae..61c4e22 100644
--- 
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/CompactMapRangeIndex.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/CompactMapRangeIndex.java
@@ -134,11 +134,14 @@ public class CompactMapRangeIndex extends AbstractMapIndex
   oldKeysAndValuesForEntry = Collections.EMPTY_MAP;
 }
 Set removedKeyValueEntries = oldKeysAndValuesForEntry != null ? 
oldKeysAndValuesForEntry.entrySet() : Collections.EMPTY_SET;
- for (Map.Entry keyValue : removedKeyValueEntries) {
+Iterator iterator = removedKeyValueEntries.iterator();
+ while (iterator.hasNext()) {
+   Entry keyValue = iterator.next();
   Object indexKey = keyValue.getKey() == null ? IndexManager.NULL : 
keyValue.getKey();
if (!presentKeys.contains(indexKey)) {
-CompactRangeIndex rg = (CompactRangeIndex) 
this.mapKeyToValueIndex.get(keyValue.getKey());
-rg.removeMapping(keyValue.getValue(), entry);
+ CompactRangeIndex rg = (CompactRangeIndex) 
this.mapKeyToValueIndex.get(keyValue.getKey());
+ rg.removeMapping(keyValue.getValue(), entry);
+ iterator.remove();
   }
 }
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/e982284d/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java
index b651272..7ed00a4 100644
--- 
a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/MapRangeIndexMaintenanceJUnitTest.java
@@ -82,7 +82,7 @@ public class MapRangeIndexMaintenanceJUnitTest{
 assertEquals(100, region.size());
 qs = CacheUtils.getQueryService();
 
-keyIndex1 = (IndexProtocol) qs.createIndex(INDEX_NAME, "positions['SUN', 
'IBM']", "/portfolio ");
+keyIndex1 = (IndexProtocol) qs.createIndex(INDEX_NAME, "positions['SUN', 
'IBM']", "/portfolio p");
 
 assertTrue(keyIndex1 instanceof CompactMapRangeIndex);
 
@@ -531,7 +531,622 @@ public class MapRangeIndexMaintenanceJUnitTest{
 assertEquals(1, results.size());
   }
 
+  @Test
+  public void 
updatingWithSameKeysDifferentValuesAfterRemovingShouldReinsertIndexMappings() 
throws Exception {
+AttributesFactory af = new AttributesFactory();
+af.setScope(Scope.LOCAL);
+region = CacheUtils.createRegion("portfolio", af.create(), false);
+qs = CacheUtils.getQueryService();
+Index keyIndex1 = qs.createIndex(INDEX_NAME, "positions[*]", "/portfolio");
+
+Portfolio p1 = new Portfolio(1, 1);
+HashMap map1 = new HashMap();
+map1.put("SUN", 1);
+map1.put("IBM", 2);
+p1.positions = map1;
+region.put(1, p1);
+
+
+Portfolio p2 = new Portfolio(1, 1);
+HashMap map2 = new Ha

[12/20] incubator-geode git commit: GEODE-1914 Removed old dtds from geode source code(kept 7.0 and above)

[udo]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/main/resources/org/apache/geode/cache/doc-files/cache5_5.dtd
--
diff --git 
a/geode-core/src/main/resources/org/apache/geode/cache/doc-files/cache5_5.dtd 
b/geode-core/src/main/resources/org/apache/geode/cache/doc-files/cache5_5.dtd
deleted file mode 100755
index 090f7f9..000
--- 
a/geode-core/src/main/resources/org/apache/geode/cache/doc-files/cache5_5.dtd
+++ /dev/null
@@ -1,651 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/main/resources/org/apache/geode/cache/doc-files/cache5_7.dtd
--
diff --git 
a/geode-core/src/main/resources/org/apache/geode/cache/doc-files/cache5_7.dtd 
b/geode-core/src/main/resources/org/apache/geode/cache/doc-files/cache5_7.dtd
deleted file mode 100755
index 95e54fd..000
--- 
a/geode-core/src/main/resources/org/apache/geode/cache/doc-files/cache5_7.dtd
+++ /dev/null
@@ -1,776 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-  
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/952ab6fa/geode-core/src/main/resources/org/apache/geode/cache/doc-files/cache5_8.dtd
--
diff --git 
a/geode-core/src/main/resources/org/apache/geode/cache/doc-files/cache5_8.dtd 
b/geode-core/src/main/resources/org/apache/geode/cache/doc-files/cache5_8.dtd
deleted file mode 100755
index dc2ae73..000
--- 
a/geode-core/src/main/resources/org/apache/geode/cache/doc-files/cache5_8.dtd
+++ /dev/null
@@ -1,794 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

[2/3] incubator-geode git commit: GEODE-1801: Change the logic to increment NonSingleHopsCount

[udo]

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9b6c10bc/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
index d166397..bb9bf93 100755
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/GemFireCacheImpl.java
@@ -233,17 +233,20 @@ import org.apache.geode.pdx.internal.TypeRegistry;
 import org.apache.geode.redis.GeodeRedisServer;
 
 // @todo somebody Come up with more reasonable values for {@link 
#DEFAULT_LOCK_TIMEOUT}, etc.
+
 /**
  * GemFire's implementation of a distributed {@link 
org.apache.geode.cache.Cache}.
- *
  */
 @SuppressWarnings("deprecation")
 public class GemFireCacheImpl implements InternalCache, ClientCache, 
HasCachePerfStats, DistributionAdvisee, CacheTime {
+
   private static final Logger logger = LogService.getLogger();
-  
+
   // moved *SERIAL_NUMBER stuff to DistributionAdvisor
 
-  /** The default number of seconds to wait for a distributed lock */
+  /**
+   * The default number of seconds to wait for a distributed lock
+   */
   public static final int DEFAULT_LOCK_TIMEOUT = 
Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + 
"Cache.defaultLockTimeout", 60).intValue();
 
   /**
@@ -251,10 +254,14 @@ public class GemFireCacheImpl implements InternalCache, 
ClientCache, HasCachePer
*/
   public static final int DEFAULT_LOCK_LEASE = 
Integer.getInteger(DistributionConfig.GEMFIRE_PREFIX + 
"Cache.defaultLockLease", 120).intValue();
 
-  /** The default "copy on read" attribute value */
+  /**
+   * The default "copy on read" attribute value
+   */
   public static final boolean DEFAULT_COPY_ON_READ = false;
 
-  /** the last instance of GemFireCache created */
+  /**
+   * the last instance of GemFireCache created
+   */
   private static volatile GemFireCacheImpl instance = null;
   /**
* Just like instance but is valid for a bit longer so that pdx can still 
find the cache during a close.
@@ -295,9 +302,8 @@ public class GemFireCacheImpl implements InternalCache, 
ClientCache, HasCachePer
   /**
* System property to disable query monitor even if resource manager is in 
use
*/
-  public final boolean QUERY_MONITOR_DISABLED_FOR_LOW_MEM = Boolean
-  .getBoolean(DistributionConfig.GEMFIRE_PREFIX + 
"Cache.DISABLE_QUERY_MONITOR_FOR_LOW_MEMORY");
-  
+  public final boolean QUERY_MONITOR_DISABLED_FOR_LOW_MEM = 
Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + 
"Cache.DISABLE_QUERY_MONITOR_FOR_LOW_MEMORY");
+
   /**
* Property set to true if resource manager heap percentage is set and query 
monitor is required
*/
@@ -309,13 +315,15 @@ public class GemFireCacheImpl implements InternalCache, 
ClientCache, HasCachePer
   public static final String FIND_REST_ENABLED_SERVERS_FUNCTION_ID = 
FindRestEnabledServersFunction.class.getName();
 
   /**
-   * True if the user is allowed lock when memory resources appear to be 
overcommitted. 
+   * True if the user is allowed lock when memory resources appear to be 
overcommitted.
*/
   public static final boolean ALLOW_MEMORY_LOCK_WHEN_OVERCOMMITTED = 
Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + 
"Cache.ALLOW_MEMORY_OVERCOMMIT");
 
   //time in ms
   private static final int FIVE_HOURS = 5 * 60 * 60 * 1000;
-  /** To test MAX_QUERY_EXECUTION_TIME option. */
+  /**
+   * To test MAX_QUERY_EXECUTION_TIME option.
+   */
   public int TEST_MAX_QUERY_EXECUTION_TIME = -1;
   public boolean TEST_MAX_QUERY_EXECUTION_TIME_OVERRIDE_EXCEPTION = false;
 
@@ -346,21 +354,31 @@ public class GemFireCacheImpl implements InternalCache, 
ClientCache, HasCachePer
   protected volatile boolean closingGatewaySendersByShutdownAll = false;
   protected volatile boolean closingGatewayReceiversByShutdownAll = false;
 
-  /** Amount of time (in seconds) to wait for a distributed lock */
+  /**
+   * Amount of time (in seconds) to wait for a distributed lock
+   */
   private int lockTimeout = DEFAULT_LOCK_TIMEOUT;
 
-  /** Amount of time a lease of a distributed lock lasts */
+  /**
+   * Amount of time a lease of a distributed lock lasts
+   */
   private int lockLease = DEFAULT_LOCK_LEASE;
 
-  /** Amount of time to wait for a netSearch to complete */
+  /**
+   * Amount of time to wait for a netSearch to complete
+   */
   private int searchTimeout = DEFAULT_SEARCH_TIMEOUT;
 
   private final CachePerfStats cachePerfStats;
 
-  /** Date on which this instances was created */
+  /**
+   * Date on which this instances was created
+   */
   private final Date creationDate;
 
-  /** thread pool for event dispatching */
+  /**
+   * thread pool for event dispatching
+   */
   private final ThreadPoolExecutor eventThreadPool;
 
   /**
@@ 

[1/3] incubator-geode git commit: GEODE-1801: Change the logic to increment NonSingleHopsCount

[udo]

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-1801 [created] 9b6c10bc2


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9b6c10bc/geode-core/src/test/java/org/apache/geode/internal/cache/SingleHopStatsDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/internal/cache/SingleHopStatsDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/internal/cache/SingleHopStatsDUnitTest.java
index a7c7b48..3f960c7 100644
--- 
a/geode-core/src/test/java/org/apache/geode/internal/cache/SingleHopStatsDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/internal/cache/SingleHopStatsDUnitTest.java
@@ -162,13 +162,7 @@ public class SingleHopStatsDUnitTest extends 
JUnit4CacheTestCase {
 CacheServerTestUtil.disableShufflingOfEndpoints();
 Pool p;
 try {
-  p = PoolManager.createFactory().addServer("localhost", port0)
-  .addServer("localhost", port1).addServer("localhost", port2)
-  .setRetryAttempts(5)
-  .setMinConnections(1)
-  .setMaxConnections(-1)
-  .setSubscriptionEnabled(false)
-  .create(Region_Name);
+  p = PoolManager.createFactory().addServer("localhost", 
port0).addServer("localhost", port1).addServer("localhost", 
port2).setRetryAttempts(5).setMinConnections(1).setMaxConnections(-1).setSubscriptionEnabled(false).create(Region_Name);
 } finally {
   CacheServerTestUtil.enableShufflingOfEndpoints();
 }
@@ -195,58 +189,40 @@ public class SingleHopStatsDUnitTest extends 
JUnit4CacheTestCase {
 attr.setDataPolicy(DataPolicy.REPLICATE);
 region = cache.createRegion(Region_Name, attr.create());
 assertNotNull(region);
-LogWriterUtils.getLogWriter().info(
-"Distributed Region " + Region_Name + " created Successfully :"
-+ region.toString());
+LogWriterUtils.getLogWriter().info("Distributed Region " + Region_Name 
+ " created Successfully :" + region.toString());
   } else {
 PartitionAttributesFactory paf = new PartitionAttributesFactory();
-paf.setRedundantCopies(redundantCopies).setTotalNumBuckets(
-totalNoofBuckets);
+
paf.setRedundantCopies(redundantCopies).setTotalNumBuckets(totalNoofBuckets);
 AttributesFactory attr = new AttributesFactory();
 attr.setPartitionAttributes(paf.create());
 region = cache.createRegion(Region_Name, attr.create());
 assertNotNull(region);
-LogWriterUtils.getLogWriter().info(
-"Partitioned Region " + Region_Name + " created Successfully :"
-+ region.toString());
+LogWriterUtils.getLogWriter().info("Partitioned Region " + Region_Name 
+ " created Successfully :" + region.toString());
   }
 } else {
   PartitionAttributesFactory paf = new PartitionAttributesFactory();
-  paf.setRedundantCopies(redundantCopies).setTotalNumBuckets(
-  totalNoofBuckets).setPartitionResolver(
-  new CustomerIDPartitionResolver("CustomerIDPartitio"
-  + "nResolver"));
+  
paf.setRedundantCopies(redundantCopies).setTotalNumBuckets(totalNoofBuckets).setPartitionResolver(new
 CustomerIDPartitionResolver("CustomerIDPartitio" + "nResolver"));
   AttributesFactory attr = new AttributesFactory();
   attr.setPartitionAttributes(paf.create());
   Region customerRegion = cache.createRegion(CUSTOMER_REGION_NAME, 
attr.create());
   assertNotNull(customerRegion);
-  LogWriterUtils.getLogWriter().info(
-  "Partitioned Region CUSTOMER created Successfully :"
-  + customerRegion.toString());
+  LogWriterUtils.getLogWriter().info("Partitioned Region CUSTOMER created 
Successfully :" + customerRegion.toString());
 
   paf = new PartitionAttributesFactory();
-  paf.setRedundantCopies(redundantCopies).setTotalNumBuckets(
-  
totalNoofBuckets).setColocatedWith(CUSTOMER_REGION_NAME).setPartitionResolver(
-  new CustomerIDPartitionResolver("CustomerIDPartitionResolver"));
+  
paf.setRedundantCopies(redundantCopies).setTotalNumBuckets(totalNoofBuckets).setColocatedWith(CUSTOMER_REGION_NAME).setPartitionResolver(new
 CustomerIDPartitionResolver("CustomerIDPartitionResolver"));
   attr = new AttributesFactory();
   attr.setPartitionAttributes(paf.create());
   Region orderRegion = cache.createRegion(ORDER_REGION_NAME, 
attr.create());
   assertNotNull(orderRegion);
-  LogWriterUtils.getLogWriter().info(
-  "Partitioned Region ORDER created Successfully :"
-  + orderRegion.toString());
+  LogWriterUtils.getLogWriter().info("Partitioned Region ORDER created 
Successfully :" + orderRegion.toString());
 
   paf = new PartitionAttributesFactory();
-  paf.setRedundantCopies(redundantCopies).setTotalNumBuckets(
-  

[3/3] incubator-geode git commit: GEODE-1801: Change the logic to increment NonSingleHopsCount

[udo]

GEODE-1801: Change the logic to increment NonSingleHopsCount


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

Branch: refs/heads/feature/GEODE-1801
Commit: 9b6c10bc2f433b36546e6f3c22f39d3b20d880b5
Parents: febc634
Author: Udo Kohlmeyer <ukohlme...@pivotal.io>
Authored: Tue Oct 11 13:57:06 2016 +1100
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Tue Oct 11 13:57:06 2016 +1100

--
 .../client/internal/ClientMetadataService.java  |  536 +++
 .../geode/internal/cache/GemFireCacheImpl.java  | 1499 +-
 .../internal/cache/SingleHopStatsDUnitTest.java |  127 +-
 3 files changed, 980 insertions(+), 1182 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9b6c10bc/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
index c863d46..325322e 100755
--- 
a/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
+++ 
b/geode-core/src/main/java/org/apache/geode/cache/client/internal/ClientMetadataService.java
@@ -16,94 +16,109 @@
  */
 package org.apache.geode.cache.client.internal;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.CopyOnWriteArraySet;
+
+import org.apache.logging.log4j.Logger;
+
 import org.apache.geode.SystemFailure;
-import org.apache.geode.cache.*;
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.EntryOperation;
+import org.apache.geode.cache.FixedPartitionResolver;
+import org.apache.geode.cache.Operation;
+import org.apache.geode.cache.PartitionResolver;
+import org.apache.geode.cache.Region;
 import org.apache.geode.distributed.internal.DistributionConfig;
 import org.apache.geode.distributed.internal.ServerLocation;
-import org.apache.geode.internal.cache.*;
+import org.apache.geode.internal.cache.BucketServerLocation66;
+import org.apache.geode.internal.cache.EntryOperationImpl;
+import org.apache.geode.internal.cache.LocalRegion;
+import org.apache.geode.internal.cache.PartitionedRegion;
+import org.apache.geode.internal.cache.PartitionedRegionHelper;
 import org.apache.geode.internal.i18n.LocalizedStrings;
 import org.apache.geode.internal.logging.LogService;
-import org.apache.logging.log4j.Logger;
-
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.CopyOnWriteArraySet;
 
 /**
  * Maintains {@link ClientPartitionAdvisor} for Partitioned Regions on servers
  * Client operations will consult this service to identify the server locations
  * on which the data for the client operation is residing
- * 
- * 
+ *
  * @since GemFire 6.5
- * 
  */
 public final class ClientMetadataService {
 
   private static final Logger logger = LogService.getLogger();
-  
+
   private final Cache cache;
-  
+
   private final Set nonPRs = new HashSet();
 
   private boolean HONOUR_SERVER_GROUP_IN_PR_SINGLE_HOP = 
Boolean.getBoolean(DistributionConfig.GEMFIRE_PREFIX + 
"PoolImpl.honourServerGroupsInPRSingleHop");
 
   public static final int SIZE_BYTES_ARRAY_RECEIVED = 2;
-  
+
   public static final int INITIAL_VERSION = 0;
-  
-  /** random number generator used in pruning */
+
+  /**
+   * random number generator used in pruning
+   */
   private final Random rand = new Random();
-  
+
   private volatile boolean isMetadataStable = true;
 
   private boolean isMetadataRefreshed_TEST_ONLY = false;
-  
+
   private int refreshTaskCount = 0;
-  
+
   private Set regionsBeingRefreshed = new HashSet<>();
-  
+
   private final Object fetchTaskCountLock = new Object();
-  
+
   public ClientMetadataService(Cache cache) {
 this.cache = cache;
   }
 
   private final Map<String, ClientPartitionAdvisor> clientPRAdvisors = new 
ConcurrentHashMap<String, ClientPartitionAdvisor>();
   private final Map<String, Set> colocatedPRAdvisors = 
new ConcurrentHashMap<String, Set>();
-  
-  private PartitionResolver getResolver(Region r, Object key,
-  Object callbackArgument) {
+
+  private PartitionResolver getResolver(Region r, O

[1/3] incubator-geode git commit: GEODE-1938: Added conditional check to return on successful processing of pdx type

[udo]

Repository: incubator-geode
Updated Branches:
  refs/heads/develop 0a51d86d5 -> 61fe7c647


GEODE-1938: Added conditional check to return on successful processing of pdx 
type


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

Branch: refs/heads/develop
Commit: 98c43a54623997ab88cec1d2ce8d20121e857f0e
Parents: f3b0d0e
Author: Udo Kohlmeyer <ukohlme...@pivotal.io>
Authored: Wed Oct 5 11:32:33 2016 +1100
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Wed Oct 5 11:32:33 2016 +1100

--
 .../apache/geode/pdx/internal/ClientTypeRegistration.java | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/98c43a54/geode-core/src/main/java/org/apache/geode/pdx/internal/ClientTypeRegistration.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/pdx/internal/ClientTypeRegistration.java
 
b/geode-core/src/main/java/org/apache/geode/pdx/internal/ClientTypeRegistration.java
index 8957e7f..09a0a18 100644
--- 
a/geode-core/src/main/java/org/apache/geode/pdx/internal/ClientTypeRegistration.java
+++ 
b/geode-core/src/main/java/org/apache/geode/pdx/internal/ClientTypeRegistration.java
@@ -21,6 +21,8 @@ import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 
+import org.apache.logging.log4j.Logger;
+
 import org.apache.geode.InternalGemFireError;
 import org.apache.geode.cache.CacheClosedException;
 import org.apache.geode.cache.client.Pool;
@@ -39,7 +41,6 @@ import org.apache.geode.cache.wan.GatewaySender;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
 import org.apache.geode.internal.cache.PoolManagerImpl;
 import org.apache.geode.internal.logging.LogService;
-import org.apache.logging.log4j.Logger;
 
 public class ClientTypeRegistration implements TypeRegistration {
 
@@ -263,12 +264,14 @@ public class ClientTypeRegistration implements 
TypeRegistration {
 for (Pool pool : pools) {
   try {
 sendTypeToPool(importedType, typeId, pool);
-return;
   } catch (ServerConnectivityException e) {
 //ignore, try the next pool.
 lastException = e;
   }
 }
+if (lastException == null) {
+  return;
+}
 throw returnCorrectExceptionForFailure(pools, typeId, lastException);
   }
 
@@ -285,6 +288,9 @@ public class ClientTypeRegistration implements 
TypeRegistration {
 lastException = e;
   }
 }
+if (lastException == null) {
+  return;
+}
 
 throw returnCorrectExceptionForFailure(pools, enumId, lastException);
   }

[3/3] incubator-geode git commit: GEODE-1938: Break early when ServerException is caught

[udo]

GEODE-1938: Break early when ServerException is caught


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

Branch: refs/heads/develop
Commit: 61fe7c647682c10b2dcec4620448696bf5499880
Parents: f91792c
Author: Udo Kohlmeyer <ukohlme...@pivotal.io>
Authored: Thu Oct 6 07:43:31 2016 +1100
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Thu Oct 6 07:43:31 2016 +1100

--
 .../org/apache/geode/pdx/internal/ClientTypeRegistration.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/61fe7c64/geode-core/src/main/java/org/apache/geode/pdx/internal/ClientTypeRegistration.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/pdx/internal/ClientTypeRegistration.java
 
b/geode-core/src/main/java/org/apache/geode/pdx/internal/ClientTypeRegistration.java
index 09a0a18..b4b98f5 100644
--- 
a/geode-core/src/main/java/org/apache/geode/pdx/internal/ClientTypeRegistration.java
+++ 
b/geode-core/src/main/java/org/apache/geode/pdx/internal/ClientTypeRegistration.java
@@ -265,8 +265,8 @@ public class ClientTypeRegistration implements 
TypeRegistration {
   try {
 sendTypeToPool(importedType, typeId, pool);
   } catch (ServerConnectivityException e) {
-//ignore, try the next pool.
 lastException = e;
+break;
   }
 }
 if (lastException == null) {
@@ -284,8 +284,8 @@ public class ClientTypeRegistration implements 
TypeRegistration {
   try {
 sendEnumIdToPool(importedInfo, enumId, pool);
   } catch (ServerConnectivityException e) {
-//ignore, try the next pool.
 lastException = e;
+break;
   }
 }
 if (lastException == null) {

[2/3] incubator-geode git commit: Merge branch 'develop' into feature/GEODE-1938

[udo]

Merge branch 'develop' into feature/GEODE-1938


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

Branch: refs/heads/develop
Commit: f91792cd9c3531919b4d7ed0d0acd2d169fa68a1
Parents: 98c43a5 0a51d86
Author: Udo Kohlmeyer <ukohlme...@pivotal.io>
Authored: Thu Oct 6 07:26:06 2016 +1100
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Thu Oct 6 07:26:06 2016 +1100

--
 .../cache/tier/sockets/BaseCommand.java |  7 ++--
 .../geode/distributed/LocatorDUnitTest.java |  7 
 .../LocatorUDPSecurityDUnitTest.java|  8 
 .../logging/log4j/custom/log4j2-custom.xml  |  3 +-
 ...oncurrentParallelGatewaySenderDUnitTest.java | 40 +++-
 5 files changed, 27 insertions(+), 38 deletions(-)
--

incubator-geode git commit: GEODE-420: Adding test to SSLConfigurationFactoryJUnitTest.java to test for non-ssl configurations

[udo]

Repository: incubator-geode
Updated Branches:
  refs/heads/develop 18c2dc3fb -> f3b0d0e15


GEODE-420: Adding test to SSLConfigurationFactoryJUnitTest.java to test for 
non-ssl configurations


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

Branch: refs/heads/develop
Commit: f3b0d0e15df54b4014dbec976c62cfbdde6f34db
Parents: 18c2dc3
Author: Udo Kohlmeyer <ukohlme...@pivotal.io>
Authored: Wed Oct 5 11:31:30 2016 +1100
Committer: Udo Kohlmeyer <ukohlme...@pivotal.io>
Committed: Wed Oct 5 11:31:30 2016 +1100

--
 .../net/SSLConfigurationFactoryJUnitTest.java   | 37 
 1 file changed, 23 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f3b0d0e1/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
index 29ef943..80d195d 100644
--- 
a/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/internal/net/SSLConfigurationFactoryJUnitTest.java
@@ -41,6 +41,16 @@ public class SSLConfigurationFactoryJUnitTest {
   }
 
   @Test
+  public void getNonSSLConfiguration() throws Exception {
+Properties properties = new Properties();
+DistributionConfigImpl distributionConfig = new 
DistributionConfigImpl(properties);
+SSLConfigurationFactory.setDistributionConfig(distributionConfig);
+for (SecurableCommunicationChannel securableComponent : 
SecurableCommunicationChannel.values()) {
+  assertSSLConfig(properties, 
SSLConfigurationFactory.getSSLConfigForComponent(securableComponent), 
securableComponent, distributionConfig);
+}
+  }
+
+  @Test
   public void getSSLConfigWithCommaDelimitedProtocols() throws Exception {
 Properties properties = new Properties();
 properties.setProperty(SSL_ENABLED_COMPONENTS, "all");
@@ -157,21 +167,20 @@ public class SSLConfigurationFactoryJUnitTest {
 }
   }
 
-  private void assertSSLConfig(final Properties properties,
-   final SSLConfig sslConfig,
-   final SecurableCommunicationChannel 
expectedSecurableComponent,
-   final DistributionConfigImpl 
distributionConfig) {
+  private void assertSSLConfig(final Properties properties, final SSLConfig 
sslConfig, final SecurableCommunicationChannel expectedSecurableComponent, 
final DistributionConfigImpl distributionConfig) {
 assertEquals(isSSLComponentEnabled(expectedSecurableComponent, 
distributionConfig.getSecurableCommunicationChannels()), sslConfig.isEnabled());
-assertEquals(properties.getProperty(SSL_KEYSTORE), 
sslConfig.getKeystore());
-assertEquals(properties.getProperty(SSL_KEYSTORE_PASSWORD), 
sslConfig.getKeystorePassword());
-assertEquals(properties.getProperty(SSL_KEYSTORE_TYPE), 
sslConfig.getKeystoreType());
-assertEquals(properties.getProperty(SSL_TRUSTSTORE), 
sslConfig.getTruststore());
-assertEquals(properties.getProperty(SSL_TRUSTSTORE_PASSWORD), 
sslConfig.getTruststorePassword());
-assertEquals(properties.getProperty(SSL_CIPHERS).replace(","," "), 
sslConfig.getCiphers());
-assertEquals(properties.getProperty(SSL_PROTOCOLS).replace(","," "), 
sslConfig.getProtocols());
-assertEquals(getCorrectAlias(expectedSecurableComponent, properties), 
sslConfig.getAlias());
-assertEquals(requiresAuthentication(properties, 
expectedSecurableComponent), sslConfig.isRequireAuth());
-assertEquals(expectedSecurableComponent, 
sslConfig.getSecuredCommunicationChannel());
+if (sslConfig.isEnabled()) {
+  assertEquals(properties.getProperty(SSL_KEYSTORE), 
sslConfig.getKeystore());
+  assertEquals(properties.getProperty(SSL_KEYSTORE_PASSWORD), 
sslConfig.getKeystorePassword());
+  assertEquals(properties.getProperty(SSL_KEYSTORE_TYPE), 
sslConfig.getKeystoreType());
+  assertEquals(properties.getProperty(SSL_TRUSTSTORE), 
sslConfig.getTruststore());
+  assertEquals(properties.getProperty(SSL_TRUSTSTORE_PASSWORD), 
sslConfig.getTruststorePassword());
+  assertEquals(properties.getProperty(SSL_CIPHERS).replace(",", " "), 
sslConfig.getCiphers());
+  assertEquals(properties.getProperty(SSL_PROTOCOLS).replace(",", &

[incubator-geode] Git Push Summary

[udo]

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-1801 [deleted] eafd8cc9c