incubator-geode git commit: fixes flakyTest target to allow it to run Rest API tests

2016-08-01 Thread markito 
Repository: incubator-geode
Updated Branches:
  refs/heads/release/1.0.0-incubating.M3 c70efdff8 -> 83f97ceef


fixes flakyTest target to allow it to run Rest API 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/83f97cee
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/83f97cee
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/83f97cee

Branch: refs/heads/release/1.0.0-incubating.M3
Commit: 83f97ceef52febf92ef7737726548aa0865c1a59
Parents: c70efdf
Author: Bruce Schuchardt 
Authored: Tue Jul 26 13:49:00 2016 -0700
Committer: William Markito 
Committed: Mon Aug 1 16:54:15 2016 -0700

--
 geode-assembly/build.gradle | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/83f97cee/geode-assembly/build.gradle
--
diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle
index fdd6e25..499eca2 100755
--- a/geode-assembly/build.gradle
+++ b/geode-assembly/build.gradle
@@ -387,6 +387,7 @@ def dependOnInstalledProduct = {
 test dependOnInstalledProduct
 distributedTest dependOnInstalledProduct
 integrationTest dependOnInstalledProduct
+flakyTest dependOnInstalledProduct
 
 // Make build final task to generate all test and product resources
 build.dependsOn installDist

svn commit: r14609 - /dev/incubator/geode/1.0.0-incubating.M3.RC7/

2016-08-01 Thread markito 
Author: markito
Date: Tue Aug  2 00:58:29 2016
New Revision: 14609

Log:
Releasing Apache Geode 1.0.0-incubating.M3.RC7 distribution

Added:
dev/incubator/geode/1.0.0-incubating.M3.RC7/

dev/incubator/geode/1.0.0-incubating.M3.RC7/apache-geode-1.0.0-incubating.M3.tar.gz
   (with props)

dev/incubator/geode/1.0.0-incubating.M3.RC7/apache-geode-1.0.0-incubating.M3.tar.gz.asc

dev/incubator/geode/1.0.0-incubating.M3.RC7/apache-geode-1.0.0-incubating.M3.tar.gz.md5

dev/incubator/geode/1.0.0-incubating.M3.RC7/apache-geode-1.0.0-incubating.M3.tar.gz.sha256

dev/incubator/geode/1.0.0-incubating.M3.RC7/apache-geode-1.0.0-incubating.M3.zip
   (with props)

dev/incubator/geode/1.0.0-incubating.M3.RC7/apache-geode-1.0.0-incubating.M3.zip.asc

dev/incubator/geode/1.0.0-incubating.M3.RC7/apache-geode-1.0.0-incubating.M3.zip.md5

dev/incubator/geode/1.0.0-incubating.M3.RC7/apache-geode-1.0.0-incubating.M3.zip.sha256

dev/incubator/geode/1.0.0-incubating.M3.RC7/apache-geode-src-1.0.0-incubating.M3.tar.gz
   (with props)

dev/incubator/geode/1.0.0-incubating.M3.RC7/apache-geode-src-1.0.0-incubating.M3.tar.gz.asc

dev/incubator/geode/1.0.0-incubating.M3.RC7/apache-geode-src-1.0.0-incubating.M3.tar.gz.md5

dev/incubator/geode/1.0.0-incubating.M3.RC7/apache-geode-src-1.0.0-incubating.M3.tar.gz.sha256

dev/incubator/geode/1.0.0-incubating.M3.RC7/apache-geode-src-1.0.0-incubating.M3.zip
   (with props)

dev/incubator/geode/1.0.0-incubating.M3.RC7/apache-geode-src-1.0.0-incubating.M3.zip.asc

dev/incubator/geode/1.0.0-incubating.M3.RC7/apache-geode-src-1.0.0-incubating.M3.zip.md5

dev/incubator/geode/1.0.0-incubating.M3.RC7/apache-geode-src-1.0.0-incubating.M3.zip.sha256

Added: 
dev/incubator/geode/1.0.0-incubating.M3.RC7/apache-geode-1.0.0-incubating.M3.tar.gz
==
Binary file - no diff available.

Propchange: 
dev/incubator/geode/1.0.0-incubating.M3.RC7/apache-geode-1.0.0-incubating.M3.tar.gz
--
svn:mime-type = application/octet-stream

Added: 
dev/incubator/geode/1.0.0-incubating.M3.RC7/apache-geode-1.0.0-incubating.M3.tar.gz.asc
==
--- 
dev/incubator/geode/1.0.0-incubating.M3.RC7/apache-geode-1.0.0-incubating.M3.tar.gz.asc
 (added)
+++ 
dev/incubator/geode/1.0.0-incubating.M3.RC7/apache-geode-1.0.0-incubating.M3.tar.gz.asc
 Tue Aug  2 00:58:29 2016
@@ -0,0 +1,17 @@
+-BEGIN PGP SIGNATURE-
+Version: BCPG v1.51
+
+iQIcBAABAgAGBQJXn+NAAAoJEGoU8Lx6rti7EFAP/RyPxACrohEyPujVtykDseOy
+0go2FTvOCt0u72v0Jc0sLTjklH3WXfx+z/MZYprA+ENNa07qPmvedRCooeZJa9ku
+WLzKKb7YTNycxuBr7m/ANAivgD/GRbd0b+3qxkpRFfNefmiNxaslZVHLfjRYJ9HY
+1/HbVOO+u/PbSoSeMAkzzjc4RdTLe0Jrr8Tfg+bLC1rvS/MD6kMBECgVG+7qadpH
+LOCJJkkQsV4HZq0/yUqunG2nEjymNL+qviFRJO9jdLGTkYe9Pse1aAjaf+E2bmaw
+zd8iqvX9KtlDGrttiVUvNxB06GlblaR+3s2CYg3aS+gvlvLDQ3H7tK66sN6ci7Da
+s2NTM0Xd3zLeZqIuUXME9iKzgb+OE3uAmX74eNZ7AA22EUJmXbCkSUnSeayl+ilf
+oJl1nBFFBDV+aN1HknifvXdUI2Ali8sRuhRqUyj3vSb0hJDf7haBPuoZ2QTZxSP/
+sfTmi5WAa1Am+deVLZZb/Y6ca4rIiPEWztRdztxxfMZtlud5SCgTLHooVT4JFWOY
+ik5iw0DF4e19Gt9rkOVonGwINb2QoTcsjeOsKI1Djhz+pDGNhBCgmuXdSnyewkPG
+v6hJlP4qF+y7xvFMa/nqoXe7pUcp6KQ9tkOVE+tMo1p55RDCgWHS6bU6oN27pcxe
+Q24prg7N8R7kbBjvwc+a
+=acQZ
+-END PGP SIGNATURE-

Added: 
dev/incubator/geode/1.0.0-incubating.M3.RC7/apache-geode-1.0.0-incubating.M3.tar.gz.md5
==
--- 
dev/incubator/geode/1.0.0-incubating.M3.RC7/apache-geode-1.0.0-incubating.M3.tar.gz.md5
 (added)
+++ 
dev/incubator/geode/1.0.0-incubating.M3.RC7/apache-geode-1.0.0-incubating.M3.tar.gz.md5
 Tue Aug  2 00:58:29 2016
@@ -0,0 +1 @@
+7eccee10dd94d05eab3fff3fe3c81128 *apache-geode-1.0.0-incubating.M3.tar.gz

Added: 
dev/incubator/geode/1.0.0-incubating.M3.RC7/apache-geode-1.0.0-incubating.M3.tar.gz.sha256
==
--- 
dev/incubator/geode/1.0.0-incubating.M3.RC7/apache-geode-1.0.0-incubating.M3.tar.gz.sha256
 (added)
+++ 
dev/incubator/geode/1.0.0-incubating.M3.RC7/apache-geode-1.0.0-incubating.M3.tar.gz.sha256
 Tue Aug  2 00:58:29 2016
@@ -0,0 +1 @@
+294f4da36efd5c967c6dce94c719fbdaee4cca3ddcfcea4069bc44288f9b8eb4 
*apache-geode-1.0.0-incubating.M3.tar.gz

Added: 
dev/incubator/geode/1.0.0-incubating.M3.RC7/apache-geode-1.0.0-incubating.M3.zip
==
Binary file - no diff available.

Propchange: 
dev/incubator/geode/1.0.0-incubating.M3.RC7/apache-geode-1.0.0-incubating.M3.zip
--
svn:mime-type = application/octet-stream

Added: 
dev/incubator/geode/1.0.0-incubating.M3.RC7/apache-geode-1.0.0-incubating.M3.zip.asc

incubator-geode git commit: GEODE-1207: Removing FlakyTest tag

2016-08-01 Thread nnag 
Repository: incubator-geode
Updated Branches:
  refs/heads/develop 0620b059e -> cb9c1e799


GEODE-1207: Removing FlakyTest tag

* Fixed in a previous commit for GEODE-1207


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

Branch: refs/heads/develop
Commit: cb9c1e79963eba60eaec2682978d7ba192517add
Parents: 0620b05
Author: nabarun 
Authored: Mon Aug 1 17:06:35 2016 -0700
Committer: nabarun 
Committed: Mon Aug 1 17:06:35 2016 -0700

--
 .../gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java   | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/cb9c1e79/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
--
diff --git 
a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
 
b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
index a175fad..00bfa1a 100644
--- 
a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
+++ 
b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANSSLDUnitTest.java
@@ -41,7 +41,6 @@ public class WANSSLDUnitTest extends WANTestBase{
 super();
   }
 
-  @Category(FlakyTest.class) // GEODE-1207: random ports, eats exceptions, 
time sensitive, waitForCriterion
   @Test
   public void testSenderSSLReceiverSSL(){
 Integer lnPort = (Integer)vm0.invoke(() -> 
WANTestBase.createFirstLocatorWithDSId( 1 ));

incubator-geode git commit: GEODE-933: Refactored test code to stabilize it

2016-08-01 Thread nnag 
Repository: incubator-geode
Updated Branches:
  refs/heads/develop 59e4c447e -> 0620b059e


GEODE-933: Refactored test code to stabilize it

* Made sure the senders are running before the puts are started.
* Correct order of creation of cache, region and senders/receivers.
* Code assumed to be stabilized from refactoring of WANTestBase
* Removing the FlakyTest tag.
* Test assumed to be stable until it fails 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/0620b059
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/0620b059
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/0620b059

Branch: refs/heads/develop
Commit: 0620b059e99c15f0b472523992b0263bac81dbfa
Parents: 59e4c44
Author: nabarun 
Authored: Mon Aug 1 16:10:52 2016 -0700
Committer: nabarun 
Committed: Mon Aug 1 16:15:42 2016 -0700

--
 ...arallelGatewaySenderOperationsDUnitTest.java | 59 +++-
 1 file changed, 44 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/0620b059/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
--
diff --git 
a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
 
b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
index a1036f4..4981c97 100644
--- 
a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
+++ 
b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java
@@ -249,50 +249,79 @@ public class ParallelGatewaySenderOperationsDUnitTest 
extends WANTestBase {
   /**
* Normal scenario in which a sender is stopped and then started again.
*/
-  @Category(FlakyTest.class) // GEODE-933: thread sleeps, random ports, async 
actions, time sensitive
   @Test
   public void testParallelPropagationSenderStartAfterStop() throws Exception {
 IgnoredException.addIgnoredException("Broken pipe");
 Integer[] locatorPorts = createLNAndNYLocators();
 Integer lnPort = locatorPorts[0];
 Integer nyPort = locatorPorts[1];
+String regionName = getTestMethodName() + "_PR";
 
-createSendersReceiversAndPartitionedRegion(lnPort, nyPort, false, true);
+
+createCacheInVMs(nyPort, vm2, vm3);
+createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
+
+vm2.invoke(() -> createPartitionedRegion(regionName, "ln", 1, 100, 
isOffHeap()));
+vm3.invoke(() -> createPartitionedRegion(regionName, "ln", 1, 100, 
isOffHeap()));
+
+createReceiverInVMs(vm2, vm3);
+
+vm4.invoke(() -> createPartitionedRegion(regionName, "ln", 1, 100, 
isOffHeap()));
+vm5.invoke(() -> createPartitionedRegion(regionName, "ln", 1, 100, 
isOffHeap()));
+vm6.invoke(() -> createPartitionedRegion(regionName, "ln", 1, 100, 
isOffHeap()));
+vm7.invoke(() -> createPartitionedRegion(regionName, "ln", 1, 100, 
isOffHeap()));
+
+vm4.invoke(() -> createSender("ln", 2, true, 100, 10, false, false, null, 
true));
+vm5.invoke(() -> createSender("ln", 2, true, 100, 10, false, false, null, 
true));
+vm6.invoke(() -> createSender("ln", 2, true, 100, 10, false, false, null, 
true));
+vm7.invoke(() -> createSender("ln", 2, true, 100, 10, false, false, null, 
true));
+
+startSenderInVMs("ln", vm4, vm5, vm6, vm7);
 
 //make sure all the senders are running before doing any puts
-waitForSendersRunning();
+vm4.invoke(() -> waitForSenderRunningState("ln"));
+vm5.invoke(() -> waitForSenderRunningState("ln"));
+vm6.invoke(() -> waitForSenderRunningState("ln"));
+vm7.invoke(() -> waitForSenderRunningState("ln"));
 
 //FIRST RUN: now, the senders are started. So, do some of the puts
-vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 200 ));
+vm4.invoke(() -> WANTestBase.doPuts( regionName, 200 ));
 
 //now, stop all of the senders
-stopSenders();
-
-Wait.pause(2000);
-
+vm4.invoke(() -> stopSender("ln"));
+vm5.invoke(() -> stopSender("ln"));
+vm6.invoke(() -> stopSender("ln"));
+vm7.invoke(() -> stopSender("ln"));
+
+//Region size on remote site should remain same and below the number of 
puts done in the FIRST RUN
+vm2.invoke(() -> WANTestBase.validateRegionSizeRemainsSame(regionName, 200 
));
+
 //SECOND RUN: do some of the puts after the senders are stopped
-vm4.invoke(() -> WANTestBase.doPuts( getTestMethodName() + "_PR", 1000 ));
+

incubator-geode git commit: fix replace on overflowed entry

2016-08-01 Thread dschneider 
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-1718 [created] d492a5831


fix replace on overflowed entry


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

Branch: refs/heads/feature/GEODE-1718
Commit: d492a58316c6c939eaba73e804bca5d15778cefe
Parents: 59e4c44
Author: Darrel Schneider 
Authored: Mon Aug 1 16:12:38 2016 -0700
Committer: Darrel Schneider 
Committed: Mon Aug 1 16:12:38 2016 -0700

--
 .../internal/cache/AbstractRegionEntry.java |  2 +-
 .../internal/cache/AbstractRegionMap.java   |  2 +-
 .../cache/ReplaceWithOverflowJUnitTest.java | 77 
 3 files changed, 79 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d492a583/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionEntry.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionEntry.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionEntry.java
index 15a5bed..5778a82 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionEntry.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionEntry.java
@@ -1072,7 +1072,7 @@ public abstract class AbstractRegionEntry implements 
RegionEntry,
   obj = cdVal;
 }
   }
