geode git commit: GEODE-3402: Mark ProtoBuf interface as experimental. This now closes #698

2017-08-14 Thread udo 
Repository: geode
Updated Branches:
  refs/heads/develop 87bee0843 -> a60006847


GEODE-3402: Mark ProtoBuf interface as experimental. This now closes #698

Signed-off-by: Alexander Murmann 


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

Branch: refs/heads/develop
Commit: a600068477bb07abb04206ab9540dfef09e89506
Parents: 87bee08
Author: Bruce Schuchardt 
Authored: Tue Aug 8 16:29:29 2017 -0700
Committer: Udo Kohlmeyer 
Committed: Mon Aug 14 17:06:13 2017 -0700

--
 .../InvalidProtocolMessageException.java |  3 +++
 .../protocol/operations/OperationHandler.java|  2 ++
 .../protobuf/EncodingTypeTranslator.java |  2 ++
 .../apache/geode/protocol/protobuf/Failure.java  |  3 +++
 .../protocol/protobuf/OperationContext.java  |  6 --
 .../protocol/protobuf/ProtobufOpsProcessor.java  |  2 ++
 .../protobuf/ProtobufSerializationService.java   |  2 ++
 .../protobuf/ProtobufStreamProcessor.java|  2 ++
 .../apache/geode/protocol/protobuf/Result.java   |  3 +++
 .../apache/geode/protocol/protobuf/Success.java  |  3 +++
 .../GetAllRequestOperationHandler.java   | 10 ++
 .../GetAvailableServersOperationHandler.java | 19 +++
 .../GetRegionNamesRequestOperationHandler.java   |  2 ++
 .../GetRegionRequestOperationHandler.java|  2 ++
 .../operations/GetRequestOperationHandler.java   |  2 ++
 .../PutAllRequestOperationHandler.java   | 13 -
 .../operations/PutRequestOperationHandler.java   |  2 ++
 .../RemoveRequestOperationHandler.java   |  7 +--
 .../registry/OperationContextRegistry.java   |  2 ++
 .../serializer/ProtobufProtocolSerializer.java   |  2 ++
 .../utilities/ProtobufPrimitiveTypes.java|  2 ++
 .../utilities/ProtobufRequestUtilities.java  |  4 
 .../utilities/ProtobufResponseUtilities.java |  9 ++---
 .../protobuf/utilities/ProtobufUtilities.java|  2 ++
 .../exception/UnknownProtobufPrimitiveType.java  |  3 +++
 .../protocol/serializer/ProtocolSerializer.java  |  2 ++
 .../serialization/SerializationService.java  |  2 ++
 .../geode/serialization/SerializationType.java   |  2 ++
 .../apache/geode/serialization/TypeCodec.java|  3 +++
 .../geode/serialization/codec/BinaryCodec.java   |  2 ++
 .../geode/serialization/codec/BooleanCodec.java  |  6 --
 .../geode/serialization/codec/ByteCodec.java |  2 ++
 .../geode/serialization/codec/DoubleCodec.java   |  2 ++
 .../geode/serialization/codec/FloatCodec.java|  2 ++
 .../geode/serialization/codec/IntCodec.java  |  2 ++
 .../geode/serialization/codec/JSONCodec.java |  2 ++
 .../geode/serialization/codec/LongCodec.java |  2 ++
 .../geode/serialization/codec/ShortCodec.java|  2 ++
 .../geode/serialization/codec/StringCodec.java   |  2 ++
 .../UnsupportedEncodingTypeException.java|  3 +++
 .../registry/SerializationCodecRegistry.java |  2 ++
 .../CodecAlreadyRegisteredForTypeException.java  |  3 +++
 .../CodecNotRegisteredForTypeException.java  |  3 +++
 geode-protobuf/src/main/proto/basicTypes.proto   |  6 ++
 .../src/main/proto/clientProtocol.proto  |  5 +
 geode-protobuf/src/main/proto/region_API.proto   |  5 +
 geode-protobuf/src/main/proto/server_API.proto   |  5 +
 47 files changed, 148 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/geode-protobuf/src/main/java/org/apache/geode/protocol/exception/InvalidProtocolMessageException.java
--
diff --git 
a/geode-protobuf/src/main/java/org/apache/geode/protocol/exception/InvalidProtocolMessageException.java
 
b/geode-protobuf/src/main/java/org/apache/geode/protocol/exception/InvalidProtocolMessageException.java
index 8903b8a..29f5a01 100644
--- 
a/geode-protobuf/src/main/java/org/apache/geode/protocol/exception/InvalidProtocolMessageException.java
+++ 
b/geode-protobuf/src/main/java/org/apache/geode/protocol/exception/InvalidProtocolMessageException.java
@@ -14,9 +14,12 @@
  */
 package org.apache.geode.protocol.exception;
 
+import org.apache.geode.annotations.Experimental;
+
 /**
  * Indicates that a message didn't properly follow its protocol specification.
  */
