incubator-geode git commit: Closing pull request #277

2016-10-31 Thread upthewaterspout
Repository: incubator-geode
Updated Branches:
  refs/heads/develop 8c9b51b09 -> 6d78cf20c


Closing pull request #277

This closes #277. I put the wrong pull request number in
dbcbd55f9b2965afcf5dcc8453308c1c850d7a5c, which is the commit that
actually merged this pull request.


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

Branch: refs/heads/develop
Commit: 6d78cf20c43f955fdd0d217e095dcb73baac4527
Parents: 8c9b51b
Author: Dan Smith 
Authored: Mon Oct 31 16:44:12 2016 -0700
Committer: Dan Smith 
Committed: Mon Oct 31 16:51:12 2016 -0700

--

--




incubator-geode git commit: Remove unused imports

2016-10-31 Thread klund
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-1930 24f496df4 -> 032a37ef3


Remove unused imports


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

Branch: refs/heads/feature/GEODE-1930
Commit: 032a37ef38766dd72ccb5a0d77a9e442603e21a9
Parents: 24f496d
Author: Kirk Lund 
Authored: Mon Oct 31 14:07:47 2016 -0700
Committer: Kirk Lund 
Committed: Mon Oct 31 14:07:47 2016 -0700

--
 .../org/apache/geode/management/ClientHealthStatsDUnitTest.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/032a37ef/geode-core/src/test/java/org/apache/geode/management/ClientHealthStatsDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/management/ClientHealthStatsDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/management/ClientHealthStatsDUnitTest.java
index 4ccb716..523c98f 100644
--- 
a/geode-core/src/test/java/org/apache/geode/management/ClientHealthStatsDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/management/ClientHealthStatsDUnitTest.java
@@ -55,7 +55,6 @@ import 
org.apache.geode.internal.cache.tier.sockets.CacheClientProxy;
 import org.apache.geode.management.internal.SystemManagementService;
 import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
 
 /**
  * Client health stats check



[42/50] [abbrv] incubator-geode git commit: GEODE-2021: Non colocated gets in a transaction should get TransactionDataNotColocatedException

2016-10-31 Thread klund
GEODE-2021: Non colocated gets in a transaction should get 
TransactionDataNotColocatedException

Throw TransactionDataNotColocatedException when get locally failed with 
BucketNotFoundException
Added a dunit test with two transactions with gets that will use TXStateStub or 
TXState based on data location.


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

Branch: refs/heads/feature/GEODE-1930
Commit: 56917a26a8916b83f0cec6e85285b5040ff66ee6
Parents: fadd92b
Author: eshu 
Authored: Fri Oct 21 11:43:36 2016 -0700
Committer: eshu 
Committed: Fri Oct 21 11:43:36 2016 -0700

--
 .../geode/internal/cache/PartitionedRegion.java |   6 +
 .../apache/geode/disttx/PRDistTXDUnitTest.java  |   5 +
 .../disttx/PRDistTXWithVersionsDUnitTest.java   |   5 +
 .../cache/execute/PRColocationDUnitTest.java|   6 +-
 .../cache/execute/PRTransactionDUnitTest.java   | 131 ++-
 5 files changed, 151 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/56917a26/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
index f7ecdaf..df52764 100755
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/PartitionedRegion.java
@@ -4105,6 +4105,12 @@ public class PartitionedRegion extends LocalRegion 
implements
 retryTime.waitToRetryNode();
   }
 } else {
+  if (prce instanceof BucketNotFoundException) {
+TransactionException ex = new 
TransactionDataNotColocatedException(LocalizedStrings.
+
PartitionedRegion_KEY_0_NOT_COLOCATED_WITH_TRANSACTION.toLocalizedString(key));
+ex.initCause(prce);
+throw ex;
+  }
   Throwable cause = prce.getCause();
   if (cause instanceof PrimaryBucketException) {
 throw (PrimaryBucketException)cause;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/56917a26/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXDUnitTest.java 
b/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXDUnitTest.java
index f36085b..68a83f1 100644
--- a/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXDUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXDUnitTest.java
@@ -37,6 +37,11 @@ public class PRDistTXDUnitTest extends 
PRTransactionDUnitTest {
 return props;
   }
   
+  @Ignore("[DISTTX] TODO test overridden and intentionally left blank as it 
does not apply to disttx.")
+  @Test
+  public void testTxWithNonColocatedGet() {
+  }
+  
   @Ignore("[DISTTX] TODO test overridden and intentionally left blank as they 
fail.")
   @Test
   public void testBasicPRTransactionRedundancy0() {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/56917a26/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXWithVersionsDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXWithVersionsDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXWithVersionsDUnitTest.java
index 268c2ed..d692468 100644
--- 
a/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXWithVersionsDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/disttx/PRDistTXWithVersionsDUnitTest.java
@@ -37,6 +37,11 @@ public class PRDistTXWithVersionsDUnitTest extends 
PRTransactionWithVersionsDUni
 return props;
   }
   
+  @Ignore("[DISTTX] TODO test overridden and intentionally left blank as it 
does not apply to disttx.")
+  @Test
+  public void testTxWithNonColocatedGet() {
+  }
+  
   @Ignore("[DISTTX] TODO test overridden and intentionally left blank as they 
fail.")
   @Override
   @Test

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/56917a26/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRColocationDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/internal/cache/execute/PRColocationDUnitTest.java
 

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

2016-10-31 Thread klund
GEODE-1993: allow LocatorServerStartupRule to save server's ports as well.

* added more tetss


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

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

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


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

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

[43/50] [abbrv] incubator-geode git commit: Convert from ManagementTestCase to ManagementTestRule

2016-10-31 Thread klund
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/24f496df/geode-core/src/test/java/org/apache/geode/management/bean/stats/DistributedSystemStatsDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/management/bean/stats/DistributedSystemStatsDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/management/bean/stats/DistributedSystemStatsDUnitTest.java
index 2330031..446ea2e 100644
--- 
a/geode-core/src/test/java/org/apache/geode/management/bean/stats/DistributedSystemStatsDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/management/bean/stats/DistributedSystemStatsDUnitTest.java
@@ -16,98 +16,66 @@
  */
 package org.apache.geode.management.bean.stats;
 
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
+import static com.jayway.awaitility.Awaitility.*;
 import static org.junit.Assert.*;
 
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
+import java.lang.management.ManagementFactory;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 
 import javax.management.ObjectName;
 
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.internal.cache.DiskStoreStats;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
 import org.apache.geode.management.DistributedSystemMXBean;
-import org.apache.geode.management.ManagementTestBase;
+import org.apache.geode.management.ManagementService;
+import org.apache.geode.management.ManagementTestRule;
+import org.apache.geode.management.Manager;
+import org.apache.geode.management.Member;
 import org.apache.geode.management.MemberMXBean;
 import org.apache.geode.management.internal.SystemManagementService;
-import org.apache.geode.management.internal.beans.MemberMBean;
-import org.apache.geode.management.internal.beans.MemberMBeanBridge;
-import org.apache.geode.test.dunit.Assert;
-import org.apache.geode.test.dunit.SerializableRunnable;
 import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.junit.categories.DistributedTest;
 
-/**
- */
 @Category(DistributedTest.class)
