[incubator-geode] Git Push Summary

2016-10-17 Thread klund 
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-288 [created] 5c50954d1

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

2016-10-17 Thread klund 
GEODE-2011: add FlakyTest to category to 
testNonPersistentServerRestartAutoSerializer


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

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

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


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/5c50954d/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java 
b/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
index 1afb1ad..22c6571 100644
--- 
a/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/pdx/PdxClientServerDUnitTest.java
@@ -54,6 +54,7 @@ import org.apache.geode.test.dunit.SerializableRunnable;
 import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
 import org.apache.geode.test.junit.categories.DistributedTest;
+import org.apache.geode.test.junit.categories.FlakyTest;
 
 @Category(DistributedTest.class)
 public class PdxClientServerDUnitTest extends JUnit4CacheTestCase {
@@ -187,6 +188,7 @@ public class PdxClientServerDUnitTest extends 
JUnit4CacheTestCase {
* Test of bug 47338 - what happens to the client type
* registry if the server is restarted.
*/
+  @Category(FlakyTest.class) // GEODE-2011
   @Test
   public void testNonPersistentServerRestartAutoSerializer() {
 Host host = Host.getHost(0);

[3/5] incubator-geode git commit: GEODE-2005: fix javadoc warning and format

2016-10-17 Thread klund 
GEODE-2005: fix javadoc warning and format


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

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

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


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

[1/5] incubator-geode git commit: GEODE-2007: fix unchecked warnings

2016-10-17 Thread klund 
Repository: incubator-geode
Updated Branches:
  refs/heads/develop a3bd25664 -> 5c50954d1


GEODE-2007: fix unchecked warnings


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

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

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


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

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

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

[4/5] incubator-geode git commit: GEODE-2006: add FlakyTest category to testSelectCommand

2016-10-17 Thread klund 
GEODE-2006: add FlakyTest category to testSelectCommand

Also, remove unused serial id.


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

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

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


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

[2/5] incubator-geode git commit: GEODE-2009: add FlakyTest category to testCreateAlterDestroyUpdatesSharedConfig

2016-10-17 Thread klund 
GEODE-2009: add FlakyTest category to testCreateAlterDestroyUpdatesSharedConfig


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

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

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


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

incubator-geode git commit: GEODE-706 Fixed race condition between expiry thread and put thread.

2016-10-17 Thread hiteshkhamesra 
Repository: incubator-geode
Updated Branches:
  refs/heads/develop f1df6fc59 -> a3bd25664


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

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


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

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

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


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a3bd2566/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
index 5861e9a..e02c7e1 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionMap.java
@@ -1513,9 +1513,9 @@ public abstract class AbstractRegionMap implements 
RegionMap {
   } finally {
 if (opCompleted) {
   if (re != null) {
-owner.cancelExpiryTask(re);
+owner.cancelExpiryTask(re, event.getExpiryTask());
   } else if (tombstone != null) {
-owner.cancelExpiryTask(tombstone);
+owner.cancelExpiryTask(tombstone, event.getExpiryTask());
   }
 }
   }

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

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

incubator-geode git commit: GEODE-1883 AuthInitializer should be made optional

2016-10-17 Thread kmiller 
Repository: incubator-geode
Updated Branches:
  refs/heads/develop cf09ac94d -> f1df6fc59


GEODE-1883 AuthInitializer should be made optional

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


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

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

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


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

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

2016-10-17 Thread jinmeiliao 
Repository: incubator-geode
Updated Branches:
  refs/heads/develop 5abe957ca -> cf09ac94d


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

* This closes #262


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

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

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


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

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

incubator-geode git commit: GEODE-1993: allow LocatorServerStartupRule to save server's ports as well.

2016-10-17 Thread jinmeiliao 
Repository: incubator-geode
Updated Branches:
  refs/heads/develop 1fb0d0a9d -> 5abe957ca


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

* added more tetss


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

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

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


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

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