+@Experimental
 public class InvalidProtocolMessageException extends Exception {
   public InvalidProtocolMessageException(String message) {
 super(message);

http://git-wip-us.apache.org/repos/asf/geode/blob/a6000684/geode-protobuf/src/main/java/org/apache/geode/protocol/operations/OperationHandler.java

[4/4] geode-native git commit: GEODE-3439: Split ThinClientRegionInterestTestsN into mulitple tests to avoid random failures.

2017-08-14 Thread jbarrett 
GEODE-3439: Split ThinClientRegionInterestTestsN into mulitple tests to avoid 
random failures.


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

Branch: refs/heads/develop
Commit: 70d2456b011f52c3c7b77bd362a567d6a0dbfb69
Parents: 8f340e4
Author: Jacob Barrett 
Authored: Mon Aug 14 23:04:43 2017 +
Committer: Jacob Barrett 
Committed: Mon Aug 14 23:04:43 2017 +

--
 ...lientRegionInterestFailoverInterest2Tests.cs |  601 +
 ...ClientRegionInterestFailoverInterestTests.cs |  591 +
 ...tRegionInterestFailoverRegexInterestTests.cs |  602 +
 .../ThinClientRegionInterestList2Tests.cs   |  587 +
 .../ThinClientRegionInterestListTests.cs|  586 +
 .../ThinClientRegionInterestListWithPdxTests.cs |  609 +
 .../ThinClientRegionInterestNotifyTests.cs  |  619 +
 ...inClientRegionInterestRegexInterest2Tests.cs |  593 +
 ...inClientRegionInterestRegexInterest3Tests.cs |  579 +
 ...hinClientRegionInterestRegexInterestTests.cs |  588 +
 ...nClientRegionInterestResultPolicyInvTests.cs |  588 +
 .../ThinClientRegionInterestTestsN.cs   | 1216 --
 clicache/integration-test/UnitTests.csproj.in   |   12 +-
 13 files changed, 6554 insertions(+), 1217 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/geode-native/blob/70d2456b/clicache/integration-test/ThinClientRegionInterestFailoverInterest2Tests.cs
--
diff --git 
a/clicache/integration-test/ThinClientRegionInterestFailoverInterest2Tests.cs 
b/clicache/integration-test/ThinClientRegionInterestFailoverInterest2Tests.cs
new file mode 100644
index 000..3c89f2b
--- /dev/null
+++ 
b/clicache/integration-test/ThinClientRegionInterestFailoverInterest2Tests.cs
@@ -0,0 +1,601 @@
+/*
+ * 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.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+
+namespace Apache.Geode.Client.UnitTests
+{
+  using NUnit.Framework;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client;
+
+  [TestFixture]
+  [Category("group1")]
+  [Category("unicast_only")]
+  [Category("generics")]
+  public class ThinClientRegionInterestFailoverInterest2Tests : 
ThinClientRegionSteps
+  {
+#region Private members and methods
+
+private UnitProcess m_client1, m_client2, m_client3, m_feeder;
+private static string[] m_regexes = { "Key-*1", "Key-*2",
+  "Key-*3", "Key-*4" };
+private const string m_regex23 = "Key-[23]";
+private const string m_regexWildcard = "Key-.*";
+private const int m_numUnicodeStrings = 5;
+
+private static string[] m_keysNonRegex = { "key-1", "key-2", "key-3" };
+private static string[] m_keysForRegex = {"key-regex-1",
+  "key-regex-2", "key-regex-3" };
+private static string[] RegionNamesForInterestNotify =
+  { "RegionTrue", "RegionFalse", "RegionOther" };
+
+string GetUnicodeString(int index)
+{
+  return new string('\x0905', 40) + index.ToString("D10");
+}
+
+#endregion
+
+protected override ClientBase[] GetClients()
+{
+  m_client1 = new UnitProcess();
+  m_client2 = new UnitProcess();
+  m_client3 = new UnitProcess();
+  m_feeder  = new UnitProcess();
+  return new ClientBase[] { m_client1, m_client2, m_client3, m_feeder };
+}
+
+[TestFixtureTearDown]
+public override void EndTests()
+{
+  CacheHelper.StopJavaServers();
+  base.EndTests();
+}
+
+[TearDown]
+public override void EndTest()
+{
+  try
+  {
+m_client1.Call(DestroyRegions);
+m_client2.Call(DestroyRegions);
+CacheHelper.ClearEndpoints();
+  }
+  finally
+  {
+CacheHelper.StopJavaServers();
+  }
+

[2/4] geode-native git commit: GEODE-3439: Split ThinClientRegionInterestTestsN into mulitple tests to avoid random failures.

2017-08-14 Thread jbarrett 
http://git-wip-us.apache.org/repos/asf/geode-native/blob/70d2456b/clicache/integration-test/ThinClientRegionInterestRegexInterest3Tests.cs
--
diff --git 
a/clicache/integration-test/ThinClientRegionInterestRegexInterest3Tests.cs 
b/clicache/integration-test/ThinClientRegionInterestRegexInterest3Tests.cs
new file mode 100644
index 000..a4c7a82
--- /dev/null
+++ b/clicache/integration-test/ThinClientRegionInterestRegexInterest3Tests.cs
@@ -0,0 +1,579 @@
+/*
+ * 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.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+
+namespace Apache.Geode.Client.UnitTests
+{
+  using NUnit.Framework;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client;
+
+  [TestFixture]
+  [Category("group1")]
+  [Category("unicast_only")]
+  [Category("generics")]
+  public class ThinClientRegionInterestRegexInterest3Tests : 
ThinClientRegionSteps
+  {
+#region Private members and methods
+
+private UnitProcess m_client1, m_client2, m_client3, m_feeder;
+private static string[] m_regexes = { "Key-*1", "Key-*2",
+  "Key-*3", "Key-*4" };
+private const string m_regex23 = "Key-[23]";
+private const string m_regexWildcard = "Key-.*";
+private const int m_numUnicodeStrings = 5;
+
+private static string[] m_keysNonRegex = { "key-1", "key-2", "key-3" };
+private static string[] m_keysForRegex = {"key-regex-1",
+  "key-regex-2", "key-regex-3" };
+private static string[] RegionNamesForInterestNotify =
+  { "RegionTrue", "RegionFalse", "RegionOther" };
+
+string GetUnicodeString(int index)
+{
+  return new string('\x0905', 40) + index.ToString("D10");
+}
+
+#endregion
+
+protected override ClientBase[] GetClients()
+{
+  m_client1 = new UnitProcess();
+  m_client2 = new UnitProcess();
+  m_client3 = new UnitProcess();
+  m_feeder  = new UnitProcess();
+  return new ClientBase[] { m_client1, m_client2, m_client3, m_feeder };
+}
+
+[TestFixtureTearDown]
+public override void EndTests()
+{
+  CacheHelper.StopJavaServers();
+  base.EndTests();
+}
+
+[TearDown]
+public override void EndTest()
+{
+  try
+  {
+m_client1.Call(DestroyRegions);
+m_client2.Call(DestroyRegions);
+CacheHelper.ClearEndpoints();
+  }
+  finally
+  {
+CacheHelper.StopJavaServers();
+  }
+  base.EndTest();
+}
+
+#region Steps for Thin Client IRegion with Interest
+
+public void StepFourIL()
+{
+  VerifyCreated(m_regionNames[0], m_keys[0]);
+  VerifyCreated(m_regionNames[1], m_keys[2]);
+  VerifyEntry(m_regionNames[0], m_keys[0], m_vals[0]);
+  VerifyEntry(m_regionNames[1], m_keys[2], m_vals[2]);
+}
+
+public void StepFourRegex3()
+{
+  IRegion region0 = CacheHelper.GetVerifyRegion(m_regionNames[0]);
+  IRegion region1 = CacheHelper.GetVerifyRegion(m_regionNames[1]);
+  try
+  {
+Util.Log("Registering empty regular expression.");
+region0.GetSubscriptionService().RegisterRegex(string.Empty);
+Assert.Fail("Did not get expected exception!");
+  }
+  catch (Exception ex)
+  {
+Util.Log("Got expected exception {0}: {1}", ex.GetType(), ex.Message);
+  }
+  try
+  {
+Util.Log("Registering null regular expression.");
+region1.GetSubscriptionService().RegisterRegex(null);
+Assert.Fail("Did not get expected exception!");
+  }
+  catch (Exception ex)
+  {
+Util.Log("Got expected exception {0}: {1}", ex.GetType(), ex.Message);
+  }
+  try
+  {
+Util.Log("Registering non-existent regular expression.");
+
region1.GetSubscriptionService().UnregisterRegex("Non*Existent*Regex*");
+Assert.Fail("Did not get expected exception!");
+  }
+  catch (Exception ex)
+  {
+Util.Log("Got expected exception {0}: {1}", ex.GetType(), ex.Message);
+  }
+}
+
+public void StepFourFailoverRegex()
+{
+

[1/4] geode-native git commit: GEODE-3439: Split ThinClientRegionInterestTestsN into mulitple tests to avoid random failures.

2017-08-14 Thread jbarrett 
Repository: geode-native
Updated Branches:
  refs/heads/develop 8f340e4dd -> 70d2456b0


http://git-wip-us.apache.org/repos/asf/geode-native/blob/70d2456b/clicache/integration-test/ThinClientRegionInterestTestsN.cs
--
diff --git a/clicache/integration-test/ThinClientRegionInterestTestsN.cs 
b/clicache/integration-test/ThinClientRegionInterestTestsN.cs
deleted file mode 100644
index 9cf64f2..000
--- a/clicache/integration-test/ThinClientRegionInterestTestsN.cs
+++ /dev/null
@@ -1,1216 +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.
- */
-
-using System;
-using System.Collections.Generic;
-using System.Threading;
-
-namespace Apache.Geode.Client.UnitTests
-{
-  using NUnit.Framework;
-  using Apache.Geode.DUnitFramework;
-  using Apache.Geode.Client;
-
-  [TestFixture]
-  [Category("group1")]
-  [Category("unicast_only")]
-  [Category("generics")]
-  public class ThinClientRegionInterestTests : ThinClientRegionSteps
-  {
-#region Private members and methods
-
-private UnitProcess m_client1, m_client2, m_client3, m_feeder;
-private static string[] m_regexes = { "Key-*1", "Key-*2",
-  "Key-*3", "Key-*4" };
-private const string m_regex23 = "Key-[23]";
-private const string m_regexWildcard = "Key-.*";
-private const int m_numUnicodeStrings = 5;
-
-private static string[] m_keysNonRegex = { "key-1", "key-2", "key-3" };
-private static string[] m_keysForRegex = {"key-regex-1",
-  "key-regex-2", "key-regex-3" };
-private static string[] RegionNamesForInterestNotify =
-  { "RegionTrue", "RegionFalse", "RegionOther" };
-
-string GetUnicodeString(int index)
-{
-  return new string('\x0905', 40) + index.ToString("D10");
-}
-
-#endregion
-
-protected override ClientBase[] GetClients()
-{
-  m_client1 = new UnitProcess();
-  m_client2 = new UnitProcess();
-  m_client3 = new UnitProcess();
-  m_feeder  = new UnitProcess();
-  return new ClientBase[] { m_client1, m_client2, m_client3, m_feeder };
-}
-
-[TestFixtureTearDown]
-public override void EndTests()
-{
-  CacheHelper.StopJavaServers();
-  base.EndTests();
-}
-
-[TearDown]
-public override void EndTest()
-{
-  try
-  {
-m_client1.Call(DestroyRegions);
-m_client2.Call(DestroyRegions);
-CacheHelper.ClearEndpoints();
-  }
-  finally
-  {
-CacheHelper.StopJavaServers();
-  }
-  base.EndTest();
-}
-
-#region Steps for Thin Client IRegion with Interest
-
-public void StepFourIL()
-{
-  VerifyCreated(m_regionNames[0], m_keys[0]);
-  VerifyCreated(m_regionNames[1], m_keys[2]);
-  VerifyEntry(m_regionNames[0], m_keys[0], m_vals[0]);
-  VerifyEntry(m_regionNames[1], m_keys[2], m_vals[2]);
-}
-
-public void StepFourRegex3()
-{
-  IRegion region0 = CacheHelper.GetVerifyRegion(m_regionNames[0]);
-  IRegion region1 = CacheHelper.GetVerifyRegion(m_regionNames[1]);
-  try
-  {
-Util.Log("Registering empty regular expression.");
-region0.GetSubscriptionService().RegisterRegex(string.Empty);
-Assert.Fail("Did not get expected exception!");
-  }
-  catch (Exception ex)
-  {
-Util.Log("Got expected exception {0}: {1}", ex.GetType(), ex.Message);
-  }
-  try
-  {
-Util.Log("Registering null regular expression.");
-region1.GetSubscriptionService().RegisterRegex(null);
-Assert.Fail("Did not get expected exception!");
-  }
-  catch (Exception ex)
-  {
-Util.Log("Got expected exception {0}: {1}", ex.GetType(), ex.Message);
-  }
-  try
-  {
-Util.Log("Registering non-existent regular expression.");
-
region1.GetSubscriptionService().UnregisterRegex("Non*Existent*Regex*");
-Assert.Fail("Did not get expected exception!");
-  }
-  catch (Exception ex)
-  {
-Util.Log("Got expected exception {0}: {1}", ex.GetType(), ex.Message);
-  }
-}
-
-public void

[3/4] geode-native git commit: GEODE-3439: Split ThinClientRegionInterestTestsN into mulitple tests to avoid random failures.

2017-08-14 Thread jbarrett 
http://git-wip-us.apache.org/repos/asf/geode-native/blob/70d2456b/clicache/integration-test/ThinClientRegionInterestListTests.cs
--
diff --git a/clicache/integration-test/ThinClientRegionInterestListTests.cs 
b/clicache/integration-test/ThinClientRegionInterestListTests.cs
new file mode 100644
index 000..79e92ef
--- /dev/null
+++ b/clicache/integration-test/ThinClientRegionInterestListTests.cs
@@ -0,0 +1,586 @@
+/*
+ * 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.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+
+namespace Apache.Geode.Client.UnitTests
+{
+  using NUnit.Framework;
+  using Apache.Geode.DUnitFramework;
+  using Apache.Geode.Client;
+
+  [TestFixture]
+  [Category("group1")]
+  [Category("unicast_only")]
+  [Category("generics")]
+  public class ThinClientRegionInterestListTests : ThinClientRegionSteps
+  {
+#region Private members and methods
+
+private UnitProcess m_client1, m_client2, m_client3, m_feeder;
+private static string[] m_regexes = { "Key-*1", "Key-*2",
+  "Key-*3", "Key-*4" };
+private const string m_regex23 = "Key-[23]";
+private const string m_regexWildcard = "Key-.*";
+private const int m_numUnicodeStrings = 5;
+
+private static string[] m_keysNonRegex = { "key-1", "key-2", "key-3" };
+private static string[] m_keysForRegex = {"key-regex-1",
+  "key-regex-2", "key-regex-3" };
+private static string[] RegionNamesForInterestNotify =
+  { "RegionTrue", "RegionFalse", "RegionOther" };
+
+string GetUnicodeString(int index)
+{
+  return new string('\x0905', 40) + index.ToString("D10");
+}
+
+#endregion
+
+protected override ClientBase[] GetClients()
+{
+  m_client1 = new UnitProcess();
+  m_client2 = new UnitProcess();
+  m_client3 = new UnitProcess();
+  m_feeder  = new UnitProcess();
+  return new ClientBase[] { m_client1, m_client2, m_client3, m_feeder };
+}
+
+[TestFixtureTearDown]
+public override void EndTests()
+{
+  CacheHelper.StopJavaServers();
+  base.EndTests();
+}
+
+[TearDown]
+public override void EndTest()
+{
+  try
+  {
+m_client1.Call(DestroyRegions);
+m_client2.Call(DestroyRegions);
+CacheHelper.ClearEndpoints();
+  }
+  finally
+  {
+CacheHelper.StopJavaServers();
+  }
+  base.EndTest();
+}
+
+#region Steps for Thin Client IRegion with Interest
+
+public void StepFourIL()
+{
+  VerifyCreated(m_regionNames[0], m_keys[0]);
+  VerifyCreated(m_regionNames[1], m_keys[2]);
+  VerifyEntry(m_regionNames[0], m_keys[0], m_vals[0]);
+  VerifyEntry(m_regionNames[1], m_keys[2], m_vals[2]);
+}
+
+public void StepFourRegex3()
+{
+  IRegion region0 = CacheHelper.GetVerifyRegion(m_regionNames[0]);
+  IRegion region1 = CacheHelper.GetVerifyRegion(m_regionNames[1]);
+  try
+  {
+Util.Log("Registering empty regular expression.");
+region0.GetSubscriptionService().RegisterRegex(string.Empty);
+Assert.Fail("Did not get expected exception!");
+  }
+  catch (Exception ex)
+  {
+Util.Log("Got expected exception {0}: {1}", ex.GetType(), ex.Message);
+  }
+  try
+  {
+Util.Log("Registering null regular expression.");
+region1.GetSubscriptionService().RegisterRegex(null);
+Assert.Fail("Did not get expected exception!");
+  }
+  catch (Exception ex)
+  {
+Util.Log("Got expected exception {0}: {1}", ex.GetType(), ex.Message);
+  }
+  try
+  {
+Util.Log("Registering non-existent regular expression.");
+
region1.GetSubscriptionService().UnregisterRegex("Non*Existent*Regex*");
+Assert.Fail("Did not get expected exception!");
+  }
+  catch (Exception ex)
+  {
+Util.Log("Got expected exception {0}: {1}", ex.GetType(), ex.Message);
+  }
+}
+
+public void StepFourFailoverRegex()
+{
+  VerifyCreated(m_regionNames[0], m_keys[0]);
+

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

2017-08-14 Thread udo 
Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/geode into 
develop


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

Branch: refs/heads/develop
Commit: 87bee0843d255187c8a53ccb4ffd57534168f873
Parents: 684f85d 13ad4b6
Author: Udo Kohlmeyer 
Authored: Mon Aug 14 15:31:49 2017 -0700
Committer: Udo Kohlmeyer 
Committed: Mon Aug 14 15:31:49 2017 -0700

--
 geode-book/Gemfile.lock |2 +-
 .../source/subnavs/geode-subnav.erb |   54 +-
 .../how_region_versioning_works.html.md.erb |4 +-
 .../disk_free_space_monitoring.html.md.erb  |2 +-
 .../heap_use/off_heap_management.html.md.erb|2 +-
 .../region_compression.html.md.erb  |2 +-
 geode-docs/reference/book_intro.html.md.erb |   20 +-
 .../statistics/statistics_list.html.md.erb  | 1310 --
 .../reference/statistics_list.html.md.erb   | 1310 ++
 .../topics/cache-elements-list.html.md.erb  |4 +-
 .../reference/topics/cache_xml.html.md.erb  |   50 +-
 .../chapter_overview_cache_xml.html.md.erb  |8 +-
 ...chapter_overview_regionshortcuts.html.md.erb |   54 +-
 .../client-cache-elements-list.html.md.erb  |2 +-
 .../reference/topics/client-cache.html.md.erb   |   42 +-
 .../topics/gemfire_properties.html.md.erb   |   46 +-
 .../reference/topics/gfe_cache_xml.html.md.erb  |   78 +-
 ...handling_exceptions_and_failures.html.md.erb |   10 +-
 ...mory_requirements_for_cache_data.html.md.erb |   30 +-
 ...on-ascii_strings_in_config_files.html.md.erb |6 +-
 .../region_shortcuts_reference.html.md.erb  |2 +-
 21 files changed, 1516 insertions(+), 1522 deletions(-)
--

[3/5] geode git commit: GEODE-3395 Variable-ize product version and name in user guide - Reference section

2017-08-14 Thread dbarnes 
http://git-wip-us.apache.org/repos/asf/geode/blob/13ad4b6e/geode-docs/reference/statistics_list.html.md.erb
--
diff --git a/geode-docs/reference/statistics_list.html.md.erb 
b/geode-docs/reference/statistics_list.html.md.erb
new file mode 100644
index 000..f26075d
--- /dev/null
+++ b/geode-docs/reference/statistics_list.html.md.erb
@@ -0,0 +1,1310 @@
+---
+title: Geode Statistics List
+---
+
+
+
+
+
+
+This section describes the primary statistics gathered by Geode when 
statistics are enabled.
+
+All statistics gathering requires the `gemfire.properties` 
`statistic-sampling-enabled` in `gemfire.properties` file to be true. 
Statistics that use time require the `gemfire.properties` 
`enable-time-statistics` to be true.
+
+Performance statistics are collected for each Java application or cache server 
that connects to a distributed system.
+
+-   **[Cache Performance 
(CachePerfStats)](#section_DEF8D3644D3246AB8F06FE09A37DC5C8)**
+
+-   **[Cache Server 
(CacheServerStats)](#section_EF5C2C59BFC74FFB8607F9571AB9A471)**
+
+-   **[Client-Side Notifications 
(CacheClientUpdaterStats)](#section_B08C0783BBF9489E8BB48B4AEC597C62)**
+
+-   **[Client-to-Server Messaging Performance 
(ClientStats)](#section_04B7D7387E584712B7710B5ED1E876BB)**
+
+-   **[Client Connection Pool 
(PoolStats)](#section_6C247F61DB834C079A16BE92789D4692)**
+
+-   **[Continuous Querying 
(CQStatistics)](#section_66C0E7748501480B85209D57D24256D5)**
+
+-   **[Delta Propagation 
(DeltaPropagationStatistics)](#section_D4ABED3FF94245C0BEE0F6FC9481E867)**
+
+-   **[Disk Space Usage 
(DiskDirStatistics)](#section_6C2BECC63A83456190B029DEDB8F4BE3)**
+
+-   **[Disk Usage and Performance 
(DiskRegionStatistics)](#section_983BFC6D53C74829A04A91C39E06315F)**
+
+-   **[Distributed System Messaging 
(DistributionStats)](#section_ACB4161F10D64BC0B15871D003FF6FDF)**
+
+-   **[Distributed Lock Services 
(DLockStats)](#section_78D346A580724E1EA645E31626EECE40)**
+
+-   **[Function Execution 
(FunctionServiceStatistics)](#section_5E211DDB0E8640689AD0A4659511E17A)**
+
+-   **[Gateway Queue 
(GatewayStatistics)](#section_C4199A541B1F4B82B6178C416C0FAE4B)**
+
+-   **[Indexes (IndexStats)](#section_86A61860024B480592DAC67FFB882538)**
+
+-   **[JVM Performance](#section_607C3867602E410CAE5FAB26A7FF1CB9)**
+
+-   **[Locator 
(LocatorStatistics)](#section_C48B654F973E4B44AD825D459C23A6CD)**
+
+-   **[Lucene Indexes (LuceneIndexStats)](#LuceneStats)**
+
+-   **[Off-Heap (OffHeapMemoryStats)](#topic_ohc_tjk_w5)**
+
+-   **[Operating System Statistics - 
Linux](#section_923B28F01BC3416786D3AFBD87F22A5E)**
+
+-   **[Partitioned Regions 
(PartitionedRegionpartitioned\_region\_nameStatistics)](#section_35AC170770C944C3A336D9AEC2D2F7C5)**
+
+-   **[Region Entry Eviction – Count-Based 
(LRUStatistics)](#section_374FBD92A3B74F6FA08AA23047929B4F)**
+
+-   **[Region Entry Eviction – Size-based 
(LRUStatistics)](#section_3D2AA2BCE5B6485699A7B6ADD1C49FF7)**
+
+-   **[Server Notifications for All Clients 
(CacheClientNotifierStatistics)](#section_5362EF9AECBC48D69475697109ABEDFA)**
+
+-   **[Server Notifications for Single Client 
(CacheClientProxyStatistics)](#section_E03865F509E543D9B8F9462B3DA6255E)**
+
+-   **[Server-to-Client Messaging Performance 
(ClientSubscriptionStats)](#section_3AB1C0AA55014163A2BBF68E13D25E3A)**
+
+-   **[Statistics Collection 
(StatSampler)](#section_55F3AF6413474317902845EE4996CC21)**
+
+## Cache Performance (CachePerfStats)
+
+Statistics for the Geode cache. These can be used to determine the type and 
number of cache operations being performed and how much time they consume.
+
+Regarding Geode cache transactions, transaction-related statistics are 
compiled and stored as properties in the CachePerfStats statistic resource. 
Because the transaction’s data scope is the cache, these statistics are 
collected on a per-cache basis.
+
+The primary statistics are:
+
+| Statistic| Description   










   |

[5/5] geode git commit: GEODE-3395 Variable-ize product version and name in user guide - Reference section

2017-08-14 Thread dbarnes 
GEODE-3395 Variable-ize product version and name in user guide - Reference 
section


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

Branch: refs/heads/develop
Commit: 13ad4b6e07d80cd9961f6fbd634213c462315073
Parents: c1129c7
Author: Dave Barnes 
Authored: Mon Aug 14 15:22:16 2017 -0700
Committer: Dave Barnes 
Committed: Mon Aug 14 15:22:58 2017 -0700

--
 geode-book/Gemfile.lock |2 +-
 .../source/subnavs/geode-subnav.erb |   54 +-
 .../how_region_versioning_works.html.md.erb |4 +-
 .../disk_free_space_monitoring.html.md.erb  |2 +-
 .../heap_use/off_heap_management.html.md.erb|2 +-
 .../region_compression.html.md.erb  |2 +-
 geode-docs/reference/book_intro.html.md.erb |   20 +-
 .../statistics/statistics_list.html.md.erb  | 1310 --
 .../reference/statistics_list.html.md.erb   | 1310 ++
 .../topics/cache-elements-list.html.md.erb  |4 +-
 .../reference/topics/cache_xml.html.md.erb  |   50 +-
 .../chapter_overview_cache_xml.html.md.erb  |8 +-
 ...chapter_overview_regionshortcuts.html.md.erb |   54 +-
 .../client-cache-elements-list.html.md.erb  |2 +-
 .../reference/topics/client-cache.html.md.erb   |   42 +-
 .../topics/gemfire_properties.html.md.erb   |   46 +-
 .../reference/topics/gfe_cache_xml.html.md.erb  |   78 +-
 ...handling_exceptions_and_failures.html.md.erb |   10 +-
 ...mory_requirements_for_cache_data.html.md.erb |   30 +-
 ...on-ascii_strings_in_config_files.html.md.erb |6 +-
 .../region_shortcuts_reference.html.md.erb  |2 +-
 21 files changed, 1516 insertions(+), 1522 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/geode/blob/13ad4b6e/geode-book/Gemfile.lock
--
diff --git a/geode-book/Gemfile.lock b/geode-book/Gemfile.lock
index 5f6b59a..232c3b3 100644
--- a/geode-book/Gemfile.lock
+++ b/geode-book/Gemfile.lock
@@ -198,7 +198,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bookbindery
+  bookbindery (= 10.1.7)
   libv8 (= 3.16.14.7)
 
 BUNDLED WITH

http://git-wip-us.apache.org/repos/asf/geode/blob/13ad4b6e/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
index 52e31a7..838b265 100644
--- a/geode-book/master_middleman/source/subnavs/geode-subnav.erb
+++ b/geode-book/master_middleman/source/subnavs/geode-subnav.erb
@@ -2997,86 +2997,86 @@ gfsh
 Memory
 Requirements for Cached Data
 
 
-Geode 
Statistics List
+Geode Statistics List
 
 
-Cache
 Performance (CachePerfStats)
+Cache
 Performance (CachePerfStats)
 
 
-Cache
 Server (CacheServerStats)
+Cache
 Server (CacheServerStats)
 
 
-Client-Side
 Notifications (CacheClientUpdaterStats)
+Client-Side
 Notifications (CacheClientUpdaterStats)
 
 
-Client-to-Server
 Messaging Performance (ClientStats)
+Client-to-Server
 Messaging Performance (ClientStats)
 
 
-Client
 Connection Pool (PoolStats)
+Client
 Connection Pool (PoolStats)
 
 
-Continuous
 Querying (CQStatistics)
+Continuous
 Querying (CQStatistics)
 
 
-Delta
 Propagation (DeltaPropagationStatistics)
+Delta
 Propagation (DeltaPropagationStatistics)
 
 
-Disk
 Space Usage (DiskDirStatistics)
+Disk
 Space Usage (DiskDirStatistics)
 
 
-

[1/5] geode git commit: GEODE-3395 Variable-ize product version and name in user guide - Reference section

2017-08-14 Thread dbarnes 
Repository: geode
Updated Branches:
  refs/heads/develop c1129c7ab -> 13ad4b6e0


http://git-wip-us.apache.org/repos/asf/geode/blob/13ad4b6e/geode-docs/reference/topics/gfe_cache_xml.html.md.erb
--
diff --git a/geode-docs/reference/topics/gfe_cache_xml.html.md.erb 
b/geode-docs/reference/topics/gfe_cache_xml.html.md.erb
index dba7b6a..3a941eb 100644
--- a/geode-docs/reference/topics/gfe_cache_xml.html.md.erb
+++ b/geode-docs/reference/topics/gfe_cache_xml.html.md.erb
@@ -22,9 +22,9 @@ limitations under the License.
 
 # cache Element Reference
 
-This section documents the `cache.xml` sub-elements used for Geode server 
configuration. All elements are sub-elements of the `` element.
+This section documents the `cache.xml` sub-elements used for 
<%=vars.product_name%> server configuration. All elements are sub-elements of 
the `` element.
 
-For Geode client configuration, see [client-cache Element 
Reference](client-cache.html#cc-client-cache).
+For <%=vars.product_name%> client configuration, see [client-cache 
Element Reference](client-cache.html#cc-client-cache).
 
 **API**:`org.apache.geode.cache.CacheFactory`
 
@@ -237,7 +237,7 @@ Deprecated
 
 ## gateway-sender
 
-Configures a gateway sender to distribute region events to another Geode site. 
See [Configuring a Multi-site (WAN) 
System](../../topologies_and_comm/multi_site_configuration/setting_up_a_multisite_system.html#setting_up_a_multisite_system).
+Configures a gateway sender to distribute region events to another 
<%=vars.product_name%> site. See [Configuring a Multi-site (WAN) 
System](../../topologies_and_comm/multi_site_configuration/setting_up_a_multisite_system.html#setting_up_a_multisite_system).
 
 **API:** `GatewaySender`
 
@@ -260,7 +260,7 @@ Configures a gateway sender to distribute region events to 
another Geode site. S
 
 
 parallel
-Value of true or false that specifies the type of 
gateway sender that Geode creates.
+Value of true or false that specifies the type of 
gateway sender that <%=vars.product_name%> creates.
 false
 
 
@@ -277,7 +277,7 @@ When distributing region events from the local queue, 
multiple dispatcher thread
 thread
 When distributing region events from the local queue, multiple dispatcher 
threads preserve the order in which a given thread added region events to the 
queue.
 partition
-When distributing region events from the local queue, multiple dispatcher 
threads preserve the order in which region events were added to the local 
queue. For a partitioned region, this means that all region events delivered to 
a specific partition are delivered in the same order to the remote Geode site. 
For a distributed region, this means that all key updates delivered to the 
local gateway sender queue are distributed to the remote site in the same order.
+When distributing region events from the local queue, multiple dispatcher 
threads preserve the order in which region events were added to the local 
queue. For a partitioned region, this means that all region events delivered to 
a specific partition are delivered in the same order to the remote 
<%=vars.product_name%> site. For a distributed region, this means that all key 
updates delivered to the local gateway sender queue are distributed to the 
remote site in the same order.
 
 You cannot configure the order-policy for a 
parallel event queue, because parallel queues cannot preserve event ordering 
for regions. Only the ordering of events for a given partition (or in a given 
queue of a distributed region) can be preserved.
 key
@@ -289,7 +289,7 @@ When distributing region events from the local queue, 
multiple dispatcher thread
 
 
 remote-distributed-system-id
-Integer that uniquely identifies the remote Geode cluster to which this 
gateway sender will send region events. This value corresponds to the distributed-system-id property specified in locators 
for the remote cluster. This attribute is required.
+Integer that uniquely identifies the remote <%=vars.product_name%> cluster 
to which this gateway sender will send region events. This value corresponds to 
the distributed-system-id property specified in 
locators for the remote cluster. This attribute is required.
 null
 
 
@@ -309,7 +309,7 @@ When distributing region events from the local queue, 
multiple dispatcher thread
 
 
 enable-batch-conflation
-Boolean value that determines whether Geode should conflate messages.
+Boolean value that determines whether <%=vars.product_name%> should 
conflate messages.
 false
 
 
@@ -324,12 +324,12 @@ When distributing region events from the local queue, 
multiple dispatcher thread
 
 
 enable-persistence
-Boolean value that determines whether Geode persists the gateway 
queue.
+Boolean value that determines whether <%=vars.product_name%> persists the 
gateway queue.
 false
 
 
 disk-store-name
-Named disk store to use for storing the queue overflow, or for persisting 
the queue. If you specify a

[2/5] geode git commit: GEODE-3395 Variable-ize product version and name in user guide - Reference section

2017-08-14 Thread dbarnes 
http://git-wip-us.apache.org/repos/asf/geode/blob/13ad4b6e/geode-docs/reference/topics/cache-elements-list.html.md.erb
--
diff --git a/geode-docs/reference/topics/cache-elements-list.html.md.erb 
b/geode-docs/reference/topics/cache-elements-list.html.md.erb
index 2b1c035..3f4872a 100644
--- a/geode-docs/reference/topics/cache-elements-list.html.md.erb
+++ b/geode-docs/reference/topics/cache-elements-list.html.md.erb
@@ -1,4 +1,4 @@

+--
 title: "cache Element Hierarchy"
 ---
 
@@ -19,7 +19,7 @@ See the License for the specific language governing 
permissions and
 limitations under the License.
 -->
 
-This section shows the hierarchy of `` element sub-elements that you 
use to configure Geode caches and servers.
+This section shows the hierarchy of `` element sub-elements that you 
use to configure <%=vars.product_name%> caches and servers.
 
 For details, see [cache Element 
Reference](cache_xml.html#cache_xml_cache).
 

http://git-wip-us.apache.org/repos/asf/geode/blob/13ad4b6e/geode-docs/reference/topics/cache_xml.html.md.erb
--
diff --git a/geode-docs/reference/topics/cache_xml.html.md.erb 
b/geode-docs/reference/topics/cache_xml.html.md.erb
index cf5d2b3..a8acd89 100644
--- a/geode-docs/reference/topics/cache_xml.html.md.erb
+++ b/geode-docs/reference/topics/cache_xml.html.md.erb
@@ -21,9 +21,9 @@ limitations under the License.
 
 
 
-This section documents the `cache.xml` sub-elements used for Geode server 
configuration. All elements are sub-elements of the `` element.
+This section documents the `cache.xml` sub-elements used for 
<%=vars.product_name%> server configuration. All elements are sub-elements of 
the `` element.
 
-For Geode client configuration, see [client-cache Element 
Reference](client-cache.html#cc-client-cache).
+For <%=vars.product_name%> client configuration, see [client-cache 
Element Reference](client-cache.html#cc-client-cache).
 
 **API**:`org.apache.geode.cache.CacheFactory`
 
@@ -244,7 +244,7 @@ Configures a queue for sending region events to an 
AsyncEventListener implementa
 
 
 parallel
-Value of true or false that specifies the type of 
queue that Geode creates.
+Value of true or false that specifies the type of 
queue that <%=vars.product_name%> creates.
 false
 
 
@@ -259,12 +259,12 @@ Configures a queue for sending region events to an 
AsyncEventListener implementa
 
 
 enable-batch-conflation
-Boolean value that determines whether Geode should conflate messages.
+Boolean value that determines whether <%=vars.product_name%> should 
conflate messages.
 false
 
 
 disk-store-name
-Named disk store to use for storing queue overflow, or for persisting the 
queue. If you specify a value, the named disk store must exist. If you specify 
a null value, Geode uses the default disk store for overflow and queue 
persistence.
+Named disk store to use for storing queue overflow, or for persisting the 
queue. If you specify a value, the named disk store must exist. If you specify 
a null value, <%=vars.product_name%> uses the default disk store for overflow 
and queue persistence.
 null specifies the default disk store
 
 
@@ -293,13 +293,13 @@ Configures a queue for sending region events to an 
AsyncEventListener implementa
 
 key. When distributing region events from the local 
queue, multiple dispatcher threads preserve the order of key updates.
 thread. When distributing region events from the local 
queue, multiple dispatcher threads preserve the order in which a given thread 
added region events to the queue.
-partition. This option is valid for parallel event 
queues. When distributing region events from the local queue, multiple 
dispatcher threads preserve the order in which region events were added to the 
local queue. For a partitioned region, this means that all region events 
delivered to a specific partition are delivered in the same order to the remote 
Geode site. For a distributed region, this means that all key updates delivered 
to the local queue are distributed to the remote site in the same order.
+partition. This option is valid for parallel event 
queues. When distributing region events from the local queue, multiple 
dispatcher threads preserve the order in which region events were added to the 
local queue. For a partitioned region, this means that all region events 
delivered to a specific partition are delivered in the same order to the remote 
<%=vars.product_name%> site. For a distributed region, this means that all key 
updates delivered to the local queue are distributed to the remote site in the 
same order.
 
 key
 
 
 persistent
-Boolean value that determines whether Geode persists this queue.
+Boolean value that determines whether <%=vars.product_name%> persists this 
queue.
 False
 
 
@@ -494,7 +494,7 @@ The `cacheserver` process uses only `cache.xml` 
configuration. For application s
 
 
 tcp-no-delay

geode git commit: GEODE-3434: Modifications based on review comments

2017-08-14 Thread jasonhuynh 
Repository: geode
Updated Branches:
  refs/heads/feature/GEODE-3434 e9ed8a12f -> ae570225e


GEODE-3434: Modifications based on review comments


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

Branch: refs/heads/feature/GEODE-3434
Commit: ae570225ed1d53dafd7450b4b4e399eb073f8442
Parents: e9ed8a1
Author: Jason Huynh 
Authored: Mon Aug 14 12:07:08 2017 -0700
Committer: Jason Huynh 
Committed: Mon Aug 14 12:07:08 2017 -0700

--
 .../geode/session/tests/ContainerInstall.java   |  36 +++---
 .../geode/session/tests/ServerContainer.java|   1 -
 .../geode/session/tests/TomcatInstall.java  | 118 +++
 ...TomcatSessionBackwardsCompatibilityTest.java |  10 --
 .../lucene/internal/LuceneEventListener.java|   1 -
 geode-old-versions/build.gradle |  60 +-
 6 files changed, 38 insertions(+), 188 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/geode/blob/ae570225/geode-assembly/src/test/java/org/apache/geode/session/tests/ContainerInstall.java
--
diff --git 
a/geode-assembly/src/test/java/org/apache/geode/session/tests/ContainerInstall.java
 
b/geode-assembly/src/test/java/org/apache/geode/session/tests/ContainerInstall.java
index 46779c4..fc3c856 100644
--- 
a/geode-assembly/src/test/java/org/apache/geode/session/tests/ContainerInstall.java
+++ 
b/geode-assembly/src/test/java/org/apache/geode/session/tests/ContainerInstall.java
@@ -18,6 +18,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.net.URI;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Properties;
@@ -97,7 +98,7 @@ public abstract class ContainerInstall {
 
   public ContainerInstall(String installDir, String downloadURL, 
ConnectionType connType,
   String moduleName) throws IOException {
-this(installDir, downloadURL, connType, moduleName, null);
+this(installDir, downloadURL, connType, moduleName, 
DEFAULT_MODULE_LOCATION);
   }
 
   /**
@@ -118,6 +119,8 @@ public abstract class ContainerInstall {
   String moduleName, String geodeModuleLocation) throws IOException {
 this.connType = connType;
 
+clearPreviousInstall(installDir);
+
 logger.info("Installing container from URL " + downloadURL);
 
 // Optional step to install the container from a URL pointing to its 
distribution
@@ -150,17 +153,12 @@ public abstract class ContainerInstall {
   /**
* Cleans up the installation by deleting the extracted module and 
downloaded installation folders
*/
-  public void clearPreviousRuns() throws IOException {
-File modulesFolder = new File(DEFAULT_MODULE_EXTRACTION_DIR);
-File installsFolder = new File(DEFAULT_INSTALL_DIR);
-
-// Remove default modules extraction from previous runs
-if (modulesFolder.exists()) {
-  FileUtils.deleteDirectory(modulesFolder);
-}
-// Remove default installs from previous runs
-if (installsFolder.exists()) {
-  FileUtils.deleteDirectory(installsFolder);
+  public void clearPreviousInstall(String installDir) throws IOException {
+File installFolder = new File(installDir);
+// Remove installs from previous runs in the same folder
+if (installFolder.exists()) {
+  logger.info("Deleting previous install folder " + 
installFolder.getAbsolutePath());
+  FileUtils.deleteDirectory(installFolder);
 }
   }
 
@@ -326,16 +324,22 @@ public abstract class ContainerInstall {
   }
 }
 
+String extractedModulePath =
+modulePath.getName().substring(0, modulePath.getName().length() - 4);
+// Get the name of the new module folder within the extraction directory
+File newModuleFolder = new File(DEFAULT_MODULE_EXTRACTION_DIR + 
extractedModulePath);
+// Remove any previous module folders extracted here
+if (newModuleFolder.exists()) {
+  logger.info("Deleting previous modules directory " + 
newModuleFolder.getAbsolutePath());
+  FileUtils.deleteDirectory(newModuleFolder);
+}
+
 // Unzip if it is a zip file
 if (archive) {
   if 
(!FilenameUtils.getExtension(modulePath.getAbsolutePath()).equals("zip")) {
 throw new IOException("Bad module archive " + modulePath);
   }
 
-  // Get the name of the new module folder within the extraction directory
-  File newModuleFolder = new File(DEFAULT_MODULE_EXTRACTION_DIR
-  + modulePath.getName().substring(0, modulePath.getName().length() - 
4));
-
   // Extract folder to location if not already there
   if

[1/3] geode git commit: GEODE-3423: Provide support for running parallel docker builds in Jenkins

2017-08-14 Thread jensdeppe 
Repository: geode
Updated Branches:
  refs/heads/develop 52ae15094 -> c1129c7ab


GEODE-3423: Provide support for running parallel docker builds in Jenkins

- Also cleaning up other Dockerfiles which are unused

Signed-off-by: Scott Jewell 


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

Branch: refs/heads/develop
Commit: b20b49308808aed9c8c8fdde1226649956ba9e0b
Parents: acdf2e8
Author: Jens Deppe 
Authored: Thu Aug 10 10:22:17 2017 -0700
Committer: Scott Jewell 
Committed: Thu Aug 10 10:22:17 2017 -0700

--
 dev-tools/docker/base/Dockerfile| 42 +
 dev-tools/docker/base/build-base-docker.sh  |  4 +-
 dev-tools/docker/base/entrypoint.sh | 29 +
 dev-tools/docker/compile/Dockerfile | 21 ---
 .../docker/compile/start-compile-docker.sh  | 62 
 gradle/docker.gradle| 12 ++--
 6 files changed, 52 insertions(+), 118 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/geode/blob/b20b4930/dev-tools/docker/base/Dockerfile
--
diff --git a/dev-tools/docker/base/Dockerfile b/dev-tools/docker/base/Dockerfile
index 1cce0dd..4ba74bc 100644
--- a/dev-tools/docker/base/Dockerfile
+++ b/dev-tools/docker/base/Dockerfile
@@ -21,34 +21,20 @@ LABEL Vendor="Apache Geode"
 LABEL version=unstable
 
 # download JDK 8
-ENVJAVA_HOME /jdk1.8.0_51
-
-RUNyum install -y wget which tar git \
-   && wget --no-cookies --no-check-certificate --header "Cookie: 
gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; 
oraclelicense=accept-securebackup-cookie" 
"http://download.oracle.com/otn-pub/java/jdk/8u51-b16/jdk-8u51-linux-x64.tar.gz;
 \
-   && tar xf jdk-8u51-linux-x64.tar.gz \
-   && rm -rf $JAVA_HOME/*src.zip \
-   $JAVA_HOME/lib/missioncontrol \
-   $JAVA_HOME/lib/visualvm \
-   $JAVA_HOME/lib/*javafx* \
-   $JAVA_HOME/jre/lib/plugin.jar \
-   
$JAVA_HOME/jre/lib/ext/jfxrt.jar \
-   $JAVA_HOME/jre/bin/javaws \
-   $JAVA_HOME/jre/lib/javaws.jar \
-   $JAVA_HOME/jre/lib/desktop \
-   $JAVA_HOME/jre/plugin \
-   $JAVA_HOME/jre/lib/deploy* \
-   $JAVA_HOME/jre/lib/*javafx* \
-   $JAVA_HOME/jre/lib/*jfx* \
-   
$JAVA_HOME/jre/lib/amd64/libdecora_sse.so \
-   
$JAVA_HOME/jre/lib/amd64/libprism_*.so \
-   
$JAVA_HOME/jre/lib/amd64/libfxplugins.so \
-   
$JAVA_HOME/jre/lib/amd64/libglass.so \
-   
$JAVA_HOME/jre/lib/amd64/libgstreamer-lite.so \
-   
$JAVA_HOME/jre/lib/amd64/libjavafx*.so \
-   
$JAVA_HOME/jre/lib/amd64/libjfx*.so \
-   jdk-8u51-linux-x64.tar.gz \
-   /usr/share/locale/* \
-   && yum clean all
+ENV JAVA_HOME /jdk1.8.0_144
+
+RUN yum install -y wget which tar git
+RUN wget --no-cookies --no-check-certificate --header "Cookie: 
gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; 
oraclelicense=accept-securebackup-cookie" 
"http://download.oracle.com/otn-pub/java/jdk/8u144-b01/090f390dda5b47b9b721c7dfaa008135/jdk-8u144-linux-x64.tar.gz;
+RUN tar xf jdk-8u144-linux-x64.tar.gz
+RUN rm jdk-8u144-linux-x64.tar.gz
+RUN yum clean all
 
 ENV PATH $PATH:$JAVA_HOME/bin
 
+RUN curl -L -o /usr/local/bin/gosu 
https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64
+RUN chmod +x /usr/local/bin/gosu
+
+COPY entrypoint.sh /usr/local/bin/entrypoint.sh
+
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
+

http://git-wip-us.apache.org/repos/asf/geode/blob/b20b4930/dev-tools/docker/base/build-base-docker.sh
--
diff --git a/dev-tools/docker/base/build-base-docker.sh 
b/dev-tools/docker/base/build-base-docker.sh
index 9aab72c..d2d17fc 100755
--- a/dev-tools/docker/base/build-base-docker.sh

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

2017-08-14 Thread jensdeppe 
Merge branch 'feature/GEODE-3423' into develop


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

Branch: refs/heads/develop
Commit: c1129c7abcf4b7b8a28f99dfd1afcc8f4e86e1da
Parents: 52ae150 0ab0ad4
Author: Jens Deppe 
Authored: Mon Aug 14 11:42:28 2017 -0700
Committer: Scott Jewell 
Committed: Mon Aug 14 11:42:28 2017 -0700

--
 dev-tools/docker/base/Dockerfile| 37 +++-
 dev-tools/docker/base/build-base-docker.sh  |  4 +-
 dev-tools/docker/base/entrypoint.sh | 29 +
 dev-tools/docker/compile/Dockerfile | 21 ---
 .../docker/compile/start-compile-docker.sh  | 62 
 gradle/docker.gradle| 12 ++--
 6 files changed, 45 insertions(+), 120 deletions(-)
--

[2/3] geode git commit: GEODE-3423: Use openjdk:8 as the base

2017-08-14 Thread jensdeppe 
GEODE-3423: Use openjdk:8 as the base

Signed-off-by: Jens Deppe 


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

Branch: refs/heads/develop
Commit: 0ab0ad450a9d2a05e77d1b71936bc04c0b9f4a9f
Parents: b20b493
Author: Scott Jewell 
Authored: Thu Aug 10 13:46:22 2017 -0700
Committer: Jens Deppe 
Committed: Thu Aug 10 13:46:22 2017 -0700

--
 dev-tools/docker/base/Dockerfile | 11 +--
 1 file changed, 1 insertion(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/geode/blob/0ab0ad45/dev-tools/docker/base/Dockerfile
--
diff --git a/dev-tools/docker/base/Dockerfile b/dev-tools/docker/base/Dockerfile
index 4ba74bc..eaea314 100644
--- a/dev-tools/docker/base/Dockerfile
+++ b/dev-tools/docker/base/Dockerfile
@@ -14,21 +14,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM centos:centos7
+FROM openjdk:8
 MAINTAINER Geode Community 
 
 LABEL Vendor="Apache Geode"
 LABEL version=unstable
 
-# download JDK 8
-ENV JAVA_HOME /jdk1.8.0_144
-
-RUN yum install -y wget which tar git
-RUN wget --no-cookies --no-check-certificate --header "Cookie: 
gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; 
oraclelicense=accept-securebackup-cookie" 
"http://download.oracle.com/otn-pub/java/jdk/8u144-b01/090f390dda5b47b9b721c7dfaa008135/jdk-8u144-linux-x64.tar.gz;
-RUN tar xf jdk-8u144-linux-x64.tar.gz
-RUN rm jdk-8u144-linux-x64.tar.gz
-RUN yum clean all
-
 ENV PATH $PATH:$JAVA_HOME/bin
 
 RUN curl -L -o /usr/local/bin/gosu 
https://github.com/tianon/gosu/releases/download/1.10/gosu-amd64

geode git commit: GEODE-3395 Variable-ize product version and name in user guide - reflect bookbinder v10.1.7 requirement

2017-08-14 Thread dbarnes 
Repository: geode
Updated Branches:
  refs/heads/develop 645a32d04 -> 52ae15094


GEODE-3395 Variable-ize product version and name in user guide - reflect 
bookbinder v10.1.7 requirement


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

Branch: refs/heads/develop
Commit: 52ae1509486b4cd5d2077916ad00101a8c774b47
Parents: 645a32d
Author: Dave Barnes 
Authored: Mon Aug 14 11:01:22 2017 -0700
Committer: Dave Barnes 
Committed: Mon Aug 14 11:01:22 2017 -0700

--
 geode-book/Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/geode/blob/52ae1509/geode-book/Gemfile
--
diff --git a/geode-book/Gemfile b/geode-book/Gemfile
index b61bbdc..05b785f 100644
--- a/geode-book/Gemfile
+++ b/geode-book/Gemfile
@@ -17,6 +17,6 @@
 
 source "https://rubygems.org;
 
-gem 'bookbindery'
+gem 'bookbindery', '10.1.7'
 
 gem 'libv8', '3.16.14.7'

geode git commit: GEODE-3434: Allow the modules to be interoperable with current and older versions of tomcat 7 Modified DeltaSessions to use reflection to handle attributes fields incase an earlier t

2017-08-14 Thread jasonhuynh 
Repository: geode
Updated Branches:
  refs/heads/feature/GEODE-3434 [created] e9ed8a12f


GEODE-3434: Allow the modules to be interoperable with current and older 
versions of tomcat 7
Modified DeltaSessions to use reflection to handle attributes fields incase an 
earlier tomcat 7 is used
Modified DeltaSession7 and DeltaSession8 to extend from DeltaSession
Added session backward compatibility tests
Modified aseembly build to download old product installs


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

Branch: refs/heads/feature/GEODE-3434
Commit: e9ed8a12f6f8cb9dfeedcec5922069bce2e7b7e3
Parents: 645a32d
Author: Jason Huynh 
Authored: Mon Aug 14 09:02:11 2017 -0700
Committer: Jason Huynh 
Committed: Mon Aug 14 10:20:18 2017 -0700

--
 .../modules/session/catalina/DeltaSession7.java | 529 +-
 .../modules/session/catalina/DeltaSession8.java | 534 +--
 .../modules/session/catalina/DeltaSession.java  |  50 +-
 geode-assembly/build.gradle |   3 +
 .../geode/session/tests/ContainerInstall.java   |  65 ++-
 .../geode/session/tests/ServerContainer.java|   1 +
 .../geode/session/tests/TomcatInstall.java  |  92 +++-
 ...TomcatSessionBackwardsCompatibilityTest.java | 254 +
 .../test/dunit/standalone/VersionManager.java   |  70 ++-
 .../standalone/VersionManagerJUnitTest.java |   6 +-
 .../lucene/internal/LuceneEventListener.java|   1 +
 geode-old-versions/build.gradle | 118 +++-
 12 files changed, 598 insertions(+), 1125 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/geode/blob/e9ed8a12/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 d7f30bd..2f9319b 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
@@ -18,6 +18,7 @@ import java.io.DataInput;
 import java.io.DataOutput;
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.Field;
 import java.security.AccessController;
 import java.security.Principal;
 import java.security.PrivilegedAction;
@@ -54,35 +55,8 @@ import 
org.apache.geode.modules.session.catalina.internal.DeltaSessionDestroyAtt
 import 
org.apache.geode.modules.session.catalina.internal.DeltaSessionUpdateAttributeEvent;
 
 @SuppressWarnings("serial")
-public class DeltaSession7 extends StandardSession
-implements DataSerializable, Delta, GatewayDelta, Sizeable, 
DeltaSessionInterface {
+public class DeltaSession7 extends DeltaSession {
 
-  private transient Region operatingRegion;
-
-  private String sessionRegionName;
-
-  private String contextName;
-
-  private boolean hasDelta;
-
-  private boolean applyRemotely;
-
-  private boolean enableGatewayDeltaReplication;
-
-  private transient final Object changeLock = new Object();
-
-  private final List eventQueue =
-  new ArrayList();
-
-  private transient GatewayDeltaEvent currentGatewayDeltaEvent;
-
-  private transient boolean expired = false;
-
-  private transient boolean preferDeserializedForm = true;
-
-  private byte[] serializedPrincipal;
-
-  private final Log LOG = LogFactory.getLog(DeltaSession7.class.getName());
 
   /**
* The string manager for this package.
@@ -95,7 +69,7 @@ public class DeltaSession7 extends StandardSession
* Manager will be assigned later using {@link 
#setOwner(Object)}.
*/
   public DeltaSession7() {
-super(null);
+super();
   }
 
   /**
@@ -105,503 +79,6 @@ public class DeltaSession7 extends StandardSession
*/
   public DeltaSession7(Manager manager) {
 super(manager);
-setOwner(manager);
-  }
-
-  /**
-   * Return the HttpSession for which this object is the facade.
-   */
-  @SuppressWarnings("unchecked")
-  public HttpSession getSession() {
-if (facade == null) {
-  if (SecurityUtil.isPackageProtectionEnabled()) {
-final DeltaSession7 fsession = this;
-facade = (DeltaSessionFacade) AccessController.doPrivileged(new 
PrivilegedAction() {
-  public Object run() {
-return new DeltaSessionFacade(fsession);
-  }
-});
-  } else {
-