-public class DistributedSystemStatsDUnitTest extends ManagementTestBase{
-  
-  private static final long serialVersionUID = 1L;
+@SuppressWarnings("serial")
+public class DistributedSystemStatsDUnitTest {
 
-  public DistributedSystemStatsDUnitTest() {
-super();
-  }
+  @Manager
+  private VM manager;
+
+  @Member
+  private VM[] members;
+
+  @Rule
+  public ManagementTestRule managementTestRule = 
ManagementTestRule.builder().build();
 
   @Test
   public void testDistributedSystemStats() throws Exception {
-initManagement(true);
+this.manager.invoke("verifyMBeans", () -> {
+  GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+  assertNotNull(cache);
 
-for(VM vm : managedNodeList){
-  setDiskStats(vm);
-}
-verifyDiskStats(managingNode);
-  }
-  
-  @SuppressWarnings("serial")
-  public void setDiskStats(VM vm1) throws Exception {
-vm1.invoke(new SerializableRunnable("Set Member Stats") {
-  public void run() {
-MemberMBean bean = (MemberMBean) managementService.getMemberMXBean();
-MemberMBeanBridge bridge = bean.getBridge();
-DiskStoreStats diskStoreStats = new DiskStoreStats(basicGetSystem(), 
"test");
-bridge.addDiskStoreStats(diskStoreStats);
-diskStoreStats.startRead();
-diskStoreStats.startWrite();
-diskStoreStats.startBackup();
-diskStoreStats.startRecovery();
-diskStoreStats.incWrittenBytes(20, true);
-diskStoreStats.startFlush();
-diskStoreStats.setQueueSize(10);
-  }
-});
-  }
+  SystemManagementService service = (SystemManagementService) 
ManagementService.getManagementService(cache);
+  DistributedSystemMXBean distributedSystemMXBean = 
service.getDistributedSystemMXBean();
+  assertNotNull(distributedSystemMXBean);
+
+  Set otherMemberSet = 
cache.getDistributionManager().getOtherNormalDistributionManagerIds();
+  assertEquals(3, otherMemberSet.size());
+
+  for (DistributedMember member : otherMemberSet) {
+ObjectName memberMXBeanName = service.getMemberMBeanName(member);
+await().atMost(2, TimeUnit.MINUTES).until(() -> 
assertTrue(ManagementFactory.getPlatformMBeanServer().isRegistered(memberMXBeanName)));
 
-  @SuppressWarnings("serial")
-  public void verifyDiskStats(VM vm1) throws Exception {
-vm1.invoke(new SerializableRunnable("Set Member Stats") {
-  public void run() {
-GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
-
-SystemManagementService service = (SystemManagementService) 

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

2016-10-31 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/feature/GEODE-1930
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(



[34/50] [abbrv] incubator-geode git commit: GEODE-1959: prompt for password when starting a server if username is specified

2016-10-31 Thread klund
GEODE-1959: prompt for password when starting a server if username is specified


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

Branch: refs/heads/feature/GEODE-1930
Commit: b2e77685907c51b1af346e6f8b8da3f5b598b361
Parents: 11ef3eb
Author: Jinmei Liao 
Authored: Tue Oct 18 09:13:26 2016 -0700
Committer: Jinmei Liao 
Committed: Wed Oct 19 21:16:23 2016 -0700

--
 .../LauncherLifecycleCommandsDUnitTest.java | 22 ++
 .../geode/distributed/ServerLauncher.java   | 78 ++--
 .../membership/gms/membership/GMSJoinLeave.java |  7 +-
 .../cli/commands/LauncherLifecycleCommands.java | 29 +++-
 .../internal/cli/commands/ShellCommands.java| 48 +++-
 .../internal/cli/i18n/CliStrings.java   | 13 +++-
 .../management/internal/cli/shell/Gfsh.java | 41 ++
 .../cli/commands/golden-help-offline.properties |  9 +++
 8 files changed, 166 insertions(+), 81 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b2e77685/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
--
diff --git 
a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
 
b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
index 490e309..933d152 100644
--- 
a/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
+++ 
b/geode-assembly/src/test/java/org/apache/geode/management/internal/cli/commands/LauncherLifecycleCommandsDUnitTest.java
@@ -437,6 +437,28 @@ public class LauncherLifecycleCommandsDUnitTest extends 
CliCommandTestBase {
   }
 
   @Test
+  public void testStartServerFailsFastOnMissingPassword() throws IOException {
+
+CommandStringBuilder command = new 
CommandStringBuilder(CliStrings.START_SERVER);
+
+String pathName = 
getClass().getSimpleName().concat("_").concat(getTestMethodName());
+final File workingDirectory = temporaryFolder.newFolder(pathName);
+
+command.addOption(CliStrings.START_SERVER__NAME, pathName);
+command.addOption(CliStrings.START_SERVER__DIR, 
workingDirectory.getCanonicalPath());
+command.addOption(CliStrings.START_SERVER__USERNAME, "test");
+
+CommandResult result = executeCommand(command.toString());
+
+assertNotNull(result);
+assertEquals(Result.Status.ERROR, result.getStatus());
+
+String resultString = toString(result);
+
+assertTrue(resultString, resultString.contains("password must be 
specified"));
+  }
+
+  @Test
   public void 
test005StartServerFailsFastOnMissingGemFireSecurityPropertiesFile() throws 
IOException {
 String gemfireSecuritiesPropertiesFile = 
"/path/to/missing/gemfire-securities.properties";
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b2e77685/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java 
b/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java
index a3d3845..088b670 100755
--- a/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java
+++ b/geode-core/src/main/java/org/apache/geode/distributed/ServerLauncher.java
@@ -19,6 +19,32 @@ package org.apache.geode.distributed;
 
 import static org.apache.geode.distributed.ConfigurationProperties.*;
 
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.lang.management.ManagementFactory;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.ServiceLoader;
+import java.util.TreeMap;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
+
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+
+import joptsimple.OptionException;
+import joptsimple.OptionParser;
+import joptsimple.OptionSet;
+
 import org.apache.geode.SystemFailure;
 import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.partition.PartitionRegionHelper;

[33/50] [abbrv] incubator-geode git commit: GEODE-538: Add check for persistent data recovery

2016-10-31 Thread klund
GEODE-538: Add check for persistent data recovery

PartitionedRegion.getNodeForBucketReadOrLoad can return an invalid node
if persistent data recovery is in process and a get() targets a bucket
that
hasn't been recoverd yet. This can result in returning an incorrect
value (null) or throwing ConflictingPersistentDataException from a get()
or put() on the region.

This change adds a check for persistent recovery to be completed
before creating the new bucket. If recovery isn't complete then the
operation on the region will fail with a PartitionOfflineException.

Queries on a region while persistent recovery is in progress can also
result in incorrect results so a similar check is added to
DefaultQuery.checkQueryOnPR.

This closes #264


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

Branch: refs/heads/feature/GEODE-1930
Commit: 11ef3ebbe30a8340f57776bf4063684b91ccd0a3
Parents: 7511ffa
Author: Ken Howe 
Authored: Thu Oct 6 15:02:24 2016 -0700
Committer: Anil 
Committed: Wed Oct 19 15:49:33 2016 -0700

--
 .../org/apache/geode/cache/query/Query.java |  12 +
 .../cache/query/internal/DefaultQuery.java  |   6 +-
 .../internal/cache/PRHARedundancyProvider.java  |   9 +-
 .../geode/internal/cache/PartitionedRegion.java |  18 +-
 .../geode/internal/i18n/LocalizedStrings.java   |   1 +
 .../partitioned/PRBasicQueryDUnitTest.java  | 221 ++
 .../query/partitioned/PRQueryDUnitHelper.java   | 185 +
 ...tentColocatedPartitionedRegionDUnitTest.java | 411 ++-
 8 files changed, 844 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/11ef3ebb/geode-core/src/main/java/org/apache/geode/cache/query/Query.java
--
diff --git a/geode-core/src/main/java/org/apache/geode/cache/query/Query.java 
b/geode-core/src/main/java/org/apache/geode/cache/query/Query.java
index e27687d..670b262 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/query/Query.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/query/Query.java
@@ -89,6 +89,9 @@ public interface Query {
* @throws QueryExecutionLowMemoryException
* If the query gets canceled due to low memory conditions and
* the resource manager critical heap percentage has been set
+   * @throws PartitionOfflineException
+   * If persistent data recovery is not complete for a partitioned
+   * region referred to in the query.
*/
   public Object execute()
 throws FunctionDomainException, TypeMismatchException, 
NameResolutionException,
@@ -150,6 +153,9 @@ public interface Query {
* @throws QueryExecutionLowMemoryException
* If the query gets canceled due to low memory conditions and
* the resource manager critical heap percentage has been set
+   * @throws PartitionOfflineException
+   * If persistent data recovery is not complete for a partitioned
+   * region referred to in the query.
* 
*/
   public Object execute(Object[] params)
@@ -220,6 +226,9 @@ public interface Query {
* @throws QueryExecutionLowMemoryException
* If the query gets canceled due to low memory conditions and
* the resource manager critical heap percentage has been set
+   * @throws PartitionOfflineException
+   * If persistent data recovery is not complete for a partitioned
+   * region referred to in the query.
*/
   public Object execute(RegionFunctionContext context)
 throws FunctionDomainException, TypeMismatchException, 
NameResolutionException,
@@ -291,6 +300,9 @@ public interface Query {
* @throws QueryExecutionLowMemoryException
* If the query gets canceled due to low memory conditions and
* the resource manager critical heap percentage has been set
+   * @throws PartitionOfflineException
+   * If persistent data recovery is not complete for a partitioned
+   * region referred to in the query.
*/
   public Object execute(RegionFunctionContext context, Object[] params)
 throws FunctionDomainException, TypeMismatchException, 
NameResolutionException,

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/11ef3ebb/geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQuery.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/DefaultQuery.java
 

[40/50] [abbrv] incubator-geode git commit: GEODE-2019 Adding missing apache license header

2016-10-31 Thread klund
GEODE-2019 Adding missing apache license 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/af55d929
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/af55d929
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/af55d929

Branch: refs/heads/feature/GEODE-1930
Commit: af55d9292c2eacf9db43909b9c68c32b927b21de
Parents: bc060f9
Author: Dan Smith 
Authored: Thu Oct 20 17:11:25 2016 -0700
Committer: Dan Smith 
Committed: Thu Oct 20 17:11:25 2016 -0700

--
 .../automated_rebalance.html.md.erb | 16 
 1 file changed, 16 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/af55d929/geode-docs/developing/partitioned_regions/automated_rebalance.html.md.erb
--
diff --git 
a/geode-docs/developing/partitioned_regions/automated_rebalance.html.md.erb 
b/geode-docs/developing/partitioned_regions/automated_rebalance.html.md.erb
index 387275d..37b7dce 100644
--- a/geode-docs/developing/partitioned_regions/automated_rebalance.html.md.erb
+++ b/geode-docs/developing/partitioned_regions/automated_rebalance.html.md.erb
@@ -1,6 +1,22 @@
 ---
 title:  Automated Rebalancing of Partitioned Region Data
 ---
+
 
 Automated rebalance triggers a rebalance
 (see [Rebalancing Partitioned Region Data](rebalancing_pr_data.html))



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

2016-10-31 Thread klund
Fix README numbering, anchors


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

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

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


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



[44/50] [abbrv] incubator-geode git commit: Convert from ManagementTestCase to ManagementTestRule

2016-10-31 Thread klund
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/24f496df/geode-core/src/test/java/org/apache/geode/management/RegionManagementDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/management/RegionManagementDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/management/RegionManagementDUnitTest.java
index f042f2c..71359be 100644
--- 
a/geode-core/src/test/java/org/apache/geode/management/RegionManagementDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/management/RegionManagementDUnitTest.java
@@ -14,22 +14,46 @@
  * 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.
+ */
 package org.apache.geode.management;
 
-import static org.junit.Assert.*;
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.apache.geode.cache.Region.*;
+import static org.apache.geode.test.dunit.Host.*;
+import static org.apache.geode.test.dunit.Invoke.invokeInEveryVM;
+import static org.assertj.core.api.Assertions.*;
 
+import java.lang.management.ManagementFactory;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
 
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
 import javax.management.Notification;
 import javax.management.NotificationListener;
 import javax.management.ObjectName;
 
+import com.jayway.awaitility.Awaitility;
+import com.jayway.awaitility.core.ConditionFactory;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -43,757 +67,505 @@ import org.apache.geode.cache.PartitionAttributes;
 import org.apache.geode.cache.PartitionAttributesFactory;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionAttributes;
+import org.apache.geode.cache.RegionFactory;
+import org.apache.geode.cache.RegionShortcut;
 import org.apache.geode.cache.Scope;
 import org.apache.geode.cache.query.data.Portfolio;
 import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.distributed.internal.DM;
+import org.apache.geode.internal.cache.AbstractRegion;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.internal.cache.LocalRegion;
 import org.apache.geode.internal.cache.TestObjectSizerImpl;
 import org.apache.geode.internal.cache.lru.LRUStatistics;
 import 
org.apache.geode.internal.cache.partitioned.fixed.SingleHopQuarterPartitionResolver;
 import org.apache.geode.management.internal.MBeanJMXAdapter;
 import org.apache.geode.management.internal.SystemManagementService;
-import org.apache.geode.test.dunit.Assert;
 import org.apache.geode.test.dunit.LogWriterUtils;
-import org.apache.geode.test.dunit.SerializableRunnable;
 import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.dunit.Wait;
 import org.apache.geode.test.dunit.WaitCriterion;
 import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
 
 /**
  * This class checks and verifies various data and operations exposed through
  * RegionMXBean interface.
- * 
+ * 
  * Goal of the Test : RegionMBean gets created once region is created. Data 
like
  * Region Attributes data and stats are of proper value
- * 
- * 
  */
 @Category(DistributedTest.class)
+@SuppressWarnings({ "serial", "unused" })
 public class RegionManagementDUnitTest extends ManagementTestBase {
 
-  private static final long serialVersionUID = 1L;
-
-  private final String VERIFY_CONFIG_METHOD = "verifyConfigData";
+  private static final String REGION_NAME = "MANAGEMENT_TEST_REGION";
+  private static final String PARTITIONED_REGION_NAME = 
"MANAGEMENT_PAR_REGION";
+  private static final String FIXED_PR_NAME = "MANAGEMENT_FIXED_PR";
+  private static final String LOCAL_REGION_NAME = "TEST_LOCAL_REGION";
+  

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

2016-10-31 Thread klund
GEODE-1927: more protection from seeing com.gemstone.gemfire packaged objects

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


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

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

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


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



[31/50] [abbrv] incubator-geode git commit: GEODE-388: Deprecating DynamicRegionFactory

2016-10-31 Thread klund
GEODE-388: Deprecating DynamicRegionFactory

Marking DynamicRegionFactory as deprecated.


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

Branch: refs/heads/feature/GEODE-1930
Commit: ad43d4472c3bc9bb4500b34e2aec58f7fcb406d3
Parents: bc7a675
Author: Dan Smith 
Authored: Mon Oct 17 16:28:51 2016 -0700
Committer: Dan Smith 
Committed: Wed Oct 19 10:19:16 2016 -0700

--
 .../main/java/org/apache/geode/cache/DynamicRegionFactory.java   | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ad43d447/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java 
b/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java
index 3cfa73b..a4d84a6 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/DynamicRegionFactory.java
@@ -31,6 +31,7 @@ import org.apache.geode.SystemFailure;
 import org.apache.geode.cache.client.Pool;
 import org.apache.geode.cache.client.PoolManager;
 import org.apache.geode.cache.client.internal.ServerRegionProxy;
+import org.apache.geode.cache.execute.FunctionService;
 import org.apache.geode.cache.wan.GatewaySender;
 import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
@@ -126,9 +127,12 @@ import org.apache.geode.security.GemFireSecurityException;
  * not directly access this Region; instead use the methods on this factory.
  * 
  * @since GemFire 4.3
+ * @deprecated This class is deprecated. Use {@link FunctionService} to create 
regions on
+ * other members instead.
  *
  */
 @SuppressWarnings("deprecation")
+@Deprecated
 public abstract class DynamicRegionFactory  {
 
   public static final String dynamicRegionListName = "__DynamicRegions";



[50/50] [abbrv] incubator-geode git commit: Convert from ManagementTestCase to ManagementTestRule

2016-10-31 Thread klund
Convert from ManagementTestCase to ManagementTestRule


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

Branch: refs/heads/feature/GEODE-1930
Commit: 24f496df4ab628dc95b931000733269869fdf117
Parents: 56917a2
Author: Kirk Lund 
Authored: Mon Oct 31 13:45:28 2016 -0700
Committer: Kirk Lund 
Committed: Mon Oct 31 13:55:09 2016 -0700

--
 .../RestAPIsAndInterOpsDUnitTest.java   |   43 +-
 geode-core/build.gradle |1 +
 .../org/apache/geode/management/JVMMetrics.java |3 +-
 .../org/apache/geode/management/OSMetrics.java  |3 +-
 .../internal/SystemManagementService.java   |2 +-
 .../DistributedLockServiceDUnitTest.java|2 +-
 .../cache/ConnectDisconnectDUnitTest.java   |2 +-
 ...gionBucketCreationDistributionDUnitTest.java |2 +-
 .../cache/locks/TXLockServiceDUnitTest.java |4 +-
 .../management/CacheManagementDUnitTest.java|  937 -
 .../management/ClientHealthStatsDUnitTest.java  |  597 +++---
 .../management/CompositeTypeTestDUnitTest.java  |  202 +-
 .../management/DLockManagementDUnitTest.java|  549 ++
 .../management/DiskManagementDUnitTest.java |  821 +++-
 .../management/DistributedSystemDUnitTest.java  | 1038 --
 .../geode/management/JMXMBeanDUnitTest.java |2 +-
 .../management/LocatorManagementDUnitTest.java  |  429 ++--
 .../geode/management/ManagementTestBase.java|  577 ++
 .../geode/management/ManagementTestRule.java|  430 
 .../org/apache/geode/management/Manager.java|   31 +
 .../org/apache/geode/management/Member.java |   31 +
 .../management/OffHeapManagementDUnitTest.java  |  723 ---
 .../geode/management/QueryDataDUnitTest.java| 1297 +---
 .../management/RegionManagementDUnitTest.java   | 1856 --
 .../stats/DistributedSystemStatsDUnitTest.java  |  110 +-
 .../QueryDataFunctionApplyLimitClauseTest.java  |   10 +-
 .../internal/pulse/TestClientIdsDUnitTest.java  |   52 +-
 .../pulse/TestSubscriptionsDUnitTest.java   |  291 +--
 .../geode/test/dunit/AsyncInvocation.java   |   59 +-
 .../org/apache/geode/test/dunit/Invoke.java |4 +-
 .../java/org/apache/geode/test/dunit/VM.java|7 +-
 .../java/org/apache/geode/test/dunit/Wait.java  |2 +
 .../cache/internal/JUnit4CacheTestCase.java |5 +
 .../internal/JUnit4DistributedTestCase.java |4 +-
 .../dunit/rules/DistributedDisconnectRule.java  |4 +-
 .../DistributedRestoreSystemProperties.java |4 +-
 .../geode/test/dunit/rules/DistributedRule.java |   68 +
 .../test/dunit/rules/DistributedRunRules.java   |   76 +
 .../test/dunit/rules/DistributedStatement.java  |   76 +
 .../test/dunit/rules/DistributedTestRule.java   |  192 ++
 .../DistributedUseJacksonForJsonPathRule.java   |   51 +
 .../dunit/rules/DistributedWrapperRule.java |   52 +
 .../geode/test/dunit/rules/RemoteInvoker.java   |   16 +-
 .../apache/geode/test/dunit/rules/WhichVMs.java |   58 +
 .../rules/tests/DistributedTestRuleTest.java|   54 +
 .../test/dunit/standalone/DUnitLauncher.java|9 +-
 geode-junit/build.gradle|1 +
 .../junit/rules/UseJacksonForJsonPathRule.java  |  128 ++
 .../SerializableExternalResource.java   |   22 +
 .../serializable/SerializableStatement.java |   27 +
 .../management/LuceneManagementDUnitTest.java   |   20 +-
 gradle/dependency-versions.properties   |3 +-
 52 files changed, 5054 insertions(+), 5933 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/24f496df/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
--
diff --git 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
index 0299615..baefcba 100644
--- 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
+++ 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/controllers/RestAPIsAndInterOpsDUnitTest.java
@@ -67,7 +67,6 @@ import org.apache.geode.distributed.DistributedSystem;
 import org.apache.geode.internal.AvailablePort;
 import org.apache.geode.internal.AvailablePortHelper;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.management.ManagementTestBase;
 import 

[06/50] [abbrv] incubator-geode git commit: GEODE-1466 : Added TemporaryFileRule JUnit rule for tests that need to create files in a particular directory.

2016-10-31 Thread klund
GEODE-1466 : Added TemporaryFileRule JUnit rule for tests that need to create 
files in a particular directory.

* This closes #260


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

Branch: refs/heads/feature/GEODE-1930
Commit: b06599353d40ae4b54282c71aba9df57411e2704
Parents: 8a08032
Author: Jared Stewart 
Authored: Thu Oct 13 16:50:35 2016 -0700
Committer: Jinmei Liao 
Committed: Fri Oct 14 12:00:03 2016 -0700

--
 geode-junit/build.gradle|   5 +-
 .../test/junit/rules/TemporaryFileRule.java | 111 
 .../test/junit/rules/TemporaryFileRuleTest.java | 130 +++
 3 files changed, 245 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b0659935/geode-junit/build.gradle
--
diff --git a/geode-junit/build.gradle b/geode-junit/build.gradle
index 3e4eb22..f7e5e46 100755
--- a/geode-junit/build.gradle
+++ b/geode-junit/build.gradle
@@ -17,7 +17,10 @@
 
 dependencies {
   testCompile 'commons-lang:commons-lang:' + project.'commons-lang.version'
-  compile ('junit:junit:' + project.'junit.version') {
+  testCompile 'com.google.guava:guava:' + project.'guava.version'
+  testCompile 'org.assertj:assertj-core:' + project.'assertj-core.version'
+
+  compile('junit:junit:' + project.'junit.version') {
 exclude module: 'hamcrest-core'
   }
   compile 'org.hamcrest:hamcrest-all:' + project.'hamcrest-all.version'

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b0659935/geode-junit/src/main/java/org/apache/geode/test/junit/rules/TemporaryFileRule.java
--
diff --git 
a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/TemporaryFileRule.java
 
b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/TemporaryFileRule.java
new file mode 100644
index 000..bd2cac2
--- /dev/null
+++ 
b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/TemporaryFileRule.java
@@ -0,0 +1,111 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.geode.test.junit.rules;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+
+import org.junit.rules.ExternalResource;
+
+
+/**
+ * A {@link org.junit.rules.TestRule} to create temporary files in a given 
directory that should be
+ * deleted when the test method finishes.  This is useful in place of {@link 
org.junit.rules.TemporaryFolder} when a test needs
+ * to create files in a particular directory, for example user.home or 
user.dir.
+ *
+ * Example of usage:
+ * 
+ * public static class HasTemporaryFile {
+ *  Rule
+ *  public TemporaryFileRule temporaryFileRule = 
TemporaryFileRule.inUserHome();
+ *
+ *  Test
+ *  public void testUsingTempFolder() throws IOException {
+ *  File createdFile= temporaryFileRule.newFile(myfile.txt);
+ *  File createdFile= temporaryFileRule.newFile(myfile2.txt);
+ *  // ...
+ * }
+ * }
+ * 
+ */
+public class TemporaryFileRule extends ExternalResource {
+
+  private final String directory;
+
+  private Set files;
+
+  private TemporaryFileRule(String parentDirectory) {
+this.directory = parentDirectory;
+  }
+
+  public static TemporaryFileRule inUserHome() {
+return new TemporaryFileRule(System.getProperty("user.home"));
+  }
+
+  public static TemporaryFileRule inCurrentDir() {
+return new TemporaryFileRule(System.getProperty("user.dir"));
+  }
+
+  public static TemporaryFileRule inDirectory(String directory) {
+return new TemporaryFileRule(directory);
+  }
+
+  @Override
+  public void before() {
+files = new HashSet<>();
+  }
+
+  @Override
+  public void after() {
+

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

2016-10-31 Thread klund
GEODE-1991: Removing sleeps from HARegionQueueJUnitTest

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


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

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

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


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

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

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

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


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

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

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


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

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

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

2016-10-31 Thread klund
GEODE-1353: Added listeners to slow down the receiver.

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


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

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

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


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

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

2016-10-31 Thread klund
GEODE-706 Fixed race condition between expiry thread and put thread.

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


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

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

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


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

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

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

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

2016-10-31 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/feature/GEODE-1930
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();



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

2016-10-31 Thread klund
GEODE-1993: refactor tests to use rules rather than abstract classes

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


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

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

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


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de621597/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityDUnitTest.java
--
diff --git 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityDUnitTest.java
 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityDUnitTest.java
deleted file mode 100644
index 59e00c8..000
--- 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/RestSecurityDUnitTest.java
+++ /dev/null
@@ -1,557 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * 

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

2016-10-31 Thread klund
GEODE-2004: Create/update/delete query through rest api should require 
DATA:READ instead of DATA:WRITE

* This closes #262


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

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

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


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

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

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

2016-10-31 Thread klund
Reverting gradle.properties change that came from the release branch

The release type should be SNAPSHOT on develop


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

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

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


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



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

2016-10-31 Thread klund
GEODE-2000 Now ClientMembershipListener returns host on which
CacheServer is bind


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

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

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


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8a080323/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
index 775fa24..3c16bb3 100755
--- 
a/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
+++ 
b/geode-core/src/main/java/org/apache/geode/distributed/internal/membership/InternalDistributedMember.java
@@ -1031,6 +1031,7 @@ public class InternalDistributedMember
 int port = in.readInt();
 
 this.hostName = DataSerializer.readString(in);
+
 this.hostName = SocketCreator.resolve_dns? 
SocketCreator.getCanonicalHostName(inetAddr, hostName) : 
inetAddr.getHostAddress();
 
 int flags = in.readUnsignedByte();
@@ -1210,7 +1211,11 @@ public class InternalDistributedMember
   }
 
   public String getHost() {
-return this.netMbr.getInetAddress().getCanonicalHostName();
+return this.hostName;
+  }
+  
+  public void setHost(String h) {
+this.hostName = h;
   }
 
   public int getProcessId() {

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

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

[38/50] [abbrv] incubator-geode git commit: GEODE-2019 Add automated rebalance documentation

2016-10-31 Thread klund
GEODE-2019 Add automated rebalance documentation

Revise content header to match the header in the subnav.


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

Branch: refs/heads/feature/GEODE-1930
Commit: 139c0a36ff0aba3c5f8f9b964d0109d18a10ca6e
Parents: f1be596
Author: Karen Miller 
Authored: Thu Oct 20 14:18:27 2016 -0700
Committer: Karen Miller 
Committed: Thu Oct 20 14:18:27 2016 -0700

--
 .../developing/partitioned_regions/automated_rebalance.html.md.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/139c0a36/geode-docs/developing/partitioned_regions/automated_rebalance.html.md.erb
--
diff --git 
a/geode-docs/developing/partitioned_regions/automated_rebalance.html.md.erb 
b/geode-docs/developing/partitioned_regions/automated_rebalance.html.md.erb
index d4ca2a6..387275d 100644
--- a/geode-docs/developing/partitioned_regions/automated_rebalance.html.md.erb
+++ b/geode-docs/developing/partitioned_regions/automated_rebalance.html.md.erb
@@ -1,5 +1,5 @@
 ---
-title:  Automated Rebalance
+title:  Automated Rebalancing of Partitioned Region Data
 ---
 
 Automated rebalance triggers a rebalance



[39/50] [abbrv] incubator-geode git commit: Merge remote-tracking branch 'origin/develop' into feature/GEODE-2019

2016-10-31 Thread klund
Merge remote-tracking branch 'origin/develop' into feature/GEODE-2019


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

Branch: refs/heads/feature/GEODE-1930
Commit: bc060f95c1f889fe5c6261006fe8a2591bfe6187
Parents: 139c0a3 7e659b2
Author: Karen Miller 
Authored: Thu Oct 20 16:37:25 2016 -0700
Committer: Karen Miller 
Committed: Thu Oct 20 16:37:25 2016 -0700

--
 .../LauncherLifecycleCommandsDUnitTest.java | 22 ++
 .../geode/distributed/ServerLauncher.java   | 78 ++--
 .../membership/gms/membership/GMSJoinLeave.java |  7 +-
 .../cli/commands/LauncherLifecycleCommands.java | 29 +++-
 .../internal/cli/commands/ShellCommands.java| 48 +++-
 .../internal/cli/i18n/CliStrings.java   | 13 +++-
 .../management/internal/cli/shell/Gfsh.java | 41 ++
 .../geode.apache.org/schema/cache/cache-1.0.xsd |  4 +
 .../PRColocatedEquiJoinDUnitTest.java   |  2 +
 .../cli/commands/golden-help-offline.properties |  9 +++
 10 files changed, 172 insertions(+), 81 deletions(-)
--




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

2016-10-31 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/feature/GEODE-1930
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();



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

2016-10-31 Thread klund
GEODE-1883 AuthInitializer should be made optional

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


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

Branch: refs/heads/feature/GEODE-1930
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.



[32/50] [abbrv] incubator-geode git commit: GEODE-1983: Swagger is broken with integrated security

2016-10-31 Thread klund
GEODE-1983: Swagger is broken with integrated security

* This required a simple configuration change.
* This closes #263


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

Branch: refs/heads/feature/GEODE-1930
Commit: 7511ffac940ef63850c5a3f83857efbae3ac3b18
Parents: ad43d44
Author: Kevin Duling 
Authored: Tue Oct 18 10:33:37 2016 -0700
Committer: Jinmei Liao 
Committed: Wed Oct 19 12:36:34 2016 -0700

--
 .../internal/web/security/RestSecurityConfiguration.java | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7511ffac/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/RestSecurityConfiguration.java
--
diff --git 
a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/RestSecurityConfiguration.java
 
b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/RestSecurityConfiguration.java
index f3b5c4d..4550ff2 100644
--- 
a/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/RestSecurityConfiguration.java
+++ 
b/geode-web-api/src/main/java/org/apache/geode/rest/internal/web/security/RestSecurityConfiguration.java
@@ -17,8 +17,6 @@
  */
 package org.apache.geode.rest.internal.web.security;
 
-import org.apache.geode.internal.security.IntegratedSecurityService;
-import org.apache.geode.internal.security.SecurityService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -31,6 +29,9 @@ import 
org.springframework.security.config.annotation.web.configuration.EnableWe
 import 
org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.config.http.SessionCreationPolicy;
 
+import org.apache.geode.internal.security.IntegratedSecurityService;
+import org.apache.geode.internal.security.SecurityService;
+
 @Configuration
 @EnableWebSecurity
 @EnableGlobalMethodSecurity(prePostEnabled = true)
@@ -56,8 +57,7 @@ public class RestSecurityConfiguration extends 
WebSecurityConfigurerAdapter {
   protected void configure(HttpSecurity http) throws Exception {
 
http.sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS)
 .and()
-.authorizeRequests()
-.antMatchers("/ping").permitAll()
+.authorizeRequests().antMatchers("/ping", "/api-docs/**", 
"/docs/**").permitAll()
 .anyRequest().authenticated()
 .and()
 .formLogin()



[35/50] [abbrv] incubator-geode git commit: GEODE-2019 Add automated rebalance documentation

2016-10-31 Thread klund
GEODE-2019  Add automated rebalance documentation


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

Branch: refs/heads/feature/GEODE-1930
Commit: f1be596a322911525908524663cc0e5cad17a2bb
Parents: 11ef3eb
Author: Karen Miller 
Authored: Thu Oct 20 10:23:12 2016 -0700
Committer: Karen Miller 
Committed: Thu Oct 20 10:23:12 2016 -0700

--
 .../source/subnavs/geode-subnav.erb |  3 +
 .../automated_rebalance.html.md.erb | 66 
 .../chapter_overview.html.md.erb|  5 ++
 3 files changed, 74 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f1be596a/geode-book/master_middleman/source/subnavs/geode-subnav.erb
--
diff --git a/geode-book/master_middleman/source/subnavs/geode-subnav.erb 
b/geode-book/master_middleman/source/subnavs/geode-subnav.erb
index 53e9118..2373f4b 100644
--- a/geode-book/master_middleman/source/subnavs/geode-subnav.erb
+++ b/geode-book/master_middleman/source/subnavs/geode-subnav.erb
@@ -959,6 +959,9 @@ limitations under the License.
 Rebalancing
 Partitioned Region Data
 
 
+Automated 
Rebalancing of Partitioned Region Data
+
+
 Checking
 Redundancy in Partitioned Regions
 
 

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f1be596a/geode-docs/developing/partitioned_regions/automated_rebalance.html.md.erb
--
diff --git 
a/geode-docs/developing/partitioned_regions/automated_rebalance.html.md.erb 
b/geode-docs/developing/partitioned_regions/automated_rebalance.html.md.erb
new file mode 100644
index 000..d4ca2a6
--- /dev/null
+++ b/geode-docs/developing/partitioned_regions/automated_rebalance.html.md.erb
@@ -0,0 +1,66 @@
+---
+title:  Automated Rebalance
+---
+
+Automated rebalance triggers a rebalance
+(see [Rebalancing Partitioned Region Data](rebalancing_pr_data.html))
+operation based on a
+time schedule.
+At the scheduled intervals, the balance of the partitioned regions
+is evaluated based on configured criteria.
+One criterion is a minimum threshhold for number of bytes that
+would be transferred if the rebalance takes place.
+The other criterion uses the ratio of the number of bytes
+that would be transferred to the total number of bytes in the
+regions.
+If the evaluation indicates the system is out of balance,
+the rebalance transfer is initiated.
+
+To enable automated rebalance, specify the rebalance manager
+in the `` attribute within the `` configuration
+of the `cache.xml` file:
+
+``` pre
+ org.apache.geode.cache.util.AutoBalancer 
+```
+
+The time schedule that triggers an evaluation and possible rebalance
+uses a cron-based specification in 
+the `` attribute within the `` configuration 
+of the `cache.xml` file.
+This scheduling specification is required.
+Specify the cron expression in the Spring format.
+This example specification triggers each Saturday at 3am:
+
+``` pre
+ 0 0 3 ? * SAT 
+```
+
+This example specification triggers once each day at 4am:
+
+``` pre
+ 0 0 4 * * ?
+```
+
+The automated rebalance specifications that specify criteria for
+triggering the rebalance are optional and have reasonable default values.
+
+One criterion is a minimum number of bytes that would be transferred
+if the rebalance were to take place.
+The specification is in units of bytes; here is the specification
+for the default value of 100MB:
+
+``` pre
+ 104857600
+```
+
+Another criterion represents the ratio of bytes that would be transferred
+to the total number of bytes in the partitioned regions,
+represented as an integer percentage.
+The default is 10 percent.
+This example specificies 15 percent:
+ 
+``` pre
+ 15 
+```
+

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f1be596a/geode-docs/developing/partitioned_regions/chapter_overview.html.md.erb
--
diff --git 
a/geode-docs/developing/partitioned_regions/chapter_overview.html.md.erb 
b/geode-docs/developing/partitioned_regions/chapter_overview.html.md.erb
index c92921b..e450ee5 100644
--- a/geode-docs/developing/partitioned_regions/chapter_overview.html.md.erb
+++ b/geode-docs/developing/partitioned_regions/chapter_overview.html.md.erb
@@ 

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

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

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/de621597/geode-core/src/test/java/org/apache/geode/management/internal/security/JMXConnectionConfiguration.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/management/internal/security/JMXConnectionConfiguration.java
 
b/geode-core/src/test/java/org/apache/geode/management/internal/security/JMXConnectionConfiguration.java
deleted file mode 100644
index 4f57baa..000
--- 
a/geode-core/src/test/java/org/apache/geode/management/internal/security/JMXConnectionConfiguration.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geode.management.internal.security;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * This annotation is intended to be used with {@link 
MBeanServerConnectionRule} in order to configure a per-test JMX
- * connection with a specific user and password.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.METHOD})
-public @interface JMXConnectionConfiguration {
-  String user();
-  String password();
-}

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

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

2016-10-31 Thread klund
Merge feature/GEODE-1952 into feature/GEODE-1952-3


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

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

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

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

2016-10-31 Thread klund
Merge remote-tracking branch 'origin/develop' into develop


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

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

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

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

2016-10-31 Thread klund
Merge remote-tracking branch 'origin/release/1.0.0-incubating' into develop


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

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

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

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

2016-10-31 Thread klund
GEODE-1952 Add Apache license to new files; add Gemfile.lock to rat.gradle


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

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

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


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

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

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

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

[37/50] [abbrv] incubator-geode git commit: GEODE-388: Marking dynamic-region-factory as deprecated in the xml.

2016-10-31 Thread klund
GEODE-388: Marking dynamic-region-factory as deprecated in the xml.


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

Branch: refs/heads/feature/GEODE-1930
Commit: 59df3d93e7c51e43685356de82b074531966015f
Parents: b2e7768
Author: Dan Smith 
Authored: Wed Oct 19 10:49:07 2016 -0700
Committer: Dan Smith 
Committed: Thu Oct 20 13:09:12 2016 -0700

--
 .../META-INF/schemas/geode.apache.org/schema/cache/cache-1.0.xsd | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/59df3d93/geode-core/src/main/resources/META-INF/schemas/geode.apache.org/schema/cache/cache-1.0.xsd
--
diff --git 
a/geode-core/src/main/resources/META-INF/schemas/geode.apache.org/schema/cache/cache-1.0.xsd
 
b/geode-core/src/main/resources/META-INF/schemas/geode.apache.org/schema/cache/cache-1.0.xsd
index adf734c..d3d83f1 100755
--- 
a/geode-core/src/main/resources/META-INF/schemas/geode.apache.org/schema/cache/cache-1.0.xsd
+++ 
b/geode-core/src/main/resources/META-INF/schemas/geode.apache.org/schema/cache/cache-1.0.xsd
@@ -1245,7 +1245,11 @@ As of 6.5 disk-dirs is deprecated on region-attributes. 
Use disk-store-name inst
   
   
 
+  deprecated
   
+dynamic-region-factory is deprecated. Use functions to create regions 
dynamically
+instead.
+
 A "dynamic-region-factory" element configures a dynamic region factory 
for
 this cache. If this optional element is missing then the cache does not
 support dynamic regions.



[41/50] [abbrv] incubator-geode git commit: GEODE-2020: for rest api get request, use utf-8 as response encoding.

2016-10-31 Thread klund
GEODE-2020: for rest api get request, use utf-8 as response encoding.

* add more test assertions.
* fix legacy 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/fadd92b0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/fadd92b0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/fadd92b0

Branch: refs/heads/feature/GEODE-1930
Commit: fadd92b0556ac6d3a48ffccbf64100fd94689e62
Parents: af55d92
Author: Jinmei Liao 
Authored: Thu Oct 20 15:28:50 2016 -0700
Committer: Jinmei Liao 
Committed: Fri Oct 21 10:37:54 2016 -0700

--
 .../rest/internal/web/GeodeRestClient.java  | 148 +++
 .../web/RestSecurityIntegrationTest.java| 410 ++-
 .../web/controllers/CommonCrudController.java   |   6 +-
 .../controllers/FunctionAccessController.java   |   2 +-
 .../web/controllers/PdxBasedCrudController.java |   4 +-
 .../web/controllers/QueryAccessController.java  |   4 +-
 6 files changed, 290 insertions(+), 284 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fadd92b0/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
--
diff --git 
a/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
new file mode 100644
index 000..c83cebb
--- /dev/null
+++ 
b/geode-assembly/src/test/java/org/apache/geode/rest/internal/web/GeodeRestClient.java
@@ -0,0 +1,148 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.geode.rest.internal.web;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.MalformedURLException;
+import java.nio.charset.StandardCharsets;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpHost;
+import org.apache.http.HttpResponse;
+import org.apache.http.auth.AuthScope;
+import org.apache.http.auth.UsernamePasswordCredentials;
+import org.apache.http.client.AuthCache;
+import org.apache.http.client.ClientProtocolException;
+import org.apache.http.client.CredentialsProvider;
+import org.apache.http.client.methods.HttpDelete;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpHead;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.client.methods.HttpRequestBase;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.auth.BasicScheme;
+import org.apache.http.impl.client.BasicAuthCache;
+import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.json.JSONTokener;
+import org.junit.Assert;
+
+public class GeodeRestClient {
+
+  public final static String PROTOCOL = "http";
+  public final static String HOSTNAME = "localhost";
+  public final static String CONTEXT = "/geode/v1";
+
+  private int restPort = 0;
+  public GeodeRestClient(int restPort){
+this.restPort = restPort;
+  }
+
+  public HttpResponse doHEAD(String query, String username, String password) 
throws MalformedURLException {
+HttpHead httpHead = new HttpHead(CONTEXT + query);
+return doRequest(httpHead, username, password);
+  }
+
+  public HttpResponse doPost(String query, String username, String password, 
String body) throws MalformedURLException {
+HttpPost httpPost = new HttpPost(CONTEXT + query);
+httpPost.addHeader("content-type", "application/json");
+httpPost.setEntity(new StringEntity(body, StandardCharsets.UTF_8));
+return doRequest(httpPost, username, password);
+  }
+
+  public HttpResponse doPut(String query, String username, String password, 
String body) 

[48/50] [abbrv] incubator-geode git commit: Convert from ManagementTestCase to ManagementTestRule

2016-10-31 Thread klund
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/24f496df/geode-core/src/test/java/org/apache/geode/management/DiskManagementDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/management/DiskManagementDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/management/DiskManagementDUnitTest.java
index 8d7d6d3..7480bf6 100644
--- 
a/geode-core/src/test/java/org/apache/geode/management/DiskManagementDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/management/DiskManagementDUnitTest.java
@@ -16,24 +16,25 @@
  */
 package org.apache.geode.management;
 
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import static java.util.concurrent.TimeUnit.*;
+import static org.assertj.core.api.Assertions.*;
 
 import java.io.File;
-import java.util.Arrays;
-import java.util.List;
+import java.io.Serializable;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
 
 import javax.management.ObjectName;
 
-import org.apache.geode.LogWriter;
+import com.jayway.awaitility.Awaitility;
+import com.jayway.awaitility.core.ConditionFactory;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.DataPolicy;
 import org.apache.geode.cache.DiskStore;
@@ -42,700 +43,366 @@ import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionFactory;
 import org.apache.geode.cache.Scope;
 import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.internal.cache.DiskRegion;
 import org.apache.geode.internal.cache.DiskRegionStats;
 import org.apache.geode.internal.cache.DistributedRegion;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.internal.cache.LocalRegion;
 import org.apache.geode.internal.cache.persistence.PersistentMemberID;
 import org.apache.geode.internal.cache.persistence.PersistentMemberManager;
-import org.apache.geode.management.internal.MBeanJMXAdapter;
+import org.apache.geode.internal.process.ProcessUtils;
+import org.apache.geode.management.internal.SystemManagementService;
 import org.apache.geode.test.dunit.AsyncInvocation;
-import org.apache.geode.test.dunit.SerializableCallable;
-import org.apache.geode.test.dunit.SerializableRunnable;
 import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.dunit.Wait;
-import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import 
org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
 
 /**
  * Test cases to cover all test cases which pertains to disk from Management
  * layer
- * 
- * 
  */
 @Category(DistributedTest.class)
-public class DiskManagementDUnitTest extends ManagementTestBase {
-
-  /**
-   * 
-   */
-  private static final long serialVersionUID = 1L;
+@SuppressWarnings({ "serial", "unused" })
+public class DiskManagementDUnitTest implements Serializable {
 
-  // This must be bigger than the dunit ack-wait-threshold for the revoke
-  // tests. The command line is setting the ack-wait-threshold to be
-  // 60 seconds.
-  private static final int MAX_WAIT = 70 * 1000;
-
-  boolean testFailed = false;
-
-  String failureCause = "";
-  static final String REGION_NAME = "region";
+  private static final String REGION_NAME = 
DiskManagementDUnitTest.class.getSimpleName() + "_region";
 
   private File diskDir;
 
-  protected static LogWriter logWriter;
+  @Manager
+  private VM managerVM;
 
-  public DiskManagementDUnitTest() throws Exception {
-super();
-  
-diskDir = new File("diskDir-" + getName()).getAbsoluteFile();
-org.apache.geode.internal.FileUtil.delete(diskDir);
-diskDir.mkdir();
-diskDir.deleteOnExit();
-  }
+  @Member
+  private VM[] memberVMs;
 
-  @Override
-  protected final void postSetUpManagementTestBase() throws Exception {
-failureCause = "";
-testFailed = false;
-  }
+  @Rule
+  public ManagementTestRule managementTestRule = 
ManagementTestRule.builder().start(true).build();
+
+  @Rule
+  public SerializableTemporaryFolder temporaryFolder = new 
SerializableTemporaryFolder();
 
-  @Override
-  protected final void postTearDownManagementTestBase() throws Exception {
-org.apache.geode.internal.FileUtil.delete(diskDir);
+  @Before
+  public void before() throws Exception {
+this.diskDir = this.temporaryFolder.newFolder("diskDir");
   }
 
   /**
-   * Tests Disk Compaction from a MemberMbean which is at cache level. All the
+   * Tests Disk 

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

2016-10-31 Thread klund
GEODE-1952 Move docs build README; edit build instructions


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

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

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


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

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

[49/50] [abbrv] incubator-geode git commit: Convert from ManagementTestCase to ManagementTestRule

2016-10-31 Thread klund
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/24f496df/geode-core/src/test/java/org/apache/geode/management/ClientHealthStatsDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/management/ClientHealthStatsDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/management/ClientHealthStatsDUnitTest.java
index 74e0850..4ccb716 100644
--- 
a/geode-core/src/test/java/org/apache/geode/management/ClientHealthStatsDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/management/ClientHealthStatsDUnitTest.java
@@ -16,13 +16,25 @@
  */
 package org.apache.geode.management;
 
+import static java.util.concurrent.TimeUnit.*;
 import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.test.dunit.Assert.*;
+import static org.apache.geode.test.dunit.Host.*;
+import static org.apache.geode.test.dunit.IgnoredException.*;
+import static org.apache.geode.test.dunit.Invoke.*;
+import static org.apache.geode.test.dunit.NetworkUtils.*;
+import static org.assertj.core.api.Assertions.*;
 
+import java.io.Serializable;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.Properties;
 
+import javax.management.ObjectName;
+
+import com.jayway.awaitility.Awaitility;
+import com.jayway.awaitility.core.ConditionFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -31,22 +43,17 @@ import org.apache.geode.cache.EntryEvent;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionFactory;
 import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientCache;
 import org.apache.geode.cache.client.ClientCacheFactory;
 import org.apache.geode.cache.client.ClientRegionFactory;
 import org.apache.geode.cache.client.ClientRegionShortcut;
 import org.apache.geode.cache.server.CacheServer;
 import org.apache.geode.cache.util.CacheListenerAdapter;
 import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
 import org.apache.geode.internal.cache.tier.sockets.CacheClientNotifier;
 import org.apache.geode.internal.cache.tier.sockets.CacheClientProxy;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.test.dunit.Host;
-import org.apache.geode.test.dunit.IgnoredException;
+import org.apache.geode.management.internal.SystemManagementService;
 import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.dunit.Wait;
-import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
 import org.apache.geode.test.junit.categories.DistributedTest;
 import org.apache.geode.test.junit.categories.FlakyTest;
 
@@ -54,391 +61,343 @@ import org.apache.geode.test.junit.categories.FlakyTest;
  * Client health stats check
  */
 @Category(DistributedTest.class)
-@SuppressWarnings("serial")
-public class ClientHealthStatsDUnitTest extends JUnit4DistributedTestCase {
-
-  private static final String k1 = "k1";
-  private static final String k2 = "k2";
-  private static final String client_k1 = "client-k1";
-  private static final String client_k2 = "client-k2";
-
-  /** name of the test region */
-  private static final String REGION_NAME = 
"ClientHealthStatsDUnitTest_Region";
-
-  private static VM client = null;
-  private static VM client2 = null;
-  private static VM managingNode = null;
-
-  private static ManagementTestBase helper = new ManagementTestBase(){};
-  
-  private static int numOfCreates = 0;
-  private static int numOfUpdates = 0;
-  private static int numOfInvalidates = 0;
-  private static boolean lastKeyReceived = false;
-  
-  private static GemFireCacheImpl cache = null;
-
-  private VM server = null;
-
-  @Override
-  public final void postSetUp() throws Exception {
-disconnectAllFromDS();
-
-final Host host = Host.getHost(0);
-managingNode = host.getVM(0);
-server = host.getVM(1);
-client = host.getVM(2);
-client2 = host.getVM(3);
-
-IgnoredException.addIgnoredException("Connection reset");
-  }
+@SuppressWarnings({ "serial", "unused" })
+public class ClientHealthStatsDUnitTest implements Serializable {
+
+  private static final int NUMBER_PUTS = 100;
+
+  private static final String KEY1 = "KEY1";
+  private static final String KEY2 = "KEY2";
+  private static final String VALUE1 = "VALUE1";
+  private static final String VALUE2 = "VALUE2";
+
+  private static final String REGION_NAME = 
ClientHealthStatsDUnitTest.class.getSimpleName() + "_Region";
+
+  // client1VM and client2VM VM fields
+  private static ClientCache clientCache;
+
+  // TODO: assert following values in each client VM
+  private static int numOfCreates;
+  private static int numOfUpdates;
+  private static int numOfInvalidates;
+  private static boolean 

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

2016-10-31 Thread klund
GEODE-2007: fix unchecked warnings


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

Branch: refs/heads/feature/GEODE-1930
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();


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

2016-10-31 Thread klund
GEODE-1952 Add output, final_app dirs to rat exclusions


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

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

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


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



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

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

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

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


[30/50] [abbrv] incubator-geode git commit: Adding a docker container to build and view the geode docs

2016-10-31 Thread klund
Adding a docker container to build and view the geode docs


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

Branch: refs/heads/feature/GEODE-1930
Commit: bc7a675a7c2d819c5d99f070d29e485cf1c0ad64
Parents: e130e5b
Author: Dan Smith 
Authored: Fri Oct 14 17:54:12 2016 -0700
Committer: Dan Smith 
Committed: Wed Oct 19 10:19:16 2016 -0700

--
 dev-tools/docker/docs/Dockerfile| 25 ++
 dev-tools/docker/docs/build-docs.sh | 32 +
 dev-tools/docker/docs/build-image-common.sh | 61 
 dev-tools/docker/docs/view-docs.sh  | 35 ++
 4 files changed, 153 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bc7a675a/dev-tools/docker/docs/Dockerfile
--
diff --git a/dev-tools/docker/docs/Dockerfile b/dev-tools/docker/docs/Dockerfile
new file mode 100644
index 000..67a31f4
--- /dev/null
+++ b/dev-tools/docker/docs/Dockerfile
@@ -0,0 +1,25 @@
+# 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.
+
+FROM ruby:2.3.0
+MAINTAINER Geode Community 
+
+LABEL Vendor="Apache Geode (incubating)"
+LABEL version=unstable
+
+ADD Gemfile Gemfile
+ADD Gemfile.lock Gemfile.lock
+RUN bundle install

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bc7a675a/dev-tools/docker/docs/build-docs.sh
--
diff --git a/dev-tools/docker/docs/build-docs.sh 
b/dev-tools/docker/docs/build-docs.sh
new file mode 100755
index 000..4b670b0
--- /dev/null
+++ b/dev-tools/docker/docs/build-docs.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# 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.
+
+set -e -x -u
+
+. $SCRIPT_DIR/build-image-common.sh
+
+docker run -i -t \
+  --rm=true \
+  -w "/home/${USER_NAME}/incubator-geode/geode-book" \
+  -u "${USER_NAME}" \
+  -v "$PWD:/home/${USER_NAME}/incubator-geode" \
+  -v "/home/${USER_NAME}/.m2:/home/${USER_NAME}/.m2" \
+  ${IMAGE_NAME}-${USER_NAME} \
+  bundle exec bookbinder bind local
+
+popd
+

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bc7a675a/dev-tools/docker/docs/build-image-common.sh
--
diff --git a/dev-tools/docker/docs/build-image-common.sh 
b/dev-tools/docker/docs/build-image-common.sh
new file mode 100644
index 000..ff0de73
--- /dev/null
+++ b/dev-tools/docker/docs/build-image-common.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+# 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, 

[47/50] [abbrv] incubator-geode git commit: Convert from ManagementTestCase to ManagementTestRule

2016-10-31 Thread klund
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/24f496df/geode-core/src/test/java/org/apache/geode/management/LocatorManagementDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/management/LocatorManagementDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/management/LocatorManagementDUnitTest.java
index a426096..a91a2e1 100644
--- 
a/geode-core/src/test/java/org/apache/geode/management/LocatorManagementDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/management/LocatorManagementDUnitTest.java
@@ -16,54 +16,82 @@
  */
 package org.apache.geode.management;
 
+import static java.util.concurrent.TimeUnit.*;
 import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.internal.AvailablePortHelper.*;
+import static org.apache.geode.test.dunit.Host.*;
+import static org.apache.geode.test.dunit.NetworkUtils.*;
+import static org.assertj.core.api.Assertions.*;
 
 import java.io.File;
-import java.io.IOException;
+import java.io.Serializable;
 import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.util.Properties;
 
+import javax.management.ObjectName;
+
+import com.jayway.awaitility.Awaitility;
+import com.jayway.awaitility.core.ConditionFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.distributed.Locator;
 import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.distributed.internal.InternalLocator;
-import org.apache.geode.internal.AvailablePortHelper;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.management.internal.ManagementConstants;
-import org.apache.geode.test.dunit.Assert;
+import org.apache.geode.management.internal.SystemManagementService;
 import org.apache.geode.test.dunit.Host;
-import org.apache.geode.test.dunit.LogWriterUtils;
-import org.apache.geode.test.dunit.SerializableCallable;
 import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.dunit.Wait;
-import org.apache.geode.test.dunit.WaitCriterion;
 import org.apache.geode.test.junit.categories.DistributedTest;
+import 
org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
+import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
 
 /**
- * Test cases
- * 
- * DistributedSystem Cache Locator no no yes yes no yes yes yes yes
+ * Distributed tests for managing {@code Locator} with {@link LocatorMXBean}.
  */
 @Category(DistributedTest.class)
-public class LocatorManagementDUnitTest extends ManagementTestBase {
+@SuppressWarnings({ "serial", "unused" })
+public class LocatorManagementDUnitTest implements Serializable {
+
+  private static final int MAX_WAIT_MILLIS = 120 * 1000;
+
+  private static final int ZERO = 0;
+
+  @Manager
+  private VM managerVM;
+  @Member
+  private VM[] membersVM;
+  private VM locatorVM;
 
-  private static final int MAX_WAIT = 8 * ManagementConstants.REFRESH_TIME;
+  private String hostName;
+  private int port;
 
-  private VM locator;
+  @Rule
+  public ManagementTestRule managementTestRule = 
ManagementTestRule.builder().build();
 
-  @Override
-  protected final void postSetUpManagementTestBase() throws Exception {
-locator = managedNode1;
+  @Rule
+  public SerializableTemporaryFolder temporaryFolder = new 
SerializableTemporaryFolder();
+
+  @Rule
+  public SerializableTestName testName = new SerializableTestName();
+
+  @Before
+  public void before() throws Exception {
+//this.managerVM = managingNode;
+//this.membersVM = getManagedNodeList().toArray(new 
VM[getManagedNodeList().size()]);
+this.locatorVM = this.membersVM[0];
+this.hostName = getServerHostName(getHost(0));
+this.port = getRandomAvailableTCPPort();
   }
 
-  @Override
-  protected final void preTearDownManagementTestBase() throws Exception {
-stopLocator(locator);
+  @After
+  public void after() throws Exception {
+stopLocator(this.locatorVM);
   }
 
   /**
@@ -72,48 +100,52 @@ public class LocatorManagementDUnitTest extends 
ManagementTestBase {
*/
   @Test
   public void testPeerLocation() throws Exception {
-int locPort = AvailablePortHelper.getRandomAvailableTCPPort();
-startLocator(locator, true, locPort);
-locatorMBeanExist(locator, locPort, true);
+startLocator(this.locatorVM, true, this.port);
+
+verifyLocalLocatorMXBean(this.locatorVM, this.port, true);
 
-Host host = Host.getHost(0);
-String host0 = getServerHostName(host);
 Properties props = new Properties();
 props.setProperty(MCAST_PORT, "0");
-props.setProperty(LOCATORS, host0 + "[" + locPort

[36/50] [abbrv] incubator-geode git commit: GEODE-2022: Marking testRRPRLocalQueryingWithHetroIndexes as flaky

2016-10-31 Thread klund
GEODE-2022: Marking testRRPRLocalQueryingWithHetroIndexes as flaky


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

Branch: refs/heads/feature/GEODE-1930
Commit: 7e659b2381eae3847d1c7e29bb1b37df518dde35
Parents: 59df3d9
Author: Dan Smith 
Authored: Thu Oct 20 13:07:35 2016 -0700
Committer: Dan Smith 
Committed: Thu Oct 20 13:09:12 2016 -0700

--
 .../cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java  | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/7e659b23/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
index c9e5084..3e8250b 100644
--- 
a/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/cache/query/partitioned/PRColocatedEquiJoinDUnitTest.java
@@ -19,6 +19,7 @@
  */
 package org.apache.geode.cache.query.partitioned;
 
+import org.apache.geode.test.junit.categories.FlakyTest;
 import org.junit.experimental.categories.Category;
 import org.junit.Test;
 
@@ -1341,6 +1342,7 @@ public class PRColocatedEquiJoinDUnitTest extends 
PartitionedRegionDUnitTestCase
 
 
   @Test
+  @Category(FlakyTest.class) // GEODE-2022
   public void testRRPRLocalQueryingWithHetroIndexes() throws Exception {
 
 Host host = Host.getHost(0);



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

2016-10-31 Thread klund
GEODE-1952: Change Project G to Apache G; other edits


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

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

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


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


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

2016-10-31 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/feature/GEODE-1930
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);



[01/50] [abbrv] incubator-geode git commit: GEODE-999: remove accidentally checked in file. [Forced Update!]

2016-10-31 Thread klund
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-1930 86a3fb5a6 -> 24f496df4 (forced update)


GEODE-999: remove accidentally checked in file.


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

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

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


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



[46/50] [abbrv] incubator-geode git commit: Convert from ManagementTestCase to ManagementTestRule

2016-10-31 Thread klund
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/24f496df/geode-core/src/test/java/org/apache/geode/management/OffHeapManagementDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/management/OffHeapManagementDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/management/OffHeapManagementDUnitTest.java
index 9fb9ab0..c02a220 100644
--- 
a/geode-core/src/test/java/org/apache/geode/management/OffHeapManagementDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/management/OffHeapManagementDUnitTest.java
@@ -16,6 +16,7 @@
  */
 package org.apache.geode.management;
 
+import static com.jayway.awaitility.Awaitility.*;
 import static org.apache.geode.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
@@ -23,8 +24,11 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+
 import javax.management.Attribute;
 import javax.management.AttributeList;
+import javax.management.JMException;
 import javax.management.MBeanServer;
 import javax.management.Notification;
 import javax.management.NotificationListener;
@@ -38,102 +42,99 @@ import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.DataPolicy;
 import org.apache.geode.cache.Region;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.internal.offheap.OffHeapMemoryStats;
 import org.apache.geode.internal.offheap.OffHeapStorage;
 import org.apache.geode.internal.offheap.OffHeapStoredObject;
 import org.apache.geode.management.internal.MBeanJMXAdapter;
 import org.apache.geode.management.internal.beans.MemberMBean;
 import org.apache.geode.test.dunit.Host;
-import org.apache.geode.test.dunit.SerializableCallable;
 import org.apache.geode.test.dunit.SerializableRunnable;
 import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.dunit.Wait;
-import org.apache.geode.test.dunit.WaitCriterion;
 import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
 import org.apache.geode.test.junit.categories.DistributedTest;
 
 /**
  * Tests the off-heap additions to the RegionMXBean and MemberMXBean JMX 
interfaces.
  */
-@SuppressWarnings("serial")
 @Category(DistributedTest.class)
+@SuppressWarnings("serial")
 public class OffHeapManagementDUnitTest extends JUnit4CacheTestCase {
+
   /**
* Specified assertion operations.
*/
-  private static enum ASSERT_OP {
+  private enum ASSERT_OP {
 EQUAL,
 GREATER_THAN,
 GREATER_THAN_OR_EQUAL,
 LESS_THAN
   }
-  
+
   /**
* Name of off-heap test region.
*/
   private static final String OFF_HEAP_REGION_NAME = "offHeapRegion";
-  
+
   /**
* Path of off-heap test region.
*/
   private static final String OFF_HEAP_REGION_PATH = "/" + 
OFF_HEAP_REGION_NAME;
-  
+
   /**
* Expected total off-heap reserved memory (1 megabyte).
*/
   private static final long TOTAL_MEMORY = 1048576;
-  
+
   /**
* Half of expected memory total.
*/
   private static final int HALF_TOTAL_MEMORY = (int) (TOTAL_MEMORY / 2);
-  
+
   /**
* An arbitrary array size.
*/
   private static final int ALLOCATION_SIZE = 10;
-  
+
   /**
* A non-arbitrary array size.
*/
   private static final int NEW_ALLOCATION_SIZE = 40;
-  
+
   /**
* Java object serialization overhead.
*/
   private static final int OBJECT_OVERHEAD = 8;
-  
+
   /**
* A region entry key.
*/
   private static final String KEY = "key";
-  
+
   /**
* Another region entry key.
*/
   private static final String KEY2 = "key2";
-  
+
   /**
* Yet another region entry key.
*/
   private static final String KEY3 = "key3";
-  
+
   /**
* A region entry value.
*/
-  private static final byte[] VALUE = "Proin lobortis enim vel sem congue ut 
condimentum leo rhoncus. In turpis lorem, rhoncus nec rutrum vel, sodales vitae 
lacus. Etiam nunc ligula, scelerisque id egestas vitae, gravida non enim. Donec 
ac ligula purus. Mauris gravida ligula sit amet mi ornare blandit. Aliquam at 
velit ac enim varius malesuada ut eu tortor. Quisque diam nisi, fermentum vel 
accumsan at, commodo et velit.".getBytes();
-  
+  private static final byte[] VALUE = "Proin lobortis enim vel sem congue ut 
condimentum leo rhoncus. In turpis lorem, rhoncus nec rutrum vel, sodales vitae 
lacus. Etiam nunc ligula, scelerisque id egestas vitae, gravida non enim. Donec 
ac ligula purus. Mauris gravida ligula sit amet mi ornare blandit. Aliquam at 
velit ac enim varius malesuada ut eu tortor. Quisque diam nisi, fermentum vel 
accumsan at, commodo et velit."
+.getBytes();
+
   /**
* The expected size of the region entry value in off-heap memory.
*/
   private static final int OBJECT_SIZE = VALUE.length + OBJECT_OVERHEAD;
-  
+
   /**
* 

[6/8] incubator-geode git commit: Convert from ManagementTestCase to ManagementTestRule

2016-10-31 Thread klund
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/86a3fb5a/geode-core/src/test/java/org/apache/geode/management/DiskManagementDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/management/DiskManagementDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/management/DiskManagementDUnitTest.java
index 8d7d6d3..7480bf6 100644
--- 
a/geode-core/src/test/java/org/apache/geode/management/DiskManagementDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/management/DiskManagementDUnitTest.java
@@ -16,24 +16,25 @@
  */
 package org.apache.geode.management;
 
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
-import static org.junit.Assert.*;
-
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
+import static java.util.concurrent.TimeUnit.*;
+import static org.assertj.core.api.Assertions.*;
 
 import java.io.File;
-import java.util.Arrays;
-import java.util.List;
+import java.io.Serializable;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
 
 import javax.management.ObjectName;
 
-import org.apache.geode.LogWriter;
+import com.jayway.awaitility.Awaitility;
+import com.jayway.awaitility.core.ConditionFactory;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.DataPolicy;
 import org.apache.geode.cache.DiskStore;
@@ -42,700 +43,366 @@ import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionFactory;
 import org.apache.geode.cache.Scope;
 import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.internal.cache.DiskRegion;
 import org.apache.geode.internal.cache.DiskRegionStats;
 import org.apache.geode.internal.cache.DistributedRegion;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.internal.cache.LocalRegion;
 import org.apache.geode.internal.cache.persistence.PersistentMemberID;
 import org.apache.geode.internal.cache.persistence.PersistentMemberManager;
-import org.apache.geode.management.internal.MBeanJMXAdapter;
+import org.apache.geode.internal.process.ProcessUtils;
+import org.apache.geode.management.internal.SystemManagementService;
 import org.apache.geode.test.dunit.AsyncInvocation;
-import org.apache.geode.test.dunit.SerializableCallable;
-import org.apache.geode.test.dunit.SerializableRunnable;
 import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.dunit.Wait;
-import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.junit.categories.DistributedTest;
+import 
org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
 
 /**
  * Test cases to cover all test cases which pertains to disk from Management
  * layer
- * 
- * 
  */
 @Category(DistributedTest.class)
-public class DiskManagementDUnitTest extends ManagementTestBase {
-
-  /**
-   * 
-   */
-  private static final long serialVersionUID = 1L;
+@SuppressWarnings({ "serial", "unused" })
+public class DiskManagementDUnitTest implements Serializable {
 
-  // This must be bigger than the dunit ack-wait-threshold for the revoke
-  // tests. The command line is setting the ack-wait-threshold to be
-  // 60 seconds.
-  private static final int MAX_WAIT = 70 * 1000;
-
-  boolean testFailed = false;
-
-  String failureCause = "";
-  static final String REGION_NAME = "region";
+  private static final String REGION_NAME = 
DiskManagementDUnitTest.class.getSimpleName() + "_region";
 
   private File diskDir;
 
-  protected static LogWriter logWriter;
+  @Manager
+  private VM managerVM;
 
-  public DiskManagementDUnitTest() throws Exception {
-super();
-  
-diskDir = new File("diskDir-" + getName()).getAbsoluteFile();
-org.apache.geode.internal.FileUtil.delete(diskDir);
-diskDir.mkdir();
-diskDir.deleteOnExit();
-  }
+  @Member
+  private VM[] memberVMs;
 
-  @Override
-  protected final void postSetUpManagementTestBase() throws Exception {
-failureCause = "";
-testFailed = false;
-  }
+  @Rule
+  public ManagementTestRule managementTestRule = 
ManagementTestRule.builder().start(true).build();
+
+  @Rule
+  public SerializableTemporaryFolder temporaryFolder = new 
SerializableTemporaryFolder();
 
-  @Override
-  protected final void postTearDownManagementTestBase() throws Exception {
-org.apache.geode.internal.FileUtil.delete(diskDir);
+  @Before
+  public void before() throws Exception {
+this.diskDir = this.temporaryFolder.newFolder("diskDir");
   }
 
   /**
-   * Tests Disk Compaction from a MemberMbean which is at cache level. All the
+   * Tests Disk 

[1/8] incubator-geode git commit: Convert from ManagementTestCase to ManagementTestRule [Forced Update!]

2016-10-31 Thread klund
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-1930 a83f8c02f -> 86a3fb5a6 (forced update)


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/86a3fb5a/geode-core/src/test/java/org/apache/geode/management/bean/stats/DistributedSystemStatsDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/management/bean/stats/DistributedSystemStatsDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/management/bean/stats/DistributedSystemStatsDUnitTest.java
index 2330031..446ea2e 100644
--- 
a/geode-core/src/test/java/org/apache/geode/management/bean/stats/DistributedSystemStatsDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/management/bean/stats/DistributedSystemStatsDUnitTest.java
@@ -16,98 +16,66 @@
  */
 package org.apache.geode.management.bean.stats;
 
-import org.junit.experimental.categories.Category;
-import org.junit.Test;
-
+import static com.jayway.awaitility.Awaitility.*;
 import static org.junit.Assert.*;
 
-import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
-import org.apache.geode.test.junit.categories.DistributedTest;
-
+import java.lang.management.ManagementFactory;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 
 import javax.management.ObjectName;
 
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
 import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.internal.cache.DiskStoreStats;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
 import org.apache.geode.management.DistributedSystemMXBean;
-import org.apache.geode.management.ManagementTestBase;
+import org.apache.geode.management.ManagementService;
+import org.apache.geode.management.ManagementTestRule;
+import org.apache.geode.management.Manager;
+import org.apache.geode.management.Member;
 import org.apache.geode.management.MemberMXBean;
 import org.apache.geode.management.internal.SystemManagementService;
-import org.apache.geode.management.internal.beans.MemberMBean;
-import org.apache.geode.management.internal.beans.MemberMBeanBridge;
-import org.apache.geode.test.dunit.Assert;
-import org.apache.geode.test.dunit.SerializableRunnable;
 import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.junit.categories.DistributedTest;
 
-/**
- */
 @Category(DistributedTest.class)
-public class DistributedSystemStatsDUnitTest extends ManagementTestBase{
-  
-  private static final long serialVersionUID = 1L;
+@SuppressWarnings("serial")
+public class DistributedSystemStatsDUnitTest {
 
-  public DistributedSystemStatsDUnitTest() {
-super();
-  }
+  @Manager
+  private VM manager;
+
+  @Member
+  private VM[] members;
+
+  @Rule
+  public ManagementTestRule managementTestRule = 
ManagementTestRule.builder().build();
 
   @Test
   public void testDistributedSystemStats() throws Exception {
-initManagement(true);
+this.manager.invoke("verifyMBeans", () -> {
+  GemFireCacheImpl cache = GemFireCacheImpl.getInstance();
+  assertNotNull(cache);
 
-for(VM vm : managedNodeList){
-  setDiskStats(vm);
-}
-verifyDiskStats(managingNode);
-  }
-  
-  @SuppressWarnings("serial")
-  public void setDiskStats(VM vm1) throws Exception {
-vm1.invoke(new SerializableRunnable("Set Member Stats") {
-  public void run() {
-MemberMBean bean = (MemberMBean) managementService.getMemberMXBean();
-MemberMBeanBridge bridge = bean.getBridge();
-DiskStoreStats diskStoreStats = new DiskStoreStats(basicGetSystem(), 
"test");
-bridge.addDiskStoreStats(diskStoreStats);
-diskStoreStats.startRead();
-diskStoreStats.startWrite();
-diskStoreStats.startBackup();
-diskStoreStats.startRecovery();
-diskStoreStats.incWrittenBytes(20, true);
-diskStoreStats.startFlush();
-diskStoreStats.setQueueSize(10);
-  }
-});
-  }
+  SystemManagementService service = (SystemManagementService) 
ManagementService.getManagementService(cache);
+  DistributedSystemMXBean distributedSystemMXBean = 
service.getDistributedSystemMXBean();
+  assertNotNull(distributedSystemMXBean);
+
+  Set otherMemberSet = 
cache.getDistributionManager().getOtherNormalDistributionManagerIds();
+  assertEquals(3, otherMemberSet.size());
+
+  for (DistributedMember member : otherMemberSet) {
+ObjectName memberMXBeanName = service.getMemberMBeanName(member);
+await().atMost(2, TimeUnit.MINUTES).until(() -> 
assertTrue(ManagementFactory.getPlatformMBeanServer().isRegistered(memberMXBeanName)));
 
-  @SuppressWarnings("serial")
-  public void verifyDiskStats(VM vm1) throws Exception {
-vm1.invoke(new SerializableRunnable("Set Member Stats") {
-  public void run() {
-GemFireCacheImpl cache = 

[3/8] incubator-geode git commit: Convert from ManagementTestCase to ManagementTestRule

2016-10-31 Thread klund
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/86a3fb5a/geode-core/src/test/java/org/apache/geode/management/QueryDataDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/management/QueryDataDUnitTest.java 
b/geode-core/src/test/java/org/apache/geode/management/QueryDataDUnitTest.java
index f4b135e..7f93c0d 100644
--- 
a/geode-core/src/test/java/org/apache/geode/management/QueryDataDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/management/QueryDataDUnitTest.java
@@ -16,866 +16,655 @@
  */
 package org.apache.geode.management;
 
-import static org.apache.geode.cache.query.Utils.createPortfoliosAndPositions;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.io.IOException;
+import static com.jayway.jsonpath.matchers.JsonPathMatchers.*;
+import static java.util.concurrent.TimeUnit.*;
+import static org.apache.geode.cache.FixedPartitionAttributes.*;
+import static org.apache.geode.cache.query.Utils.*;
+import static org.apache.geode.management.internal.ManagementConstants.*;
+import static org.apache.geode.management.internal.ManagementStrings.*;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.assertThat;
+
+import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeoutException;
+
+import javax.management.ObjectName;
+
+import com.jayway.awaitility.Awaitility;
+import com.jayway.awaitility.core.ConditionFactory;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
 
 import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.CacheException;
-import org.apache.geode.cache.CacheFactory;
 import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.EntryOperation;
 import org.apache.geode.cache.FixedPartitionAttributes;
 import org.apache.geode.cache.PartitionAttributesFactory;
+import org.apache.geode.cache.PartitionResolver;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionFactory;
 import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.cache.query.data.Portfolio;
-import org.apache.geode.cache.query.dunit.QueryUsingFunctionContextDUnitTest;
-import org.apache.geode.cache30.CacheSerializableRunnable;
+import org.apache.geode.cache.query.data.Portfolio; // TODO
 import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.internal.cache.BucketRegion;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
 import org.apache.geode.internal.cache.PartitionedRegion;
 import org.apache.geode.internal.cache.PartitionedRegionHelper;
-import 
org.apache.geode.internal.cache.partitioned.fixed.SingleHopQuarterPartitionResolver;
-import org.apache.geode.management.internal.ManagementConstants;
-import org.apache.geode.management.internal.ManagementStrings;
+import 
org.apache.geode.internal.cache.partitioned.fixed.SingleHopQuarterPartitionResolver;
 // TODO
 import org.apache.geode.management.internal.SystemManagementService;
 import org.apache.geode.management.internal.beans.BeanUtilFuncs;
 import org.apache.geode.management.internal.cli.json.TypedJson;
 import org.apache.geode.pdx.PdxInstance;
 import org.apache.geode.pdx.PdxInstanceFactory;
 import org.apache.geode.pdx.internal.PdxInstanceFactoryImpl;
-import org.apache.geode.test.dunit.LogWriterUtils;
-import org.apache.geode.test.dunit.SerializableRunnable;
-import org.apache.geode.test.dunit.Wait;
-import org.apache.geode.test.dunit.WaitCriterion;
+import org.apache.geode.test.dunit.VM;
+import org.apache.geode.test.dunit.rules.DistributedUseJacksonForJsonPathRule;
 import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
+import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
 
 /**
- * 
- * 
+ * Distributed tests for {@link DistributedSystemMXBean#queryData(String, 
String, int)}.
+ * 
+ * 
+ * Test Basic Json Strings for Partitioned Regions
+ * Test Basic Json Strings for Replicated Regions
+ * Test for all Region Types
+ * Test for primitive types
+ * Test for Nested Objects
+ * Test for Enums
+ * Test for collections
+ * Test for huge collection
+ * Test PDX types
+ * Test different projects type e.g. SelectResult, normal bean etc..
+ * Test Colocated Regions

[4/8] incubator-geode git commit: Convert from ManagementTestCase to ManagementTestRule

2016-10-31 Thread klund
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/86a3fb5a/geode-core/src/test/java/org/apache/geode/management/OffHeapManagementDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/management/OffHeapManagementDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/management/OffHeapManagementDUnitTest.java
index 9fb9ab0..c02a220 100644
--- 
a/geode-core/src/test/java/org/apache/geode/management/OffHeapManagementDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/management/OffHeapManagementDUnitTest.java
@@ -16,6 +16,7 @@
  */
 package org.apache.geode.management;
 
+import static com.jayway.awaitility.Awaitility.*;
 import static org.apache.geode.distributed.ConfigurationProperties.*;
 import static org.junit.Assert.*;
 
@@ -23,8 +24,11 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+
 import javax.management.Attribute;
 import javax.management.AttributeList;
+import javax.management.JMException;
 import javax.management.MBeanServer;
 import javax.management.Notification;
 import javax.management.NotificationListener;
@@ -38,102 +42,99 @@ import org.apache.geode.cache.Cache;
 import org.apache.geode.cache.DataPolicy;
 import org.apache.geode.cache.Region;
 import org.apache.geode.distributed.internal.InternalDistributedSystem;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.internal.offheap.OffHeapMemoryStats;
 import org.apache.geode.internal.offheap.OffHeapStorage;
 import org.apache.geode.internal.offheap.OffHeapStoredObject;
 import org.apache.geode.management.internal.MBeanJMXAdapter;
 import org.apache.geode.management.internal.beans.MemberMBean;
 import org.apache.geode.test.dunit.Host;
-import org.apache.geode.test.dunit.SerializableCallable;
 import org.apache.geode.test.dunit.SerializableRunnable;
 import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.dunit.Wait;
-import org.apache.geode.test.dunit.WaitCriterion;
 import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase;
 import org.apache.geode.test.junit.categories.DistributedTest;
 
 /**
  * Tests the off-heap additions to the RegionMXBean and MemberMXBean JMX 
interfaces.
  */
-@SuppressWarnings("serial")
 @Category(DistributedTest.class)
+@SuppressWarnings("serial")
 public class OffHeapManagementDUnitTest extends JUnit4CacheTestCase {
+
   /**
* Specified assertion operations.
*/
-  private static enum ASSERT_OP {
+  private enum ASSERT_OP {
 EQUAL,
 GREATER_THAN,
 GREATER_THAN_OR_EQUAL,
 LESS_THAN
   }
-  
+
   /**
* Name of off-heap test region.
*/
   private static final String OFF_HEAP_REGION_NAME = "offHeapRegion";
-  
+
   /**
* Path of off-heap test region.
*/
   private static final String OFF_HEAP_REGION_PATH = "/" + 
OFF_HEAP_REGION_NAME;
-  
+
   /**
* Expected total off-heap reserved memory (1 megabyte).
*/
   private static final long TOTAL_MEMORY = 1048576;
-  
+
   /**
* Half of expected memory total.
*/
   private static final int HALF_TOTAL_MEMORY = (int) (TOTAL_MEMORY / 2);
-  
+
   /**
* An arbitrary array size.
*/
   private static final int ALLOCATION_SIZE = 10;
-  
+
   /**
* A non-arbitrary array size.
*/
   private static final int NEW_ALLOCATION_SIZE = 40;
-  
+
   /**
* Java object serialization overhead.
*/
   private static final int OBJECT_OVERHEAD = 8;
-  
+
   /**
* A region entry key.
*/
   private static final String KEY = "key";
-  
+
   /**
* Another region entry key.
*/
   private static final String KEY2 = "key2";
-  
+
   /**
* Yet another region entry key.
*/
   private static final String KEY3 = "key3";
-  
+
   /**
* A region entry value.
*/
-  private static final byte[] VALUE = "Proin lobortis enim vel sem congue ut 
condimentum leo rhoncus. In turpis lorem, rhoncus nec rutrum vel, sodales vitae 
lacus. Etiam nunc ligula, scelerisque id egestas vitae, gravida non enim. Donec 
ac ligula purus. Mauris gravida ligula sit amet mi ornare blandit. Aliquam at 
velit ac enim varius malesuada ut eu tortor. Quisque diam nisi, fermentum vel 
accumsan at, commodo et velit.".getBytes();
-  
+  private static final byte[] VALUE = "Proin lobortis enim vel sem congue ut 
condimentum leo rhoncus. In turpis lorem, rhoncus nec rutrum vel, sodales vitae 
lacus. Etiam nunc ligula, scelerisque id egestas vitae, gravida non enim. Donec 
ac ligula purus. Mauris gravida ligula sit amet mi ornare blandit. Aliquam at 
velit ac enim varius malesuada ut eu tortor. Quisque diam nisi, fermentum vel 
accumsan at, commodo et velit."
+.getBytes();
+
   /**
* The expected size of the region entry value in off-heap memory.
*/
   private static final int OBJECT_SIZE = VALUE.length + OBJECT_OVERHEAD;
-  
+
   /**
* 

[7/8] incubator-geode git commit: Convert from ManagementTestCase to ManagementTestRule

2016-10-31 Thread klund
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/86a3fb5a/geode-core/src/test/java/org/apache/geode/management/ClientHealthStatsDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/management/ClientHealthStatsDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/management/ClientHealthStatsDUnitTest.java
index a62bb06..523c98f 100644
--- 
a/geode-core/src/test/java/org/apache/geode/management/ClientHealthStatsDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/management/ClientHealthStatsDUnitTest.java
@@ -16,13 +16,25 @@
  */
 package org.apache.geode.management;
 
+import static java.util.concurrent.TimeUnit.*;
 import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.apache.geode.test.dunit.Assert.*;
+import static org.apache.geode.test.dunit.Host.*;
+import static org.apache.geode.test.dunit.IgnoredException.*;
+import static org.apache.geode.test.dunit.Invoke.*;
+import static org.apache.geode.test.dunit.NetworkUtils.*;
+import static org.assertj.core.api.Assertions.*;
 
+import java.io.Serializable;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.Properties;
 
+import javax.management.ObjectName;
+
+import com.jayway.awaitility.Awaitility;
+import com.jayway.awaitility.core.ConditionFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -31,412 +43,360 @@ import org.apache.geode.cache.EntryEvent;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionFactory;
 import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.cache.client.ClientCache;
 import org.apache.geode.cache.client.ClientCacheFactory;
 import org.apache.geode.cache.client.ClientRegionFactory;
 import org.apache.geode.cache.client.ClientRegionShortcut;
 import org.apache.geode.cache.server.CacheServer;
 import org.apache.geode.cache.util.CacheListenerAdapter;
 import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
 import org.apache.geode.internal.cache.tier.sockets.CacheClientNotifier;
 import org.apache.geode.internal.cache.tier.sockets.CacheClientProxy;
-import org.apache.geode.internal.i18n.LocalizedStrings;
-import org.apache.geode.test.dunit.Host;
-import org.apache.geode.test.dunit.IgnoredException;
+import org.apache.geode.management.internal.SystemManagementService;
 import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.dunit.Wait;
-import org.apache.geode.test.dunit.WaitCriterion;
-import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase;
 import org.apache.geode.test.junit.categories.DistributedTest;
 
 /**
  * Client health stats check
  */
 @Category(DistributedTest.class)
-@SuppressWarnings("serial")
-public class ClientHealthStatsDUnitTest extends JUnit4DistributedTestCase {
-
-  private static final String k1 = "k1";
-  private static final String k2 = "k2";
-  private static final String client_k1 = "client-k1";
-  private static final String client_k2 = "client-k2";
-
-  /** name of the test region */
-  private static final String REGION_NAME = 
"ClientHealthStatsDUnitTest_Region";
-
-  private static VM client = null;
-  private static VM client2 = null;
-  private static VM managingNode = null;
-
-  private static ManagementTestBase helper = new ManagementTestBase(){};
-  
-  private static int numOfCreates = 0;
-  private static int numOfUpdates = 0;
-  private static int numOfInvalidates = 0;
-  private static boolean lastKeyReceived = false;
-  
-  private static GemFireCacheImpl cache = null;
-
-  private VM server = null;
-
-  @Override
-  public final void postSetUp() throws Exception {
-disconnectAllFromDS();
-
-final Host host = Host.getHost(0);
-managingNode = host.getVM(0);
-server = host.getVM(1);
-client = host.getVM(2);
-client2 = host.getVM(3);
-
-IgnoredException.addIgnoredException("Connection reset");
-  }
+@SuppressWarnings({ "serial", "unused" })
+public class ClientHealthStatsDUnitTest implements Serializable {
+
+  private static final int NUMBER_PUTS = 100;
+
+  private static final String KEY1 = "KEY1";
+  private static final String KEY2 = "KEY2";
+  private static final String VALUE1 = "VALUE1";
+  private static final String VALUE2 = "VALUE2";
+
+  private static final String REGION_NAME = 
ClientHealthStatsDUnitTest.class.getSimpleName() + "_Region";
+
+  // client1VM and client2VM VM fields
+  private static ClientCache clientCache;
+
+  // TODO: assert following values in each client VM
+  private static int numOfCreates;
+  private static int numOfUpdates;
+  private static int numOfInvalidates;
+  private static boolean lastKeyReceived;
+
+  private VM managerVM;
+  private VM serverVM;
+  private VM client1VM;
+  private VM client2VM;
+
+  private String 

[5/8] incubator-geode git commit: Convert from ManagementTestCase to ManagementTestRule

2016-10-31 Thread klund
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/86a3fb5a/geode-core/src/test/java/org/apache/geode/management/LocatorManagementDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/management/LocatorManagementDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/management/LocatorManagementDUnitTest.java
index a426096..a91a2e1 100644
--- 
a/geode-core/src/test/java/org/apache/geode/management/LocatorManagementDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/management/LocatorManagementDUnitTest.java
@@ -16,54 +16,82 @@
  */
 package org.apache.geode.management;
 
+import static java.util.concurrent.TimeUnit.*;
 import static org.apache.geode.distributed.ConfigurationProperties.*;
-import static org.junit.Assert.*;
+import static org.apache.geode.internal.AvailablePortHelper.*;
+import static org.apache.geode.test.dunit.Host.*;
+import static org.apache.geode.test.dunit.NetworkUtils.*;
+import static org.assertj.core.api.Assertions.*;
 
 import java.io.File;
-import java.io.IOException;
+import java.io.Serializable;
 import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.util.Properties;
 
+import javax.management.ObjectName;
+
+import com.jayway.awaitility.Awaitility;
+import com.jayway.awaitility.core.ConditionFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
 import org.apache.geode.distributed.DistributedMember;
 import org.apache.geode.distributed.Locator;
 import org.apache.geode.distributed.internal.DistributionConfig;
+import org.apache.geode.distributed.internal.InternalDistributedSystem;
 import org.apache.geode.distributed.internal.InternalLocator;
-import org.apache.geode.internal.AvailablePortHelper;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.management.internal.ManagementConstants;
-import org.apache.geode.test.dunit.Assert;
+import org.apache.geode.management.internal.SystemManagementService;
 import org.apache.geode.test.dunit.Host;
-import org.apache.geode.test.dunit.LogWriterUtils;
-import org.apache.geode.test.dunit.SerializableCallable;
 import org.apache.geode.test.dunit.VM;
-import org.apache.geode.test.dunit.Wait;
-import org.apache.geode.test.dunit.WaitCriterion;
 import org.apache.geode.test.junit.categories.DistributedTest;
+import 
org.apache.geode.test.junit.rules.serializable.SerializableTemporaryFolder;
+import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
 
 /**
- * Test cases
- * 
- * DistributedSystem Cache Locator no no yes yes no yes yes yes yes
+ * Distributed tests for managing {@code Locator} with {@link LocatorMXBean}.
  */
 @Category(DistributedTest.class)
-public class LocatorManagementDUnitTest extends ManagementTestBase {
+@SuppressWarnings({ "serial", "unused" })
+public class LocatorManagementDUnitTest implements Serializable {
+
+  private static final int MAX_WAIT_MILLIS = 120 * 1000;
+
+  private static final int ZERO = 0;
+
+  @Manager
+  private VM managerVM;
+  @Member
+  private VM[] membersVM;
+  private VM locatorVM;
 
-  private static final int MAX_WAIT = 8 * ManagementConstants.REFRESH_TIME;
+  private String hostName;
+  private int port;
 
-  private VM locator;
+  @Rule
+  public ManagementTestRule managementTestRule = 
ManagementTestRule.builder().build();
 
-  @Override
-  protected final void postSetUpManagementTestBase() throws Exception {
-locator = managedNode1;
+  @Rule
+  public SerializableTemporaryFolder temporaryFolder = new 
SerializableTemporaryFolder();
+
+  @Rule
+  public SerializableTestName testName = new SerializableTestName();
+
+  @Before
+  public void before() throws Exception {
+//this.managerVM = managingNode;
+//this.membersVM = getManagedNodeList().toArray(new 
VM[getManagedNodeList().size()]);
+this.locatorVM = this.membersVM[0];
+this.hostName = getServerHostName(getHost(0));
+this.port = getRandomAvailableTCPPort();
   }
 
-  @Override
-  protected final void preTearDownManagementTestBase() throws Exception {
-stopLocator(locator);
+  @After
+  public void after() throws Exception {
+stopLocator(this.locatorVM);
   }
 
   /**
@@ -72,48 +100,52 @@ public class LocatorManagementDUnitTest extends 
ManagementTestBase {
*/
   @Test
   public void testPeerLocation() throws Exception {
-int locPort = AvailablePortHelper.getRandomAvailableTCPPort();
-startLocator(locator, true, locPort);
-locatorMBeanExist(locator, locPort, true);
+startLocator(this.locatorVM, true, this.port);
+
+verifyLocalLocatorMXBean(this.locatorVM, this.port, true);
 
-Host host = Host.getHost(0);
-String host0 = getServerHostName(host);
 Properties props = new Properties();
 props.setProperty(MCAST_PORT, "0");
-props.setProperty(LOCATORS, host0 + "[" + locPort

[2/8] incubator-geode git commit: Convert from ManagementTestCase to ManagementTestRule

2016-10-31 Thread klund
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/86a3fb5a/geode-core/src/test/java/org/apache/geode/management/RegionManagementDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/management/RegionManagementDUnitTest.java
 
b/geode-core/src/test/java/org/apache/geode/management/RegionManagementDUnitTest.java
index f042f2c..71359be 100644
--- 
a/geode-core/src/test/java/org/apache/geode/management/RegionManagementDUnitTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/management/RegionManagementDUnitTest.java
@@ -14,22 +14,46 @@
  * 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.
+ */
 package org.apache.geode.management;
 
-import static org.junit.Assert.*;
+import static java.util.concurrent.TimeUnit.MINUTES;
+import static org.apache.geode.cache.Region.*;
+import static org.apache.geode.test.dunit.Host.*;
+import static org.apache.geode.test.dunit.Invoke.invokeInEveryVM;
+import static org.assertj.core.api.Assertions.*;
 
+import java.lang.management.ManagementFactory;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
 
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanServer;
-import javax.management.MalformedObjectNameException;
 import javax.management.Notification;
 import javax.management.NotificationListener;
 import javax.management.ObjectName;
 
+import com.jayway.awaitility.Awaitility;
+import com.jayway.awaitility.core.ConditionFactory;
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -43,757 +67,505 @@ import org.apache.geode.cache.PartitionAttributes;
 import org.apache.geode.cache.PartitionAttributesFactory;
 import org.apache.geode.cache.Region;
 import org.apache.geode.cache.RegionAttributes;
+import org.apache.geode.cache.RegionFactory;
+import org.apache.geode.cache.RegionShortcut;
 import org.apache.geode.cache.Scope;
 import org.apache.geode.cache.query.data.Portfolio;
 import org.apache.geode.distributed.DistributedMember;
-import org.apache.geode.distributed.internal.InternalDistributedSystem;
+import org.apache.geode.distributed.internal.DM;
+import org.apache.geode.internal.cache.AbstractRegion;
 import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.internal.cache.LocalRegion;
 import org.apache.geode.internal.cache.TestObjectSizerImpl;
 import org.apache.geode.internal.cache.lru.LRUStatistics;
 import 
org.apache.geode.internal.cache.partitioned.fixed.SingleHopQuarterPartitionResolver;
 import org.apache.geode.management.internal.MBeanJMXAdapter;
 import org.apache.geode.management.internal.SystemManagementService;
-import org.apache.geode.test.dunit.Assert;
 import org.apache.geode.test.dunit.LogWriterUtils;
-import org.apache.geode.test.dunit.SerializableRunnable;
 import org.apache.geode.test.dunit.VM;
 import org.apache.geode.test.dunit.Wait;
 import org.apache.geode.test.dunit.WaitCriterion;
 import org.apache.geode.test.junit.categories.DistributedTest;
-import org.apache.geode.test.junit.categories.FlakyTest;
 
 /**
  * This class checks and verifies various data and operations exposed through
  * RegionMXBean interface.
- * 
+ * 
  * Goal of the Test : RegionMBean gets created once region is created. Data 
like
  * Region Attributes data and stats are of proper value
- * 
- * 
  */
 @Category(DistributedTest.class)
+@SuppressWarnings({ "serial", "unused" })
 public class RegionManagementDUnitTest extends ManagementTestBase {
 
-  private static final long serialVersionUID = 1L;
-
-  private final String VERIFY_CONFIG_METHOD = "verifyConfigData";
+  private static final String REGION_NAME = "MANAGEMENT_TEST_REGION";
+  private static final String PARTITIONED_REGION_NAME = 
"MANAGEMENT_PAR_REGION";
+  private static final String FIXED_PR_NAME = "MANAGEMENT_FIXED_PR";
+  private static final String LOCAL_REGION_NAME = "TEST_LOCAL_REGION";
+  

incubator-geode git commit: GEODE-2044 Add to docs tc Server 3.2 for HTTP Session Mgmt module

2016-10-31 Thread kmiller
Repository: incubator-geode
Updated Branches:
  refs/heads/develop d5f744e8f -> 8c9b51b09


GEODE-2044 Add to docs tc Server 3.2 for HTTP Session Mgmt module


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

Branch: refs/heads/develop
Commit: 8c9b51b091c4c212510eac960ab3f705c15c196d
Parents: d5f744e
Author: Karen Miller 
Authored: Thu Oct 27 15:21:38 2016 -0700
Committer: Karen Miller 
Committed: Mon Oct 31 13:08:15 2016 -0700

--
 .../tools_modules/http_session_mgmt/quick_start.html.md.erb  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8c9b51b0/geode-docs/tools_modules/http_session_mgmt/quick_start.html.md.erb
--
diff --git a/geode-docs/tools_modules/http_session_mgmt/quick_start.html.md.erb 
b/geode-docs/tools_modules/http_session_mgmt/quick_start.html.md.erb
index 434a13c..cfab15a 100644
--- a/geode-docs/tools_modules/http_session_mgmt/quick_start.html.md.erb
+++ b/geode-docs/tools_modules/http_session_mgmt/quick_start.html.md.erb
@@ -28,7 +28,7 @@ In this section you download, install, and set up the HTTP 
Session Management mo
 | Supported Application Server | Version | Download 
Location

|
 
|--|-|--|
 | tc Server| 2.9 (Deprecated)| 
[https://my.vmware.com/web/vmware/info/slug/application_platform/vmware_vfabric_tc_server/2_9](https://my.vmware.com/web/vmware/info/slug/application_platform/vmware_vfabric_tc_server/2_9)
 |
-| tc Server| 3.0 and 3.1 | 
[https://network.pivotal.io/products/pivotal-tcserver](https://network.pivotal.io/products/pivotal-tcserver)
 |
+| tc Server| 3.0, 3.1, and 3.2   | 
[https://network.pivotal.io/products/pivotal-tcserver](https://network.pivotal.io/products/pivotal-tcserver)
 |
 | Tomcat   | 7.0 | 
[http://tomcat.apache.org/download-70.cgi](http://tomcat.apache.org/download-70.cgi)

 |
 | Tomcat   | 8.0, 8.5| 
[http://tomcat.apache.org/download-80.cgi](http://tomcat.apache.org/download-80.cgi)

 |
 | WebLogic | 11g (10.3.x)| 
[http://www.oracle.com/technetwork/middleware/weblogic/overview/index.html](http://www.oracle.com/technetwork/middleware/weblogic/overview/index.html)
   |
@@ -42,7 +42,7 @@ In this section you download, install, and set up the HTTP 
Session Management mo
 | Supported Application Server | Version | Module  
 | Target Location for Module   
|
 
|--|-|--|--|
 | tc Server| 2.9 (Deprecated)| HTTP 
Session Management Module for Pivotal tc Server | `/templates` |
-| tc Server| 3.0 and 3.1 | HTTP 
Session Management Module for Pivotal tc Server | `/templates` |
+| tc Server| 3.0, 3.1, and 3.2   | HTTP 
Session Management Module for Pivotal tc Server | `/templates` |
 | Tomcat   | 7.0, 8.0 and 8.5| HTTP 
Session Management Module for Tomcat| `$CATALINA_HOME`  
   |
 | WebLogic | 11g (10.3.x)| HTTP 
Session Management Module for AppServers| *any 

svn commit: r16753 - in /release/incubator/geode: 1.0.0-incubating.M1/ 1.0.0-incubating.M2/ 1.0.0-incubating.M3/

2016-10-31 Thread abaker
Author: abaker
Date: Mon Oct 31 17:56:42 2016
New Revision: 16753

Log:
Remove old Geode releases

Removed:
release/incubator/geode/1.0.0-incubating.M1/
release/incubator/geode/1.0.0-incubating.M2/
release/incubator/geode/1.0.0-incubating.M3/



incubator-geode git commit: Remove old releases

2016-10-31 Thread abaker
Repository: incubator-geode
Updated Branches:
  refs/heads/asf-site 463719407 -> 70e83e5b8


Remove old releases


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

Branch: refs/heads/asf-site
Commit: 70e83e5b8076539109cc3f52a474dc405a4df9e9
Parents: 4637194
Author: Anthony Baker 
Authored: Mon Oct 31 10:51:27 2016 -0700
Committer: Anthony Baker 
Committed: Mon Oct 31 10:51:27 2016 -0700

--
 releases/index.html | 152 +--
 1 file changed, 1 insertion(+), 151 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/70e83e5b/releases/index.html
--
diff --git a/releases/index.html b/releases/index.html
index 4c696f0..be7f721 100644
--- a/releases/index.html
+++ b/releases/index.html
@@ -189,158 +189,8 @@ under the License. -->
   
 
 
-
-
- 1.0.0-incubating.M3
-
-
- Binaries 
-  [ http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M3/apache-geode-1.0.0-incubating.M3.zip;>ZIP,
 https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-1.0.0-incubating.M3.zip.sha256;>SHA-256,
-  https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-1.0.0-incubating.M3.zip.asc;>PGP
 ] -
-  [http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M3/apache-geode-1.0.0-incubating.M3.tar.gz;>TAR.GZ,
 https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-1.0.0-incubating.M3.tar.gz.sha256;>SHA-256,
-  https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-1.0.0-incubating.M3.tar.gz.asc;>PGP
 ]
-  
-
-  Binary downloads are provided for the convenience of 
our users and are not official Apache Geode releases. 
-
-
-
-
- Source
-   [ http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M3/apache-geode-src-1.0.0-incubating.M3.zip;>ZIP,
 https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-src-1.0.0-incubating.M3.zip.sha256;>SHA-256,
-   https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-src-1.0.0-incubating.M3.zip.asc;>PGP
-] -
-   [http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M3/apache-geode-src-1.0.0-incubating.M3.tar.gz;>TAR.GZ,
 https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-src-1.0.0-incubating.M3.tar.gz.sha256;>SHA-256,
-   https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-src-1.0.0-incubating.M3.tar.gz.asc;>PGP
-   ]
- 
-
-
-
-
-   Dependency Managers
-  
-   Gradle
-
-  dependencies {
-  compile 'org.apache.geode:geode-core:1.0.0-incubating.M3'
-  }
-
-  
-   Maven
-
-  dependencies
- dependency
-groupIdorg.apache.geode/groupId
-artifactIdgeode-core/artifactId
-version1.0.0-incubating.M3/version
- /dependency
-  /dependencies
-  
-  
-
-
-
- 1.0.0-incubating.M2
-
-
- Binaries 
-  [ http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M2/apache-geode-1.0.0-incubating.M2.zip;>ZIP
 , https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M2/apache-geode-1.0.0-incubating.M2.zip.sha-256;>SHA-256
 ,
-  https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M2/apache-geode-1.0.0-incubating.M2.zip.asc;>PGP
 ] -
-  [http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M2/apache-geode-1.0.0-incubating.M2.tar.gz;>TAR.GZ
 , https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M2/apache-geode-1.0.0-incubating.M2.tar.gz.sha-256;>SHA-256
 ,
-  https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M2/apache-geode-1.0.0-incubating.M2.tar.gz.asc;>PGP
 ]
-  
-
-  Binary downloads are provided for the convenience of 
our users and are not official Apache Geode releases. 
-
-
-
-
- Source
-  

[06/11] incubator-geode git commit: Update README with links for Java and Redis, break out external libraries

2016-10-31 Thread dschneider
Update README with links for Java and Redis, break out external libraries


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

Branch: refs/heads/feature/GEM-983
Commit: 1412ca0bf424b4c4e6491f8f786751e197c0565c
Parents: 1f253c3
Author: Anthony Baker 
Authored: Sat Oct 29 07:00:51 2016 -0700
Committer: Anthony Baker 
Committed: Sat Oct 29 07:00:51 2016 -0700

--
 README.md | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1412ca0b/README.md
--
diff --git a/README.md b/README.md
index 4ca2416..a633f67 100644
--- a/README.md
+++ b/README.md
@@ -92,9 +92,14 @@ Compile and run `HelloWorld.java`.  The classpath should 
include `geode-dependen
 
 Apache Geode applications can be written in these client technologies:
 
-* Java using the Geode client API or embedded using the Geode peer API
-* [Spring Data GemFire](http://projects.spring.io/spring-data-gemfire/) or 
[Spring 
Cache](http://docs.spring.io/spring/docs/current/spring-framework-reference/html/cache.html)
+* Java 
[client](http://geode.apache.org/docs/guide/topologies_and_comm/cs_configuration/chapter_overview.html)
 or 
[peer](http://geode.apache.org/docs/guide/topologies_and_comm/p2p_configuration/chapter_overview.html)
 * [REST](http://geode.apache.org/docs/guide/rest_apps/chapter_overview.html)
-* 
[memcached](https://cwiki.apache.org/confluence/display/GEODE/Moving+from+memcached+to+gemcached)
+* 
[Memcached](https://cwiki.apache.org/confluence/display/GEODE/Moving+from+memcached+to+gemcached)
+* 
[Redis](https://cwiki.apache.org/confluence/display/GEODE/Geode+Redis+Adapter)
+
+The following libraries are available external to the Apache Geode project:
+
+* [Spring Data GemFire](http://projects.spring.io/spring-data-gemfire/)
+* [Spring 
Cache](http://docs.spring.io/spring/docs/current/spring-framework-reference/html/cache.html)
 * [Python](https://github.com/gemfire/py-gemfire-rest)
 



[01/11] incubator-geode git commit: GEODE-1098: Fix gfsh.bat error with default Java installation [Forced Update!]

2016-10-31 Thread dschneider
Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEM-983 eb6ab1aaf -> 2f251c47d (forced update)


GEODE-1098: Fix gfsh.bat error with default Java installation

Paths to JAR dependencies quoted to prevent spaces from causing error

This closes #227


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

Branch: refs/heads/feature/GEM-983
Commit: dbcbd55f9b2965afcf5dcc8453308c1c850d7a5c
Parents: 2ef50b2
Author: mmurdoch 
Authored: Fri Oct 28 19:19:59 2016 +0100
Committer: Dan Smith 
Committed: Fri Oct 28 17:12:03 2016 -0700

--
 geode-assembly/src/main/dist/bin/gfsh.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/dbcbd55f/geode-assembly/src/main/dist/bin/gfsh.bat
--
diff --git a/geode-assembly/src/main/dist/bin/gfsh.bat 
b/geode-assembly/src/main/dist/bin/gfsh.bat
index 8206b6e..a89845c 100755
--- a/geode-assembly/src/main/dist/bin/gfsh.bat
+++ b/geode-assembly/src/main/dist/bin/gfsh.bat
@@ -82,5 +82,5 @@ REM  Expect to find the tools.jar from the JDK
 )
 
 REM Call java with our classpath
-@"%GF_JAVA%" -Dgfsh=true -Dlog4j.configurationFile=classpath:log4j2-cli.xml 
-classpath %DEPENDENCIES% %JAVA_ARGS% %LAUNCHER% %*
+@"%GF_JAVA%" -Dgfsh=true -Dlog4j.configurationFile=classpath:log4j2-cli.xml 
-classpath "%DEPENDENCIES%" %JAVA_ARGS% %LAUNCHER% %*
 :done



[02/11] incubator-geode git commit: Fixing spotless formatting errors.

2016-10-31 Thread dschneider
Fixing spotless formatting errors.

2ef50b24de1457ab91729f22a3c2ff4a8a07557b introduced spotless formatting
issues.


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

Branch: refs/heads/feature/GEM-983
Commit: 29bb98a23e720a84d7e0f22dcd0ae25b418eec27
Parents: dbcbd55
Author: Dan Smith 
Authored: Fri Oct 28 17:12:56 2016 -0700
Committer: Dan Smith 
Committed: Fri Oct 28 17:12:56 2016 -0700

--
 .../internal/cache/AbstractRegionEntry.java |  1 +
 .../internal/cache/AbstractRegionEntryTest.java | 44 +---
 2 files changed, 21 insertions(+), 24 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/29bb98a2/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java
--
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java
index 2138af9..41ca8d0 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/AbstractRegionEntry.java
@@ -228,6 +228,7 @@ public abstract class AbstractRegionEntry implements 
RegionEntry, HashEntryhttp://git-wip-us.apache.org/repos/asf/incubator-geode/blob/29bb98a2/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionEntryTest.java
--
diff --git 
a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionEntryTest.java
 
b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionEntryTest.java
index 36e3e30..2f372bc 100644
--- 
a/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionEntryTest.java
+++ 
b/geode-core/src/test/java/org/apache/geode/internal/cache/AbstractRegionEntryTest.java
@@ -1,18 +1,16 @@
 /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one or more 
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional 
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache 
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the 
License. You may obtain a
+ * copy of the License at
  *
- *  http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing, software 
distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 
KIND, either express
+ * or implied. See the License for the specific language governing permissions 
and limitations under
+ * the License.
  */
 package org.apache.geode.internal.cache;
 
@@ -31,9 +29,10 @@ import org.apache.geode.test.junit.categories.UnitTest;
 
 @Category(UnitTest.class)
 public class AbstractRegionEntryTest {
-  
+
   @Test
-  public void 
whenMakeTombstoneHasSetValueThatThrowsExceptionDoesNotChangeValueToTombstone() 
throws RegionClearedException {
+  public void 
whenMakeTombstoneHasSetValueThatThrowsExceptionDoesNotChangeValueToTombstone()
+  throws RegionClearedException {
 LocalRegion lr = mock(LocalRegion.class);
 RegionVersionVector rvv = mock(RegionVersionVector.class);
 when(lr.getVersionVector()).thenReturn(rvv);
@@ -42,20 +41,19 @@ public class AbstractRegionEntryTest {
 AbstractRegionEntry re = new TestableRegionEntry(lr, value);
 assertEquals(value, re.getValueField());
 Assertions.assertThatThrownBy(() -> re.makeTombstone(lr, vt))
-.isInstanceOf(RuntimeException.class)
-.hasMessage("throw exception on setValue(TOMBSTONE)");
+

[08/11] incubator-geode git commit: GEODE-2034: Clean up old releases

2016-10-31 Thread dschneider
GEODE-2034: Clean up old releases

Remove links to 1.0.0-incubating.M* releases.  Add link to archived
releases.


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

Branch: refs/heads/feature/GEM-983
Commit: 8a6ae9da0aff4d9d3dc023ce05048624a69fc212
Parents: 4a402b8
Author: Anthony Baker 
Authored: Sat Oct 29 09:33:51 2016 -0700
Committer: Anthony Baker 
Committed: Sat Oct 29 09:33:51 2016 -0700

--
 geode-site/website/content/releases/index.html | 152 +---
 1 file changed, 1 insertion(+), 151 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8a6ae9da/geode-site/website/content/releases/index.html
--
diff --git a/geode-site/website/content/releases/index.html 
b/geode-site/website/content/releases/index.html
index d42e514..0efb681 100644
--- a/geode-site/website/content/releases/index.html
+++ b/geode-site/website/content/releases/index.html
@@ -90,158 +90,8 @@ under the License. -->
   
 
 
-
-
- 1.0.0-incubating.M3
-
-
- Binaries 
-  [ http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M3/apache-geode-1.0.0-incubating.M3.zip;>ZIP,
 https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-1.0.0-incubating.M3.zip.sha256;>SHA-256,
-  https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-1.0.0-incubating.M3.zip.asc;>PGP
 ] -
-  [http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M3/apache-geode-1.0.0-incubating.M3.tar.gz;>TAR.GZ,
 https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-1.0.0-incubating.M3.tar.gz.sha256;>SHA-256,
-  https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-1.0.0-incubating.M3.tar.gz.asc;>PGP
 ]
-  
-
-  Binary downloads are provided for the convenience of 
our users and are not official Apache Geode releases. 
-
-
-
-
- Source
-   [ http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M3/apache-geode-src-1.0.0-incubating.M3.zip;>ZIP,
 https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-src-1.0.0-incubating.M3.zip.sha256;>SHA-256,
-   https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-src-1.0.0-incubating.M3.zip.asc;>PGP
-] -
-   [http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M3/apache-geode-src-1.0.0-incubating.M3.tar.gz;>TAR.GZ,
 https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-src-1.0.0-incubating.M3.tar.gz.sha256;>SHA-256,
-   https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-src-1.0.0-incubating.M3.tar.gz.asc;>PGP
-   ]
- 
-
-
-
-
-   Dependency Managers
-  
-   Gradle
-
-  dependencies {
-  compile 'org.apache.geode:geode-core:1.0.0-incubating.M3'
-  }
-
-  
-   Maven
-
-  dependencies
- dependency
-groupIdorg.apache.geode/groupId
-artifactIdgeode-core/artifactId
-version1.0.0-incubating.M3/version
- /dependency
-  /dependencies
-  
-  
-
-
-
- 1.0.0-incubating.M2
-
-
- Binaries 
-  [ http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M2/apache-geode-1.0.0-incubating.M2.zip;>ZIP
 , https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M2/apache-geode-1.0.0-incubating.M2.zip.sha-256;>SHA-256
 ,
-  https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M2/apache-geode-1.0.0-incubating.M2.zip.asc;>PGP
 ] -
-  [http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M2/apache-geode-1.0.0-incubating.M2.tar.gz;>TAR.GZ
 , https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M2/apache-geode-1.0.0-incubating.M2.tar.gz.sha-256;>SHA-256
 ,
-  https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M2/apache-geode-1.0.0-incubating.M2.tar.gz.asc;>PGP
 ]
-  
-
-  Binary downloads are provided for 

[07/11] incubator-geode git commit: Add link to release notes

2016-10-31 Thread dschneider
Add link to release notes


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

Branch: refs/heads/feature/GEM-983
Commit: 4a402b83fd9241fd956afd8cc436b1cd0c3ae837
Parents: 1412ca0
Author: Anthony Baker 
Authored: Sat Oct 29 09:06:52 2016 -0700
Committer: Anthony Baker 
Committed: Sat Oct 29 09:06:52 2016 -0700

--
 geode-site/website/content/releases/index.html | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/4a402b83/geode-site/website/content/releases/index.html
--
diff --git a/geode-site/website/content/releases/index.html 
b/geode-site/website/content/releases/index.html
index 7056640..d42e514 100644
--- a/geode-site/website/content/releases/index.html
+++ b/geode-site/website/content/releases/index.html
@@ -60,6 +60,12 @@ under the License. -->
  
 
 
+
+
+
+https://cwiki.apache.org/confluence/display/GEODE/Release+Notes#ReleaseNotes-1.0.0-incubating;>Release
 Notes
+
+
 
 
Dependency Managers



[09/11] incubator-geode git commit: Update geode dependency for examples to 1.0.0-incubating

2016-10-31 Thread dschneider
Update geode dependency for examples to 1.0.0-incubating


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

Branch: refs/heads/feature/GEM-983
Commit: bb30357c015a01fa674864eb3c2a680e0f052be4
Parents: 8a6ae9d
Author: Anthony Baker 
Authored: Mon Oct 31 09:02:41 2016 -0700
Committer: Anthony Baker 
Committed: Mon Oct 31 09:02:41 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bb30357c/geode-examples/gradle.properties
--
diff --git a/geode-examples/gradle.properties b/geode-examples/gradle.properties
index 7aa1ef9..c1739af 100644
--- a/geode-examples/gradle.properties
+++ b/geode-examples/gradle.properties
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-geodeVersion = 1.0.0-incubating-SNAPSHOT
+geodeVersion = 1.0.0-incubating
 junitVersion = 4.12
 mockitocoreVersion = 1.10.19
 commonsExecVersion = 1.3



[10/11] incubator-geode git commit: shutdownAll now syncs on class before this

2016-10-31 Thread dschneider
shutdownAll now syncs on class before this

changed to an AtomicBoolean, remove cache sync on addPartitionedRegion and 
requiresNotificationFromPR

fixed formatting. Removed class sync on rmqFactory

back to volatile boolean so that second SDA will wait for the first


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

Branch: refs/heads/feature/GEM-983
Commit: fe4cf4e4e972d6a29ae7508e2596f1de63b3e5e2
Parents: bb30357
Author: Darrel Schneider 
Authored: Tue Oct 11 15:04:43 2016 -0700
Committer: Darrel Schneider 
Committed: Mon Oct 31 10:04:03 2016 -0700

--
 .../geode/internal/cache/GemFireCacheImpl.java  | 157 +--
 1 file changed, 70 insertions(+), 87 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fe4cf4e4/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 ba4f1f4..3c4718c 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
@@ -664,7 +664,7 @@ public class GemFireCacheImpl
 sb.append("GemFireCache[");
 sb.append("id = " + System.identityHashCode(this));
 sb.append("; isClosing = " + this.isClosing);
-sb.append("; isShutDownAll = " + this.isShutDownAll);
+sb.append("; isShutDownAll = " + isCacheAtShutdownAll());
 sb.append("; created = " + this.creationDate);
 sb.append("; server = " + this.isServer);
 sb.append("; copyOnRead = " + this.copyOnRead);
@@ -874,7 +874,7 @@ public class GemFireCacheImpl
 
   this.cqService = CqServiceProvider.create(this);
 
-  initReliableMessageQueueFactory();
+  this.rmqFactory = new ReliableMessageQueueFactoryImpl();
 
   // Create the CacheStatistics
   this.cachePerfStats = new CachePerfStats(system);
@@ -1751,58 +1751,59 @@ public class GemFireCacheImpl
 }
   }
 
-  public synchronized void shutDownAll() {
-boolean testIGE = Boolean.getBoolean("TestInternalGemFireError");
+  public void shutDownAll() {
+synchronized (GemFireCacheImpl.class) {
+  boolean testIGE = Boolean.getBoolean("TestInternalGemFireError");
 
-if (testIGE) {
-  InternalGemFireError assErr = new InternalGemFireError(
-  
LocalizedStrings.GemFireCache_UNEXPECTED_EXCEPTION.toLocalizedString());
-  throw assErr;
-}
-if (isCacheAtShutdownAll()) {
-  // it's already doing shutdown by another thread
-  return;
-}
-if (LocalRegion.ISSUE_CALLBACKS_TO_CACHE_OBSERVER) {
-  try {
-CacheObserverHolder.getInstance().beforeShutdownAll();
-  } finally {
-LocalRegion.ISSUE_CALLBACKS_TO_CACHE_OBSERVER = false;
-  }
-}
-this.isShutDownAll = true;
-
-// bug 44031 requires multithread shutdownall should be grouped
-// by root region. However, shutDownAllDuringRecovery.conf test revealed 
that
-// we have to close colocated child regions first.
-// Now check all the PR, if anyone has colocate-with attribute, sort all 
the
-// PRs by colocation relationship and close them sequentially, otherwise 
still
-// group them by root region.
-TreeMap> prTrees = getPRTrees();
-if (prTrees.size() > 1 && shutdownAllPoolSize != 1) {
-  ExecutorService es = getShutdownAllExecutorService(prTrees.size());
-  for (final Map prSubMap : prTrees.values()) {
-es.execute(new Runnable() {
-  public void run() {
-ConnectionTable.threadWantsSharedResources();
-shutdownSubTreeGracefully(prSubMap);
-  }
-});
-  } // for each root
-  es.shutdown();
-  try {
-es.awaitTermination(Integer.MAX_VALUE, TimeUnit.SECONDS);
-  } catch (InterruptedException e) {
-logger.debug("Shutdown all interrupted while waiting for PRs to be 
shutdown gracefully.");
+  if (testIGE) {
+InternalGemFireError assErr = new 
InternalGemFireError(LocalizedStrings.GemFireCache_UNEXPECTED_EXCEPTION.toLocalizedString());
+throw assErr;
+  }
+  if (isCacheAtShutdownAll()) {
+// it's already doing shutdown by another thread
+return;
   }
+  if (LocalRegion.ISSUE_CALLBACKS_TO_CACHE_OBSERVER) {
+try {
+  

[11/11] incubator-geode git commit: formatting

2016-10-31 Thread dschneider
formatting


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

Branch: refs/heads/feature/GEM-983
Commit: 2f251c47d2240329cd3b61a30c831fa9dd78e3db
Parents: fe4cf4e
Author: Darrel Schneider 
Authored: Mon Oct 31 10:17:50 2016 -0700
Committer: Darrel Schneider 
Committed: Mon Oct 31 10:17:50 2016 -0700

--
 .../java/org/apache/geode/internal/cache/GemFireCacheImpl.java| 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2f251c47/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 3c4718c..7514605 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
@@ -1756,7 +1756,8 @@ public class GemFireCacheImpl
   boolean testIGE = Boolean.getBoolean("TestInternalGemFireError");
 
   if (testIGE) {
-InternalGemFireError assErr = new 
InternalGemFireError(LocalizedStrings.GemFireCache_UNEXPECTED_EXCEPTION.toLocalizedString());
+InternalGemFireError assErr = new InternalGemFireError(
+
LocalizedStrings.GemFireCache_UNEXPECTED_EXCEPTION.toLocalizedString());
 throw assErr;
   }
   if (isCacheAtShutdownAll()) {



[05/11] incubator-geode git commit: Only run the uiTest task for the :geode-pulse subproject. Add uiTest to the combined test report. Refactored helper methods out of test.gradle.

2016-10-31 Thread dschneider
Only run the uiTest task for the :geode-pulse subproject. Add uiTest to the 
combined test report.  Refactored helper methods out of test.gradle.

This closes #261


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

Branch: refs/heads/feature/GEM-983
Commit: 1f253c33b14ea2f4c7f387723cb2e1d91b117df8
Parents: d956305
Author: Jared Stewart 
Authored: Fri Oct 14 15:46:00 2016 -0700
Committer: Anthony Baker 
Committed: Fri Oct 28 19:43:55 2016 -0700

--
 buildSrc/build.gradle   | 25 +
 .../geode/gradle/TestPropertiesWriter.groovy| 36 
 geode-pulse/build.gradle| 16 ++
 gradle/test.gradle  | 58 +++-
 4 files changed, 86 insertions(+), 49 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1f253c33/buildSrc/build.gradle
--
diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
new file mode 100644
index 000..d7ff581
--- /dev/null
+++ b/buildSrc/build.gradle
@@ -0,0 +1,25 @@
+/*
+ * 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.
+ *
+ */
+
+repositories {
+  mavenCentral()
+}
+
+dependencies {
+  compile group: 'org.apache.mina', name: 'mina-core', version: '2.0.14'
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1f253c33/buildSrc/src/main/groovy/org/apache/geode/gradle/TestPropertiesWriter.groovy
--
diff --git 
a/buildSrc/src/main/groovy/org/apache/geode/gradle/TestPropertiesWriter.groovy 
b/buildSrc/src/main/groovy/org/apache/geode/gradle/TestPropertiesWriter.groovy
new file mode 100644
index 000..0f43d3c
--- /dev/null
+++ 
b/buildSrc/src/main/groovy/org/apache/geode/gradle/TestPropertiesWriter.groovy
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.geode.gradle;
+
+import org.apache.mina.util.AvailablePortFinder;
+
+public class TestPropertiesWriter {
+  public static void writeTestProperties(File parent, String name) {
+Properties props = new Properties();
+props.setProperty('mcast-port', 
Integer.toString(AvailablePortFinder.getNextAvailable()));
+props.setProperty('log-level', 'config');
+File propsFile = new File(testResultsDir(parent, name), 
'gemfire.properties');
+BufferedWriter writer = propsFile.newWriter();
+props.store(writer, 'Autogenerated Gemfire properties');
+  }
+
+  public static File testResultsDir(File parent, String name) {
+   return new File(parent, name)
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1f253c33/geode-pulse/build.gradle
--
diff --git a/geode-pulse/build.gradle b/geode-pulse/build.gradle
index 3d19dea..6692484 100755
--- a/geode-pulse/build.gradle
+++ b/geode-pulse/build.gradle
@@ -1,3 +1,5 @@
+import org.apache.geode.gradle.TestPropertiesWriter
+
 /*
  * Licensed to the 

[03/11] incubator-geode git commit: Fixing build warning message.

2016-10-31 Thread dschneider
Fixing build warning message.

CacheFactory.java:341: warning - @return tag has no arguments.
CacheFactory.java:357: warning - @return tag has no arguments.


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

Branch: refs/heads/feature/GEM-983
Commit: b3d00edb355a224279913f7e7c0214b57ba864f0
Parents: 29bb98a
Author: Anil 
Authored: Fri Oct 28 17:24:20 2016 -0700
Committer: Anil 
Committed: Fri Oct 28 17:25:23 2016 -0700

--
 .../src/main/java/org/apache/geode/cache/CacheFactory.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b3d00edb/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
--
diff --git a/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java 
b/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
index 15557bb..0772dcf 100644
--- a/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
+++ b/geode-core/src/main/java/org/apache/geode/cache/CacheFactory.java
@@ -336,7 +336,7 @@ public class CacheFactory {
* method on this object
*
* @param securityManager
-   * @return
+   * @return this CacheFactory
*/
   public CacheFactory setSecurityManager(SecurityManager securityManager) {
 this.cacheConfig.setSecurityManager(securityManager);
@@ -352,7 +352,7 @@ public class CacheFactory {
* method on this object
* 
* @param postProcessor
-   * @return
+   * @return this CacheFactory
*/
   public CacheFactory setPostProcessor(PostProcessor postProcessor) {
 this.cacheConfig.setPostProcessor(postProcessor);



[04/11] incubator-geode git commit: Add a timeout to webdriver so that UITest doesn't hang for hours if it can't load the page.

2016-10-31 Thread dschneider
Add a timeout to webdriver so that UITest doesn't hang for hours if it can't 
load the page.

This closes #274


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

Branch: refs/heads/feature/GEM-983
Commit: d9563051ae5ff19123eed49334982c1a98ba08fd
Parents: b3d00ed
Author: Jared Stewart 
Authored: Thu Oct 27 14:36:51 2016 -0700
Committer: Anthony Baker 
Committed: Fri Oct 28 19:21:41 2016 -0700

--
 .../org/apache/geode/tools/pulse/tests/ui/PulseAbstractTest.java| 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d9563051/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAbstractTest.java
--
diff --git 
a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAbstractTest.java
 
b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAbstractTest.java
index 6d78331..9116a80 100644
--- 
a/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAbstractTest.java
+++ 
b/geode-pulse/src/test/java/org/apache/geode/tools/pulse/tests/ui/PulseAbstractTest.java
@@ -219,6 +219,7 @@ public abstract class PulseAbstractTest extends 
PulseBaseTest {
 driver = new PhantomJSDriver(capabilities);
 driver.manage().window().maximize();
 driver.manage().timeouts().implicitlyWait(5, TimeUnit.SECONDS);
+driver.manage().timeouts().pageLoadTimeout(60, TimeUnit.SECONDS);
   }
 
   @AfterClass



incubator-geode git commit: Typo repair, User Manual example, "Creating Indexes on Map Fields" fROM => FROM

2016-10-31 Thread dbarnes
Repository: incubator-geode
Updated Branches:
  refs/heads/develop bb30357c0 -> d5f744e8f


Typo repair, User Manual example, "Creating Indexes on Map Fields"
fROM => FROM


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

Branch: refs/heads/develop
Commit: d5f744e8f520986c67130040ac452437ceeb3fd1
Parents: bb30357
Author: Dave Barnes 
Authored: Mon Oct 31 10:09:06 2016 -0700
Committer: Dave Barnes 
Committed: Mon Oct 31 10:09:06 2016 -0700

--
 geode-docs/developing/query_index/creating_map_indexes.html.md.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d5f744e8/geode-docs/developing/query_index/creating_map_indexes.html.md.erb
--
diff --git a/geode-docs/developing/query_index/creating_map_indexes.html.md.erb 
b/geode-docs/developing/query_index/creating_map_indexes.html.md.erb
index d1b1523..a7603e9 100644
--- a/geode-docs/developing/query_index/creating_map_indexes.html.md.erb
+++ b/geode-docs/developing/query_index/creating_map_indexes.html.md.erb
@@ -24,7 +24,7 @@ To assist with the quick lookup of multiple values in a Map 
(or HashMap) type fi
 For example, you could create a map index to support the following query:
 
 ``` pre
-SELECT * fROM /users u WHERE u.name['first'] = 'John' OR u.name['last'] = 
'Smith'
+SELECT * FROM /users u WHERE u.name['first'] = 'John' OR u.name['last'] = 
'Smith'
 ```
 
 The map index extends regular range indexes created on single key by 
maintaining indexes for other specified keys, or for all keys if `*` is used. 
The underlying structure of the map index can be thought of as a wrapper around 
all these indexes.



[2/2] incubator-geode git commit: Update geode dependency for examples to 1.0.0-incubating

2016-10-31 Thread abaker
Update geode dependency for examples to 1.0.0-incubating


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

Branch: refs/heads/develop
Commit: bb30357c015a01fa674864eb3c2a680e0f052be4
Parents: 8a6ae9d
Author: Anthony Baker 
Authored: Mon Oct 31 09:02:41 2016 -0700
Committer: Anthony Baker 
Committed: Mon Oct 31 09:02:41 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bb30357c/geode-examples/gradle.properties
--
diff --git a/geode-examples/gradle.properties b/geode-examples/gradle.properties
index 7aa1ef9..c1739af 100644
--- a/geode-examples/gradle.properties
+++ b/geode-examples/gradle.properties
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-geodeVersion = 1.0.0-incubating-SNAPSHOT
+geodeVersion = 1.0.0-incubating
 junitVersion = 4.12
 mockitocoreVersion = 1.10.19
 commonsExecVersion = 1.3



[1/2] incubator-geode git commit: GEODE-2034: Clean up old releases

2016-10-31 Thread abaker
Repository: incubator-geode
Updated Branches:
  refs/heads/develop 4a402b83f -> bb30357c0


GEODE-2034: Clean up old releases

Remove links to 1.0.0-incubating.M* releases.  Add link to archived
releases.


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

Branch: refs/heads/develop
Commit: 8a6ae9da0aff4d9d3dc023ce05048624a69fc212
Parents: 4a402b8
Author: Anthony Baker 
Authored: Sat Oct 29 09:33:51 2016 -0700
Committer: Anthony Baker 
Committed: Sat Oct 29 09:33:51 2016 -0700

--
 geode-site/website/content/releases/index.html | 152 +---
 1 file changed, 1 insertion(+), 151 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8a6ae9da/geode-site/website/content/releases/index.html
--
diff --git a/geode-site/website/content/releases/index.html 
b/geode-site/website/content/releases/index.html
index d42e514..0efb681 100644
--- a/geode-site/website/content/releases/index.html
+++ b/geode-site/website/content/releases/index.html
@@ -90,158 +90,8 @@ under the License. -->
   
 
 
-
-
- 1.0.0-incubating.M3
-
-
- Binaries 
-  [ http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M3/apache-geode-1.0.0-incubating.M3.zip;>ZIP,
 https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-1.0.0-incubating.M3.zip.sha256;>SHA-256,
-  https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-1.0.0-incubating.M3.zip.asc;>PGP
 ] -
-  [http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M3/apache-geode-1.0.0-incubating.M3.tar.gz;>TAR.GZ,
 https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-1.0.0-incubating.M3.tar.gz.sha256;>SHA-256,
-  https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-1.0.0-incubating.M3.tar.gz.asc;>PGP
 ]
-  
-
-  Binary downloads are provided for the convenience of 
our users and are not official Apache Geode releases. 
-
-
-
-
- Source
-   [ http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M3/apache-geode-src-1.0.0-incubating.M3.zip;>ZIP,
 https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-src-1.0.0-incubating.M3.zip.sha256;>SHA-256,
-   https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-src-1.0.0-incubating.M3.zip.asc;>PGP
-] -
-   [http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M3/apache-geode-src-1.0.0-incubating.M3.tar.gz;>TAR.GZ,
 https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-src-1.0.0-incubating.M3.tar.gz.sha256;>SHA-256,
-   https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M3/apache-geode-src-1.0.0-incubating.M3.tar.gz.asc;>PGP
-   ]
- 
-
-
-
-
-   Dependency Managers
-  
-   Gradle
-
-  dependencies {
-  compile 'org.apache.geode:geode-core:1.0.0-incubating.M3'
-  }
-
-  
-   Maven
-
-  dependencies
- dependency
-groupIdorg.apache.geode/groupId
-artifactIdgeode-core/artifactId
-version1.0.0-incubating.M3/version
- /dependency
-  /dependencies
-  
-  
-
-
-
- 1.0.0-incubating.M2
-
-
- Binaries 
-  [ http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M2/apache-geode-1.0.0-incubating.M2.zip;>ZIP
 , https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M2/apache-geode-1.0.0-incubating.M2.zip.sha-256;>SHA-256
 ,
-  https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M2/apache-geode-1.0.0-incubating.M2.zip.asc;>PGP
 ] -
-  [http://apache.org/dyn/closer.cgi/incubator/geode/1.0.0-incubating.M2/apache-geode-1.0.0-incubating.M2.tar.gz;>TAR.GZ
 , https://dist.apache.org/repos/dist/release/incubator/geode/1.0.0-incubating.M2/apache-geode-1.0.0-incubating.M2.tar.gz.sha-256;>SHA-256
 ,
-