-  if (obj.getClass().getName().equals(pdx.getClassName())) {
+  if (obj != null && obj.getClass().getName().equals(pdx.getClassName())) {
 GemFireCacheImpl gfc = GemFireCacheImpl.getForPdx("Could not access 
Pdx registry");
 if (gfc != null) {
   PdxSerializer pdxSerializer;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d492a583/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionMap.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionMap.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionMap.java
index f3cb3d6..87b59cd 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionMap.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/AbstractRegionMap.java
@@ -2811,7 +2811,7 @@ public abstract class AbstractRegionMap implements 
RegionMap {
 if (expectedOldValue != null && !replaceOnClient) {
   ReferenceCountHelper.skipRefCountTracking();
   
-  @Retained @Released Object v = 
re._getValueRetain(event.getLocalRegion(), true);
+  @Retained @Released Object v = 
re.getValueOffHeapOrDiskWithoutFaultIn(event.getLocalRegion());
   
   ReferenceCountHelper.unskipRefCountTracking();
   try {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d492a583/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ReplaceWithOverflowJUnitTest.java
--
diff --git 
a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ReplaceWithOverflowJUnitTest.java
 
b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ReplaceWithOverflowJUnitTest.java
new file mode 100644
index 000..b796d6d
--- /dev/null
+++ 
b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/ReplaceWithOverflowJUnitTest.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.internal.cache;
+
+import java.util.Properties;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+import static org.junit.Assert.assertEquals;
+
+import

incubator-geode git commit: GEODE-11: Changing test to check if the bug is fixed.

2016-08-01 Thread zhouxj 
Repository: incubator-geode
Updated Branches:
  refs/heads/develop 2cab2ee70 -> 59e4c447e


GEODE-11: Changing test to check if the bug is fixed.

Signed-off-by: Gester Zhou 

This closes #222


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

Branch: refs/heads/develop
Commit: 59e4c447e6e645d3ea3ce3093e33a6d8774b1cc3
Parents: 2cab2ee
Author: Aparna Dharmakkan 
Authored: Mon Aug 1 15:48:16 2016 -0700
Committer: zhouxh 
Committed: Mon Aug 1 16:00:01 2016 -0700

--
 .../LuceneIndexCreationIntegrationTest.java | 28 +---
 1 file changed, 18 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/59e4c447/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationIntegrationTest.java
--
diff --git 
a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationIntegrationTest.java
 
b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationIntegrationTest.java
index dd9fd57..fc1f84f 100644
--- 
a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationIntegrationTest.java
+++ 
b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationIntegrationTest.java
@@ -166,20 +166,28 @@ public class LuceneIndexCreationIntegrationTest extends 
LuceneIntegrationTest {
 
   @Test
   public void cannotCreateLuceneIndexForReplicateRegion() throws IOException, 
ParseException {
-expectedException.expect(UnsupportedOperationException.class);
-expectedException.expectMessage("Lucene indexes on replicated regions are 
not supported");
-createIndex("field1", "field2", "field3");
-
this.cache.createRegionFactory(RegionShortcut.REPLICATE).create(REGION_NAME);
+try {
+  createIndex("field1", "field2", "field3");
+  
this.cache.createRegionFactory(RegionShortcut.REPLICATE).create(REGION_NAME);
+  fail("Should not have been able to create index");
+} catch (UnsupportedOperationException e) {
+  assertEquals("Lucene indexes on replicated regions are not supported", 
e.getMessage());
+  assertNull(cache.getRegion(REGION_NAME));
+}
   }
 
   @Test
   public void cannotCreateLuceneIndexForRegionWithEviction() throws 
IOException, ParseException {
-expectedException.expect(UnsupportedOperationException.class);
-expectedException.expectMessage("Lucene indexes on regions with eviction 
and action local destroy are not supported");
-createIndex("field1", "field2", "field3");
-RegionFactory regionFactory = 
this.cache.createRegionFactory(RegionShortcut.PARTITION);
-
regionFactory.setEvictionAttributes(EvictionAttributes.createLIFOEntryAttributes(100,
 EvictionAction.LOCAL_DESTROY));
-regionFactory.create(REGION_NAME);
+try {
+  createIndex("field1", "field2", "field3");
+  RegionFactory regionFactory = 
this.cache.createRegionFactory(RegionShortcut.PARTITION);
+  regionFactory.setEvictionAttributes(
+EvictionAttributes.createLIFOEntryAttributes(100, 
EvictionAction.LOCAL_DESTROY));
+  regionFactory.create(REGION_NAME);
+} catch (UnsupportedOperationException e) {
+  assertEquals("Lucene indexes on regions with eviction and action local 
destroy are not supported", e.getMessage());
+  assertNull(cache.getRegion(REGION_NAME));
+}
   }
 
   @Test

incubator-geode git commit: GEODE-11: Fixing creation of replicated region after index creation.

2016-08-01 Thread zhouxj 
Repository: incubator-geode
Updated Branches:
  refs/heads/develop b9387fb57 -> 2cab2ee70


GEODE-11: Fixing creation of replicated region after index creation.

If a replicated region is created after a lucene index is defined, an error is 
thrown but the region is created (since this check is done in the afterCreate 
method). This was fixed by moving the check to the beforeCreate method of the 
region listener.

Signed-off-by: Gester Zhou 


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

Branch: refs/heads/develop
Commit: 2cab2ee70c5fd05c76b8806a4e6033e3277d6664
Parents: b9387fb
Author: Aparna Dharmakkan 
Authored: Mon Aug 1 14:54:39 2016 -0700
Committer: zhouxh 
Committed: Mon Aug 1 15:18:41 2016 -0700

--
 .../lucene/internal/LuceneServiceImpl.java  | 36 +---
 1 file changed, 16 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2cab2ee7/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
--
diff --git 
a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
 
b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
index 5cce2f8..b0da08d 100644
--- 
a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
+++ 
b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
@@ -153,7 +153,22 @@ public class LuceneServiceImpl implements 
InternalLuceneService {
   RegionAttributes attrs, InternalRegionArguments internalRegionArgs) {
 RegionAttributes updatedRA = attrs;
 String path = parent == null ? "/" + regionName : parent.getFullPath() 
+ "/" + regionName;
+
 if(path.equals(dataRegionPath)) {
+
+  if (!attrs.getDataPolicy().withPartitioning()) {
+// replicated region
+throw new UnsupportedOperationException("Lucene indexes on 
replicated regions are not supported");
+  }
+
+  //For now we cannot support eviction with local destroy.
+  //Eviction with overflow to disk still needs to be supported
+  EvictionAttributes evictionAttributes = 
attrs.getEvictionAttributes();
+  EvictionAlgorithm evictionAlgorithm = 
evictionAttributes.getAlgorithm();
+  if (evictionAlgorithm != EvictionAlgorithm.NONE && 
evictionAttributes.getAction().isLocalDestroy()) {
+throw new UnsupportedOperationException("Lucene indexes on regions 
with eviction and action local destroy are not supported");
+  }
+
   String aeqId = LuceneServiceImpl.getUniqueIndexName(indexName, 
dataRegionPath);
   if (!attrs.getAsyncEventQueueIds().contains(aeqId)) {
 AttributesFactory af = new AttributesFactory(attrs);
@@ -175,7 +190,6 @@ public class LuceneServiceImpl implements 
InternalLuceneService {
 }
   }
 });
-
   }
 
 
@@ -202,26 +216,8 @@ public class LuceneServiceImpl implements 
InternalLuceneService {
   return null;
 }
 //Convert the region name into a canonical form
-
 regionPath = dataregion.getFullPath();
-LuceneIndexImpl index = null;
-
-//For now we cannot support eviction with local destroy.
-//Eviction with overflow to disk still needs to be supported
-EvictionAttributes evictionAttributes = 
dataregion.getAttributes().getEvictionAttributes();
-EvictionAlgorithm evictionAlgorithm = evictionAttributes.getAlgorithm();
-if (evictionAlgorithm != EvictionAlgorithm.NONE && 
evictionAttributes.getAction().isLocalDestroy()) {
-  throw new UnsupportedOperationException("Lucene indexes on regions with 
eviction and action local destroy are not supported");
-}
-
-if (dataregion instanceof PartitionedRegion) {
-  // partitioned region
-  index = new LuceneIndexForPartitionedRegion(indexName, regionPath, 
cache);
-} else {
-  // replicated region
-  throw new UnsupportedOperationException("Lucene indexes on replicated 
regions are not supported");
-}
-return index;
+return new LuceneIndexForPartitionedRegion(indexName, regionPath, cache);
   }
 
   private void registerDefinedIndex(final String regionAndIndex, final 
LuceneIndexCreationProfile luceneIndexCreationProfile) {

incubator-geode git commit: GEODE-1147: Remove FlakyTest Tag

2016-08-01 Thread nnag 
Repository: incubator-geode
Updated Branches:
  refs/heads/develop 80ac9956e -> b9387fb57


GEODE-1147: Remove FlakyTest Tag

* Refactored the test in correct order of creation of cache, region and 
sender/receiver.
* The WANTestBase.preTearDown was refactored in GEODE-1588
* FlakyTest tag removed till failure is noticed 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/b9387fb5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/b9387fb5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/b9387fb5

Branch: refs/heads/develop
Commit: b9387fb573d3d2a15964f6435fd9247ee56cd856
Parents: 80ac995
Author: nabarun 
Authored: Mon Aug 1 14:18:28 2016 -0700
Committer: nabarun 
Committed: Mon Aug 1 14:18:28 2016 -0700

--
 ...NPropogation_PartitionedRegionDUnitTest.java | 33 +++-
 1 file changed, 18 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b9387fb5/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java
--
diff --git 
a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java
 
b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java
index be8c353..c51c992 100644
--- 
a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java
+++ 
b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogation_PartitionedRegionDUnitTest.java
@@ -368,7 +368,6 @@ public class 
SerialWANPropogation_PartitionedRegionDUnitTest extends WANTestBase
 getTestMethodName() + "_PR", 1000 ));
   }
 
-  @Category(FlakyTest.class) // GEODE-1147: random ports, time sensitive, 
waitForCriterion, eats exceptions
   @Test
   public void testPartitionedSerialPropagationWithParallelThreads() throws 
Exception {
 
@@ -378,32 +377,36 @@ public class 
SerialWANPropogation_PartitionedRegionDUnitTest extends WANTestBase
 createCacheInVMs(nyPort, vm2, vm3);
 createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
 
-vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
-false, 100, 10, false, false, null, true ));
-vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
-false, 100, 10, false, false, null, true ));
-
 vm4.invoke(() -> WANTestBase.createPartitionedRegion(
-getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() ));
+  getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() ));
 vm5.invoke(() -> WANTestBase.createPartitionedRegion(
-getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() ));
+  getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() ));
 vm6.invoke(() -> WANTestBase.createPartitionedRegion(
-getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() ));
+  getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() ));
 vm7.invoke(() -> WANTestBase.createPartitionedRegion(
-getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() ));
-
-startSenderInVMs("ln", vm4, vm5);
-
+  getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() ));
 vm2.invoke(() -> WANTestBase.createPartitionedRegion(
-getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+  getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
 vm3.invoke(() -> WANTestBase.createPartitionedRegion(
-getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+  getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
+
 createReceiverInVMs(vm2, vm3);
 
+vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
+false, 100, 10, false, false, null, true ));
+vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
+false, 100, 10, false, false, null, true ));
+
+startSenderInVMs("ln", vm4, vm5);
+
+
+
 vm4.invoke(() -> WANTestBase.doMultiThreadedPuts( // TODO: eats exceptions
 getTestMethodName() + "_PR", 1000 ));
 
 vm2.invoke(() -> WANTestBase.validateRegionSize(
 getTestMethodName() + "_PR", 1000 ));
+vm3.invoke(() -> WANTestBase.validateRegionSize(
+  getTestMethodName() + "_PR", 1000 ));
   }
 }

incubator-geode git commit: GEODE-1148: Refactored the test case

2016-08-01 Thread nnag 
Repository: incubator-geode
Updated Branches:
  refs/heads/develop d9bec3178 -> 80ac9956e


GEODE-1148: Refactored the test case

* Fixed the order of creation of cache, region, and receivers/senders
* StopAckThread function was fixed as a part of GEODE-1588
* WANTestBase.preTearDown has been running for a lot of other tests 
without failures.
* Removing the flaky tag till failures reoccur.
* Pause was replaced with validate receiver region sizes to make sure 
no send operation was running when the test was shutdown.


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

Branch: refs/heads/develop
Commit: 80ac9956e77b8a4e096f489ee36ce5a707ac8195
Parents: d9bec31
Author: nabarun 
Authored: Mon Aug 1 13:47:33 2016 -0700
Committer: nabarun 
Committed: Mon Aug 1 14:13:37 2016 -0700

--
 .../SerialWANPropagationLoopBackDUnitTest.java  | 53 ++--
 1 file changed, 27 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/80ac9956/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
--
diff --git 
a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
 
b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
index c715cb8..4b53626 100644
--- 
a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
+++ 
b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropagationLoopBackDUnitTest.java
@@ -133,8 +133,7 @@ public class SerialWANPropagationLoopBackDUnitTest extends 
WANTestBase {
 assertEquals(1, createList1.size());
 assertEquals(1, createList2.size());
   }
-  
-  @Category(FlakyTest.class) // GEODE-1148: random ports, eats exceptions 
(fixed 1), time sensitive, thread sleeps, waitForCriterion
+
   @Test
   public void testReplicatedSerialPropagationLoopBack3SitesLoop() throws 
Exception {
 Integer lnPort = (Integer)vm0.invoke(() -> 
WANTestBase.createFirstLocatorWithDSId( 1 ));
@@ -145,12 +144,22 @@ public class SerialWANPropagationLoopBackDUnitTest 
extends WANTestBase {
 createCacheInVMs(nyPort, vm4, vm7);
 createCacheInVMs(tkPort, vm5);
 
+vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+  getTestMethodName() + "_RR", "ln", isOffHeap()));
+vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+  getTestMethodName() + "_RR", "ny", isOffHeap()));
+vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+  getTestMethodName() + "_RR", "tk", isOffHeap()));
+
+vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+  getTestMethodName() + "_RR", "ln", isOffHeap() ));
+vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+  getTestMethodName() + "_RR", "ny", isOffHeap() ));
+
 vm3.invoke(() -> WANTestBase.createReceiver());
 vm4.invoke(() -> WANTestBase.createReceiver());
 vm5.invoke(() -> WANTestBase.createReceiver());
 
-// using vm5 for sender in ds 3. cache is already created.
-
 vm6.invoke(() -> WANTestBase.createSender( "ln", 2,
 false, 100, 10, false, false, null, true ));
 vm7.invoke(() -> WANTestBase.createSender( "ny", 3,
@@ -158,48 +167,37 @@ public class SerialWANPropagationLoopBackDUnitTest 
extends WANTestBase {
 vm5.invoke(() -> WANTestBase.createSender( "tk", 1,
   false, 100, 10, false, false, null, true ));
 
-
-vm3.invoke(() -> WANTestBase.createReplicatedRegion(
-getTestMethodName() + "_RR", "ln", isOffHeap()));
-vm4.invoke(() -> WANTestBase.createReplicatedRegion(
-getTestMethodName() + "_RR", "ny", isOffHeap()));
-vm5.invoke(() -> WANTestBase.createReplicatedRegion(
-getTestMethodName() + "_RR", "tk", isOffHeap()));
-
 vm6.invoke(() -> WANTestBase.startSender( "ln" ));
 vm7.invoke(() -> WANTestBase.startSender( "ny" ));
 vm5.invoke(() -> WANTestBase.startSender( "tk" ));
-
+
+// using vm5 for sender in ds 3. cache is already created.
 vm6.invoke(() -> WANTestBase.addQueueListener( "ln",
   false ));
 vm7.invoke(() -> WANTestBase.addQueueListener( "ny",
   false ));
 vm5.invoke(() -> WANTestBase.addQueueListener( "tk",
   false ));
-  
-
-vm6.invoke(() -> WANTestBase.createReplicatedRegion(
-getTestMethodName() + "_RR", "ln", isOffHeap() ));
-

incubator-geode git commit: GEODE-1643: make sure the security manager works on Gateway communication

2016-08-01 Thread jinmeiliao 
Repository: incubator-geode
Updated Branches:
  refs/heads/develop f6fb4e36f -> d9bec3178


GEODE-1643: make sure the security manager works on Gateway communication


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

Branch: refs/heads/develop
Commit: d9bec3178bf67117c0e240fe67a2b0f22759027b
Parents: f6fb4e3
Author: Jinmei Liao 
Authored: Mon Aug 1 12:03:07 2016 -0700
Committer: Jinmei Liao 
Committed: Mon Aug 1 12:14:46 2016 -0700

--
 .../cache/tier/sockets/ServerConnection.java|   2 +-
 .../wan/misc/NewWanAuthenticationDUnitTest.java | 164 ++-
 2 files changed, 163 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d9bec317/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java
index 682e55b..bdbef09 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/ServerConnection.java
@@ -772,7 +772,7 @@ public class ServerConnection implements Runnable {
 }
 
 // if a subject exists for this uniqueId, binds the subject to this 
thread so that we can do authorization later
-if(AcceptorImpl.isIntegratedSecurity() && !isInternalMessage()) {
+if(AcceptorImpl.isIntegratedSecurity() && !isInternalMessage() && 
this.communicationMode != Acceptor.GATEWAY_TO_GATEWAY) {
   long uniqueId = getUniqueId();
   Subject subject = this.clientUserAuths.getSubject(uniqueId);
   if(subject!=null) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d9bec317/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
--
diff --git 
a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
 
b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
index 338f253..76940ea 100644
--- 
a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
+++ 
b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWanAuthenticationDUnitTest.java
@@ -20,12 +20,16 @@ import static 
com.gemstone.gemfire.distributed.ConfigurationProperties.*;
 import static com.gemstone.gemfire.test.dunit.Assert.*;
 
 import java.util.Properties;
+import java.util.concurrent.TimeUnit;
 
+import com.jayway.awaitility.Awaitility;
+import org.apache.geode.security.templates.SampleSecurityManager;
 import org.apache.logging.log4j.Logger;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.distributed.DistributedMember;
 import com.gemstone.gemfire.distributed.DistributedSystem;
 import com.gemstone.gemfire.internal.Assert;
@@ -72,7 +76,8 @@ public class NewWanAuthenticationDUnitTest extends 
WANTestBase {
 }
 Properties javaProps1 = gen.getJavaProperties();
 
-Properties credentials2 = gen.getValidCredentials(2);
+// vm3's invalid credentials
+Properties credentials2 = gen.getInvalidCredentials(1);
 if (extraProps != null) {
   credentials2.putAll(extraProps);
 }
@@ -80,6 +85,8 @@ public class NewWanAuthenticationDUnitTest extends 
WANTestBase {
 
 Properties props1 = buildProperties(clientauthenticator, clientauthInit,
   null, credentials1, null);
+
+// have vm 3 start a cache with invalid credentails
 Properties props2 = buildProperties(clientauthenticator, clientauthInit,
   null, credentials2, null);
 
@@ -105,8 +112,61 @@ public class NewWanAuthenticationDUnitTest extends 
WANTestBase {
   getTestMethodName() + "_RR", null, isOffHeap()  ));
 logger.info("Created RR in vm3");
 
+// this tests verifies that even though vm3 has invalid credentials, vm2 
can still send data to vm3 because
+// vm2 has valid credentials
+vm2.invoke(() -> WANTestBase.startSender( "ln" ));
+vm2.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));
+
+vm2.invoke(() ->

incubator-geode git commit: GEODE-64: Fix source header

2016-08-01 Thread abaker 
Repository: incubator-geode
Updated Branches:
  refs/heads/develop 931a4fa3d -> f6fb4e36f


GEODE-64: Fix source 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/f6fb4e36
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/f6fb4e36
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/f6fb4e36

Branch: refs/heads/develop
Commit: f6fb4e36f8a8f13b1a1330f50a4b2f0a2efd590d
Parents: 931a4fa
Author: Anthony Baker 
Authored: Mon Aug 1 11:22:05 2016 -0700
Committer: Anthony Baker 
Committed: Mon Aug 1 11:22:05 2016 -0700

--
 gradle/sonar.gradle | 30 --
 1 file changed, 16 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f6fb4e36/gradle/sonar.gradle
--
diff --git a/gradle/sonar.gradle b/gradle/sonar.gradle
index cedf661..33140d3 100644
--- a/gradle/sonar.gradle
+++ b/gradle/sonar.gradle
@@ -1,17 +1,19 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+/*
+ * 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: 'org.sonarqube'

[2/2] incubator-geode git commit: GEODE-64: Add Apache License Header to Sonar Gradle Config

2016-08-01 Thread mbretl 
GEODE-64: Add Apache License Header to Sonar Gradle 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/931a4fa3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/931a4fa3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/931a4fa3

Branch: refs/heads/develop
Commit: 931a4fa3d469a03a627b7f25d29cb29093f2ef14
Parents: 3bedb5b
Author: Mark Bretl 
Authored: Mon Aug 1 10:43:33 2016 -0700
Committer: Mark Bretl 
Committed: Mon Aug 1 10:49:51 2016 -0700

--
 gradle/sonar.gradle | 15 +++
 1 file changed, 15 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/931a4fa3/gradle/sonar.gradle
--
diff --git a/gradle/sonar.gradle b/gradle/sonar.gradle
index 5f9dac1..cedf661 100644
--- a/gradle/sonar.gradle
+++ b/gradle/sonar.gradle
@@ -1,3 +1,18 @@
+# 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: 'org.sonarqube'
 
 sonarqube {

[1/2] incubator-geode git commit: GEODE-64: Add SonarQube Plugin And Initial Configuration

2016-08-01 Thread mbretl 
Repository: incubator-geode
Updated Branches:
  refs/heads/develop 237035720 -> 931a4fa3d


GEODE-64: Add SonarQube Plugin And Initial Configuration

Adding SonarQube plugin with basic configuration and can be integrated with
the SonarQube Scanner. Configuration was tested on a local installation to
verify scan completes, however, it will need to change once on Apache
infrastructure


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

Branch: refs/heads/develop
Commit: 3bedb5b68deb5645e62dd9bf178a32125e8137fb
Parents: 2370357
Author: Mark Bretl 
Authored: Wed Jul 27 10:57:50 2016 -0700
Committer: Mark Bretl 
Committed: Mon Aug 1 10:49:19 2016 -0700

--
 build.gradle|  3 +++
 gradle/sonar.gradle | 44 
 2 files changed, 47 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bedb5b6/build.gradle
--
diff --git a/build.gradle b/build.gradle
index 9a3ff10..eac68d0 100755
--- a/build.gradle
+++ b/build.gradle
@@ -24,6 +24,7 @@ buildscript {
 classpath "gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.2.0"
 classpath "org.ajoberstar:gradle-git:1.3.2"
 classpath 'com.bmuschko:gradle-nexus-plugin:2.3.1'
+classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.0.1'
   }
 }
 
@@ -39,6 +40,7 @@ dependencyVersions.load(new 
FileInputStream("${project.projectDir}/gradle/depend
 dependencyVersions.keys().each{ k -> project.ext[k] = dependencyVersions[k]}
 
 allprojects {
+
   version = versionNumber + releaseType
   ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
 
@@ -77,6 +79,7 @@ apply from: "${scriptDir}/dependency-resolution.gradle"
 apply from: "${scriptDir}/test.gradle"
 apply from: "${scriptDir}/publish.gradle"
 apply from: "${scriptDir}/code-analysis.gradle"
+apply from: "${scriptDir}/sonar.gradle"
 apply from: "${scriptDir}/ide.gradle"
 apply from: "${scriptDir}/rat.gradle"
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3bedb5b6/gradle/sonar.gradle
--
diff --git a/gradle/sonar.gradle b/gradle/sonar.gradle
new file mode 100644
index 000..5f9dac1
--- /dev/null
+++ b/gradle/sonar.gradle
@@ -0,0 +1,44 @@
+apply plugin: 'org.sonarqube'
+
+sonarqube {
+  properties {
+property "sonar.host.url", "https://analysis.apache.org;
+property "sonar.projectKey", "org.apache:geode"
+property "sonar.sourceEncoding", "UTF-8"
+property "sonar.jdbc.driverClassName", "com.mysql.jdbc.Driver"
+property "sonar.scm.provider", "git"
+property "sonar.projectName", "Apache Geode"
+property "sonar.projectVersion", version
+property "sonar.projectDescription", "Apache Geode (incubating)"
+  }
+}
+
+project("extensions/geode-modules") {
+  sonarqube {
+skipProject = true
+  }
+}
+
+project("extensions/geode-modules-assembly") {
+  sonarqube {
+skipProject = true
+  }
+}
+
+project("extensions/geode-modules-hibernate") {
+  sonarqube {
+skipProject = true
+  }
+}
+
+project("extensions/geode-modules-session") {
+  sonarqube {
+skipProject = true
+  }
+}
+
+project("extensions/geode-modules-tomcat7") {
+  sonarqube {
+skipProject = true
+  }
+}

incubator-geode git commit: GEODE-1011: Rearranged the order of creating test elements

2016-08-01 Thread nnag 
Repository: incubator-geode
Updated Branches:
  refs/heads/develop 983010e4a -> 237035720


GEODE-1011: Rearranged the order of creating test elements

* Caches are created first, followed by region and sender/receiver
* Removed the pauses, as they are not necessary. Awaitility handles the 
waiting
* Issue assumed to be resolved after WAN refactoring
* Flaky tag removed


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

Branch: refs/heads/develop
Commit: 237035720189d0ca72d63848460e2e77a9a2c3d0
Parents: 983010e
Author: nabarun 
Authored: Fri Jul 29 14:12:10 2016 -0700
Committer: nabarun 
Committed: Mon Aug 1 10:09:41 2016 -0700

--
 ...allelGatewaySenderOperation_1_DUnitTest.java | 48 ++--
 1 file changed, 25 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/23703572/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
--
diff --git 
a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
 
b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
index 4645488..ab1c06b 100644
--- 
a/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
+++ 
b/geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java
@@ -597,26 +597,14 @@ public class 
ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes
* Normal scenario in which a sender is stopped and then started again on 
accessor node.
* @throws Exception
*/
-  @Category(FlakyTest.class) // GEODE-1011: random ports, time sensitive, 
waitForCriterion, 5 minute timeouts, 5 second thread sleeps, async actions
   @Test
   public void testParallelPropagationSenderStartAfterStopOnAccessorNode() 
throws Throwable {
 Integer lnPort = (Integer)vm0.invoke(() -> 
WANTestBase.createFirstLocatorWithDSId( 1 ));
 Integer nyPort = (Integer)vm1.invoke(() -> 
WANTestBase.createFirstRemoteLocator( 2, lnPort ));
 
 createCacheInVMs(nyPort, vm2, vm3);
-createReceiverInVMs(vm2, vm3);
-
 createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
 
-vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
-true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY ));
-vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
-true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY ));
-vm6.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
-true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY ));
-vm7.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
-true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY ));
-
 vm4.invoke(() -> WANTestBase.createPartitionedRegion(
 getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() ));
 vm5.invoke(() -> WANTestBase.createPartitionedRegion(
@@ -626,6 +614,15 @@ public class 
ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes
 vm7.invoke(() -> WANTestBase.createPartitionedRegionAsAccessor(
 getTestMethodName() + "_PR", "ln", 1, 100));
 
+vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+  true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY ));
+vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+  true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY ));
+vm6.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+  true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY ));
+vm7.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
+  true, 100, 10, false, false, null, true, 4, OrderPolicy.KEY ));
+
 startSenderInVMs("ln", vm4, vm5, vm6, vm7);
 
 vm2.invoke(() -> WANTestBase.createPartitionedRegion(
@@ -633,6 +630,9 @@ public class 
ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes
 vm3.invoke(() -> WANTestBase.createPartitionedRegion(
 getTestMethodName() + "_PR", null, 1, 100, isOffHeap() ));
 
+
+createReceiverInVMs(vm2, vm3);
+
 //make sure all the senders are not running on accessor nodes and running 
on non-accessor nodes
 vm4.invoke(() -> WANTestBase.waitForSenderRunningState( "ln" ));

incubator-geode git commit: GEODE-1671: It's a test issue. The accessor is a datastore. So it should be pauseSender too.

2016-08-01 Thread zhouxj 
Repository: incubator-geode
Updated Branches:
  refs/heads/develop 90e00bf97 -> 983010e4a


GEODE-1671: It's a test issue. The accessor is a datastore. So it should be
pauseSender too.


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

Branch: refs/heads/develop
Commit: 983010e4a1768c33ff24ac595421240903cdf489
Parents: 90e00bf
Author: zhouxh 
Authored: Mon Aug 1 09:05:05 2016 -0700
Committer: zhouxh 
Committed: Mon Aug 1 09:07:06 2016 -0700

--
 .../cache/lucene/LuceneQueriesPeerPRRedundancyDUnitTest.java   | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/983010e4/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesPeerPRRedundancyDUnitTest.java
--
diff --git 
a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesPeerPRRedundancyDUnitTest.java
 
b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesPeerPRRedundancyDUnitTest.java
index dc86a7c..d509cb2 100644
--- 
a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesPeerPRRedundancyDUnitTest.java
+++ 
b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesPeerPRRedundancyDUnitTest.java
@@ -100,11 +100,13 @@ public class LuceneQueriesPeerPRRedundancyDUnitTest 
extends LuceneQueriesPRBase
 accessor.invoke(() -> initAccessor(createIndex));
 dataStore1.invoke(() -> LuceneTestUtilities.pauseSender(getCache()));
 dataStore2.invoke(() -> LuceneTestUtilities.pauseSender(getCache()));
+accessor.invoke(() -> LuceneTestUtilities.pauseSender(getCache()));
 
 putEntryInEachBucket();
 
 dataStore1.invoke(() -> LuceneTestUtilities.resumeSender(getCache()));
 dataStore2.invoke(() -> LuceneTestUtilities.resumeSender(getCache()));
+accessor.invoke(() -> LuceneTestUtilities.resumeSender(getCache()));
 
 assertTrue(waitForFlushBeforeExecuteTextSearch(dataStore2, 6));

incubator-geode git commit: GEODE-420: add multi-key keystores

2016-08-01 Thread udo 
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-420 a5835b7a3 -> 7ecc66389


GEODE-420: add multi-key keystores


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

Branch: refs/heads/feature/GEODE-420
Commit: 7ecc6638931753ad6903298d50d3fc2c39fd1fc2
Parents: a5835b7
Author: Udo Kohlmeyer 
Authored: Mon Aug 1 09:02:31 2016 -0700
Committer: Udo Kohlmeyer 
Committed: Mon Aug 1 09:02:31 2016 -0700

--
 .../distributed/ConfigurationProperties.java|   1 +
 .../internal/net/SSLEnabledComponent.java   |   5 +
 .../management/internal/ManagementAgent.java|  36 +-
 .../CacheServerSSLConnectionDUnitTest.java  | 151 
 .../gemfire/management/JMXMBeanDUnitTest.java   | 344 +++
 5 files changed, 455 insertions(+), 82 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7ecc6638/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java
index 944e772..d356d20 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java
@@ -1335,6 +1335,7 @@ public interface ConfigurationProperties {
* Since: GemFire 8.0
* @deprecated Since Geode 1.0 use {@link #CLUSTER_SSL_ENABLED} with 
optional {@link #SERVER_SSL_ALIAS}
*/
+  @Deprecated
   String SERVER_SSL_ENABLED = "server-ssl-enabled";
   /**
* The static String definition of the "server-ssl-keystore" property

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7ecc6638/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SSLEnabledComponent.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SSLEnabledComponent.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SSLEnabledComponent.java
index b479372..27ed629 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SSLEnabledComponent.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/internal/net/SSLEnabledComponent.java
@@ -50,4 +50,9 @@ public enum SSLEnabledComponent {
   public String getConstant() {
 return constant;
   }
+
+  @Override
+  public String toString() {
+return getConstant();
+  }
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7ecc6638/geode-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementAgent.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementAgent.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementAgent.java
index c65d4fa..7ed5cc2 100755
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementAgent.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/ManagementAgent.java
@@ -24,6 +24,7 @@ import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.UnknownHostException;
 import java.rmi.AlreadyBoundException;
+import java.rmi.Remote;
 import java.rmi.registry.LocateRegistry;
 import java.rmi.registry.Registry;
 import java.rmi.server.RMIClientSocketFactory;
@@ -31,7 +32,6 @@ import java.rmi.server.RMIServerSocketFactory;
 import java.rmi.server.UnicastRemoteObject;
 import java.util.HashMap;
 import java.util.Set;
-
 import javax.management.InstanceAlreadyExistsException;
 import javax.management.MBeanRegistrationException;
 import javax.management.MBeanServer;
@@ -53,7 +53,6 @@ import com.gemstone.gemfire.GemFireConfigException;
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.distributed.internal.DistributionManager;
-import com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.internal.GemFireVersion;
 import com.gemstone.gemfire.internal.cache.GemFireCacheImpl;
 import com.gemstone.gemfire.internal.lang.StringUtils;
@@ -93,7 +92,7 @@ public class ManagementAgent {
*/
   private boolean running = false;
   private Registry registry;
-  private JMXConnectorServer cs;
+  private JMXConnectorServer jmxConnectorServer;

incubator-geode git commit: GEODE-1569: post process for serialized domain objects

2016-08-01 Thread jinmeiliao 
Repository: incubator-geode
Updated Branches:
  refs/heads/develop c7530d06b -> 90e00bf97


GEODE-1569: post process for serialized domain objects

* for client/server retreival, post process the value before it was put into 
the message
* for gfsh commands, post process the value before it was put into the command 
result json


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

Branch: refs/heads/develop
Commit: 90e00bf97d4287f5462cf73eab2b5810c69c7077
Parents: c7530d0
Author: Jinmei Liao 
Authored: Thu Jul 28 09:11:56 2016 -0700
Committer: Jinmei Liao 
Committed: Mon Aug 1 08:15:45 2016 -0700

--
 .../cache/tier/sockets/BaseCommandQuery.java| 123 +++
 .../cache/tier/sockets/CacheClientProxy.java|  17 +-
 .../cache/tier/sockets/command/Get70.java   |   2 +-
 .../cache/tier/sockets/command/GetAll.java  |   2 +-
 .../cache/tier/sockets/command/GetAll651.java   |   2 +-
 .../cache/tier/sockets/command/GetAll70.java|   2 +-
 .../internal/security/GeodeSecurityUtil.java|  40 ++-
 .../internal/cli/commands/DataCommands.java |   3 -
 .../cli/functions/DataCommandFunction.java  |  27 +-
 .../internal/cli/json/GfJsonObject.java |  16 +
 ...ractIntegratedClientAuthDistributedTest.java |  39 ++-
 ...ntegratedSecurityPostProcessorDUnitTest.java |  12 +-
 .../ClientQueryAuthDistributedTest.java | 122 +++
 ...ntegratedClientQueryAuthDistributedTest.java | 122 ---
 .../security/PDXPostProcessorDUnitTest.java | 323 +++
 .../src/main/java/org/json/JSONObject.java  |   7 +-
 16 files changed, 600 insertions(+), 259 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/90e00bf9/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/BaseCommandQuery.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/BaseCommandQuery.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/BaseCommandQuery.java
index 0e32fb8..f788d02 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/BaseCommandQuery.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/tier/sockets/BaseCommandQuery.java
@@ -157,39 +157,14 @@ public abstract class BaseCommandQuery extends 
BaseCommand {
   if (result instanceof SelectResults) {
 SelectResults selectResults = (SelectResults)result;
 
-// post process, iterate through the result for post processing
-if(GeodeSecurityUtil.needPostProcess()) {
-  List list = selectResults.asList();
-  for (Iterator valItr = list.iterator(); valItr.hasNext(); ) {
-Object value = valItr.next();
-if (value == null)
-  continue;
-
-if (value instanceof CqEntry) {
-  CqEntry cqEntry = (CqEntry) value;
-  Object cqNewValue = GeodeSecurityUtil.postProcess(null, 
cqEntry.getKey(), cqEntry.getValue());
-  if (!cqEntry.getValue().equals(cqNewValue)) {
-selectResults.remove(value);
-selectResults.add(new CqEntry(cqEntry.getKey(), cqNewValue));
-  }
-} else {
-  Object newValue = GeodeSecurityUtil.postProcess(null, null, 
value);
-  if (!value.equals(newValue)) {
-selectResults.remove(value);
-selectResults.add(newValue);
-  }
-}
-  }
-}
-
 if (logger.isDebugEnabled()) {
   logger.debug("Query Result size for : {} is {}", 
query.getQueryString(), selectResults.size());
 }
-
+
 CollectionType collectionType = null;
 boolean sendCqResultsWithKey = true;
 boolean isStructs = false;
- 
+
 // check if resultset has serialized objects, so that they could be 
sent
 // as ObjectPartList
 boolean hasSerializedObjects = ((DefaultQuery) query)
@@ -201,7 +176,7 @@ public abstract class BaseCommandQuery extends BaseCommand {
 // The results in a StructSet are stored in Object[]s
 // Get them as Object[]s for the objs[] in order to avoid duplicating
 // the StructTypes
-
+
 // Object[] objs = new Object[selectResults.size()];
 // Get the collection type (which includes the element type)
 // (used to generate the appropriate instance on the client)
@@ -215,15 +190,15 @@ public abstract class BaseCommandQuery

incubator-geode git commit: GEODE-1666: Update minimumGradleVersion to 2.14

2016-08-01 Thread jensdeppe 
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-1666-2 32f2fb413 -> f3b80d60d


GEODE-1666: Update minimumGradleVersion to 2.14


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

Branch: refs/heads/feature/GEODE-1666-2
Commit: f3b80d60df4fa83f46b6d5adfe092f136618d389
Parents: 32f2fb4
Author: Jens Deppe 
Authored: Mon Aug 1 07:09:41 2016 -0700
Committer: Jens Deppe 
Committed: Mon Aug 1 07:09:49 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f3b80d60/gradle.properties
--
diff --git a/gradle.properties b/gradle.properties
index 4d1cce9..fc5fa60 100755
--- a/gradle.properties
+++ b/gradle.properties
@@ -31,7 +31,7 @@ productOrg = Apache Software Foundation (ASF)
 org.gradle.daemon = true
 org.gradle.jvmargs = -Xmx2048m
 
-minimumGradleVersion = 2.12
+minimumGradleVersion = 2.14
 # Set this on the command line with -P or in ~/.gradle/gradle.properties
 # to change the buildDir location.  Use an absolute path.
 buildRoot=