incubator-geode git commit: GEODE-1863: change server port 5555 to 0

[dschneider]

Repository: incubator-geode
Updated Branches:
  refs/heads/develop a232859bc -> 916774d36


GEODE-1863: change server port  to 0


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

Branch: refs/heads/develop
Commit: 916774d369661fc0ab87ba4e71d97c77806162d3
Parents: a232859
Author: Darrel Schneider 
Authored: Tue Sep 6 15:23:23 2016 -0700
Committer: Darrel Schneider 
Committed: Tue Sep 6 15:23:23 2016 -0700

--
 .../com/gemstone/gemfire/internal/cache/DiskRegionJUnitTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/916774d3/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionJUnitTest.java
--
diff --git 
a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionJUnitTest.java
 
b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionJUnitTest.java
index ddc1d6e..d8a36ec 100755
--- 
a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionJUnitTest.java
+++ 
b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/DiskRegionJUnitTest.java
@@ -2099,7 +2099,7 @@ public class DiskRegionJUnitTest extends 
DiskRegionTestingBase {
 
 region = DiskRegionHelperFactory.getSyncPersistOnlyRegion(cache, props, 
Scope.LOCAL);
 CacheServer bs1 = cache.addCacheServer();
-bs1.setPort();
+bs1.setPort(0);
 bs1.start();
 
 region.create("key1", new byte[16]);
@@ -2211,7 +2211,7 @@ public class DiskRegionJUnitTest extends 
DiskRegionTestingBase {
 
 region = DiskRegionHelperFactory.getSyncPersistOnlyRegion(cache, props, 
Scope.LOCAL);
 CacheServer bs1 = cache.addCacheServer();
-bs1.setPort();
+bs1.setPort(0);
 bs1.start();
 
 region.create("key1", new byte[16]);

incubator-geode git commit: GEODE-1821: fix termination of invokeAsync threads

[dschneider]

Repository: incubator-geode
Updated Branches:
  refs/heads/develop 2a84453b1 -> a232859bc


GEODE-1821: fix termination of invokeAsync threads

This closes #237


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

Branch: refs/heads/develop
Commit: a232859bc44573fcf32ec2f2b5de8ae604428676
Parents: 2a84453
Author: Ken Howe 
Authored: Fri Aug 26 13:03:44 2016 -0700
Committer: Darrel Schneider 
Committed: Tue Sep 6 14:58:49 2016 -0700

--
 ...tentColocatedPartitionedRegionDUnitTest.java | 44 
 1 file changed, 35 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a232859b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
 
b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
index b701b70..409ce13 100644
--- 
a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
+++ 
b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/partitioned/PersistentColocatedPartitionedRegionDUnitTest.java
@@ -706,8 +706,10 @@ public class PersistentColocatedPartitionedRegionDUnitTest 
extends PersistentPar
 closeCache(vm0);
 closeCache(vm1);
 
+// The following should fail immediately with ISE on vm0, it's not 
necessary to also try the operation on vm1.
 Object remoteException = null;
 remoteException = vm0.invoke(createPRsMissingParentRegionThread);
+
 assertEquals("Expected IllegalState Exception for missing colocated parent 
region", IllegalStateException.class, remoteException.getClass());
 assertTrue("Expected IllegalState Exception for missing colocated parent 
region", remoteException.toString().matches(
 "java.lang.IllegalStateException: Region specified in 
'colocated-with'.*"));
@@ -737,15 +739,32 @@ public class 
PersistentColocatedPartitionedRegionDUnitTest extends PersistentPar
 closeCache(vm0);
 closeCache(vm1);
 
-AsyncInvocation async0 = vm0.invokeAsync(createPRsColocatedPairThread);
+AsyncInvocation async0 = null;
+AsyncInvocation async1a = null;
+AsyncInvocation async1b = null;
+try {
+  async0 = vm0.invokeAsync(createPRsColocatedPairThread);
 
-Object logMsg = "";
-Object remoteException = null;
-AsyncInvocation async1 = 
vm1.invokeAsync(delayedCreatePRsMissingParentRegionThread);
-remoteException = async1.get(MAX_WAIT, TimeUnit.MILLISECONDS);
-assertEquals("Expected IllegalState Exception for missing colocated parent 
region", IllegalStateException.class, remoteException.getClass());
-assertTrue("Expected IllegalState Exception for missing colocated parent 
region", remoteException.toString().matches(
-"java.lang.IllegalStateException: Region specified in 
'colocated-with'.*"));
+  Object logMsg = "";
+  Object remoteException = null;
+  async1a = vm1.invokeAsync(delayedCreatePRsMissingParentRegionThread);
+  remoteException = async1a.get(MAX_WAIT, TimeUnit.MILLISECONDS);
+
+  assertEquals("Expected IllegalState Exception for missing colocated 
parent region", IllegalStateException.class, remoteException.getClass());
+  assertTrue("Expected IllegalState Exception for missing colocated parent 
region", remoteException.toString().matches(
+  "java.lang.IllegalStateException: Region specified in 
'colocated-with'.*"));
+} finally {
+  // The real test is done now (either passing or failing) but there's 
some cleanup in this test that needs to be done.
+  //
+  // The vm0 invokeAsync thread is still alive after the expected 
exception on vm1. Cleanup by first re-creating both regions
+  // on vm1, vm0 thread should now complete. Then wait (i.e. join() on the 
thread) for the new vm1 thread and the vm0 thread to
+  // verify they terminated without timing out, and close the caches.
+  async1b = vm1.invokeAsync(createPRsColocatedPairThread);
+  async1b.join(MAX_WAIT);
+  async0.join(MAX_WAIT);
+  closeCache(vm1);
+  closeCache(vm0);
+}
   }
 
   /**
@@ -782,10 +801,12 @@ public class 
PersistentColocatedPartitionedRegionDUnitTest extends PersistentPar
 AsyncInvocation async0 = 

[incubator-geode] Git Push Summary

[udo]

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-1792 [deleted] 9626269f3

[3/3] incubator-geode git commit: GEODE-1792: Amended tests to use comma delimited ciphers and protocols

[udo]

GEODE-1792: Amended tests to use comma delimited ciphers and protocols


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

Branch: refs/heads/feature/GEODE-420
Commit: 9626269f305fbb55d4e7f4a19dd646d407c9c50b
Parents: d79a944
Author: Udo Kohlmeyer 
Authored: Wed Sep 7 05:01:34 2016 +1000
Committer: Udo Kohlmeyer 
Committed: Wed Sep 7 05:01:34 2016 +1000

--
 .../internal/DistributionConfigImpl.java| 10 ++---
 .../net/SSLConfigurationFactoryTest.java| 42 +++-
 .../net/SocketCreatorFactoryJUnitTest.java  |  5 ++-
 .../ConnectToLocatorSSLDUnitTest.java   |  2 +-
 4 files changed, 48 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9626269f/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
index b272615..7b6b40d 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
@@ -1470,10 +1470,6 @@ public class DistributionConfigImpl extends 
AbstractDistributionConfig implement
 continue;
   }
   Object propVal = me.getValue();
-  if(propName.equals(SSL_CIPHERS) || propName.equals(SSL_PROTOCOLS))
-  {
-propVal = convertCommaDelimitedToSpaceDelimitedString((String)propVal);
-  }
   if (propVal != null && (propVal instanceof String)) { // weed out 
extraneous non-string properties
 this.setAttribute(propName, ((String) propVal).trim(), 
this.sourceMap.get(propName));
   }
@@ -2603,7 +2599,8 @@ public class DistributionConfigImpl extends 
AbstractDistributionConfig implement
 
   @Override
   public void setSSLProtocols(final String sslProtocols) {
-this.sslProtocols = sslProtocols;
+//This conversion is required due to backwards compatibility of the 
existing protocols code
+this.sslProtocols = 
convertCommaDelimitedToSpaceDelimitedString(sslProtocols);
   }
 
   @Override
@@ -2613,7 +2610,8 @@ public class DistributionConfigImpl extends 
AbstractDistributionConfig implement
 
   @Override
   public void setSSLCiphers(final String sslCiphers) {
-this.sslCiphers = sslCiphers;
+//This conversion is required due to backwards compatibility of the 
existing cipher code
+this.sslCiphers = convertCommaDelimitedToSpaceDelimitedString(sslCiphers);
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9626269f/geode-core/src/test/java/com/gemstone/gemfire/internal/net/SSLConfigurationFactoryTest.java
--
diff --git 
a/geode-core/src/test/java/com/gemstone/gemfire/internal/net/SSLConfigurationFactoryTest.java
 
b/geode-core/src/test/java/com/gemstone/gemfire/internal/net/SSLConfigurationFactoryTest.java
index 3cbe55e..bc142e2 100644
--- 
a/geode-core/src/test/java/com/gemstone/gemfire/internal/net/SSLConfigurationFactoryTest.java
+++ 
b/geode-core/src/test/java/com/gemstone/gemfire/internal/net/SSLConfigurationFactoryTest.java
@@ -42,6 +42,44 @@ public class SSLConfigurationFactoryTest extends 
JUnit4DistributedTestCase {
   }
 
   @Test
+  public void getSSLConfigWithCommaDelimitedProtocols() throws Exception {
+Properties properties = new Properties();
+properties.setProperty(SSL_ENABLED_COMPONENTS, "all");
+properties.setProperty(SSL_KEYSTORE, "someKeyStore");
+properties.setProperty(SSL_KEYSTORE_PASSWORD, "keystorePassword");
+properties.setProperty(SSL_KEYSTORE_TYPE, "JKS");
+properties.setProperty(SSL_TRUSTSTORE, "someKeyStore");
+properties.setProperty(SSL_TRUSTSTORE_PASSWORD, "keystorePassword");
+properties.setProperty(SSL_DEFAULT_ALIAS, "defaultAlias");
+properties.setProperty(SSL_CIPHERS, "Cipher1,Cipher2");
+properties.setProperty(SSL_PROTOCOLS, "Protocol1,Protocol2");
+DistributionConfigImpl distributionConfig = new 
DistributionConfigImpl(properties);
+SSLConfigurationFactory.setDistributionConfig(distributionConfig);
+for (SecurableComponent securableComponent : SecurableComponent.values()) {
+  assertSSLConfig(properties, 
SSLConfigurationFactory.getSSLConfigForComponent(securableComponent), 

[1/3] incubator-geode git commit: GEODE-1792: ssl-ciphers and ssl-protocols are comma delimited. Changed JMX_MANAGER_SSL_ALIAS -> JMX_SSL_ALIAS

[udo]

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-420 6853f56dd -> 9626269f3


GEODE-1792: ssl-ciphers and ssl-protocols are comma delimited.
Changed JMX_MANAGER_SSL_ALIAS -> JMX_SSL_ALIAS


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

Branch: refs/heads/feature/GEODE-420
Commit: 156d2d151c714ece94604f1ac0f0563af096fd8c
Parents: c6f5997
Author: Udo Kohlmeyer 
Authored: Tue Sep 6 15:50:18 2016 +1000
Committer: Udo Kohlmeyer 
Committed: Tue Sep 6 15:50:18 2016 +1000

--
 .../distributed/ConfigurationProperties.java|   6 +-
 .../internal/AbstractDistributionConfig.java|   2 +-
 .../internal/DistributionConfig.java|  16 +-
 .../internal/DistributionConfigImpl.java|  18 ++-
 .../internal/net/SSLConfigurationFactory.java   |   2 +-
 .../gemfire/internal/net/SocketCreator.java |   3 +-
 .../gemfire/management/GemFireProperties.java   | 161 ++-
 .../internal/beans/BeanUtilFuncs.java   |  17 ++
 .../gemfire/distributed/LocatorDUnitTest.java   |   5 +-
 .../net/SSLConfigurationFactoryTest.java|   2 +-
 .../net/SocketCreatorFactoryJUnitTest.java  |   4 +-
 .../gemfire/management/JMXMBeanDUnitTest.java   |   6 +-
 12 files changed, 206 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/156d2d15/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java
index df85aca..6db4142 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java
@@ -849,7 +849,7 @@ public interface ConfigurationProperties {
* Default: "" 
* Since: Geode 1.0
*/
-  String SSL_JMX_MANAGER_ALIAS = "ssl-jmx-alias";
+  String SSL_JMX_ALIAS = "ssl-jmx-alias";
   /**
* The static String definition of the "jmx-manager-ssl-ciphers" 
property
* 
@@ -871,7 +871,7 @@ public interface ConfigurationProperties {
* Ignored if jmx-manager is false.
* 
* Default: "false"
-   * @deprecated Since Geode 1.0 use {@link #SSL_ENABLED_COMPONENTS} with 
optional {@link #SSL_JMX_MANAGER_ALIAS}
+   * @deprecated Since Geode 1.0 use {@link #SSL_ENABLED_COMPONENTS} with 
optional {@link #SSL_JMX_ALIAS}
*/
   @Deprecated
   String JMX_MANAGER_SSL_ENABLED = "jmx-manager-ssl-enabled";
@@ -1813,7 +1813,7 @@ public interface ConfigurationProperties {
*
* DescriptionThis property will be set when using multi-key 
keystores. This will define the alias that
* the ssl connection factory would use when no alias has been set for the 
different component aliases.
-   * {@link #SSL_CLUSTER_ALIAS}, {@link #SSL_SERVER_ALIAS},{@link 
#SSL_LOCATOR_ALIAS},{@link #SSL_GATEWAY_ALIAS},{@link #SSL_JMX_MANAGER_ALIAS} , 
{@link #SSL_HTTP_SERVICE_ALIAS}
+   * {@link #SSL_CLUSTER_ALIAS}, {@link #SSL_SERVER_ALIAS},{@link 
#SSL_LOCATOR_ALIAS},{@link #SSL_GATEWAY_ALIAS},{@link #SSL_JMX_ALIAS} , {@link 
#SSL_HTTP_SERVICE_ALIAS}
* 
* Default: ""
* Since: Geode 1.0

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/156d2d15/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
index f92511e..ce77c5e 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
@@ -885,7 +885,7 @@ public abstract class AbstractDistributionConfig extends 
AbstractConfig implemen
 m.put(JMX_MANAGER, "If true then this member is willing to be a jmx 
manager. Defaults to false except on a locator.");
 m.put(JMX_MANAGER_START, "If true then the jmx manager will be started 
when the cache is created. Defaults to false.");
 m.put(JMX_MANAGER_SSL_ENABLED, "If true then the jmx manager will only 
allow SSL clients to connect. Defaults to false. This property is ignored if 
jmx-manager-port is 

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

[udo]

Merge branch 'feature/GEODE-420' into feature/GEODE-1792


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

Branch: refs/heads/feature/GEODE-420
Commit: d79a944b6ada74eeb8214a0c60a728e57152b7f8
Parents: 156d2d1 6853f56
Author: Udo Kohlmeyer 
Authored: Wed Sep 7 03:30:14 2016 +1000
Committer: Udo Kohlmeyer 
Committed: Wed Sep 7 03:30:14 2016 +1000

--
 .../internal/DistributionConfigImpl.java|  15 +-
 .../gemfire/internal/AbstractConfig.java|   5 +
 .../internal/security/SecurableComponent.java   |   6 +-
 .../internal/JmxManagerLocatorRequest.java  |   6 +-
 .../internal/cli/commands/ShellCommands.java|  13 +-
 .../ConnectToLocatorSSLDUnitTest.java   | 151 +++
 6 files changed, 178 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d79a944b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
--

[incubator-geode] Git Push Summary

[hiteshkhamesra]

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-1861 [created] 2a84453b1

[3/3] incubator-geode git commit: GEODE-1792: Amended tests to use comma delimited ciphers and protocols

[udo]

GEODE-1792: Amended tests to use comma delimited ciphers and protocols


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

Branch: refs/heads/feature/GEODE-1792
Commit: 9626269f305fbb55d4e7f4a19dd646d407c9c50b
Parents: d79a944
Author: Udo Kohlmeyer 
Authored: Wed Sep 7 05:01:34 2016 +1000
Committer: Udo Kohlmeyer 
Committed: Wed Sep 7 05:01:34 2016 +1000

--
 .../internal/DistributionConfigImpl.java| 10 ++---
 .../net/SSLConfigurationFactoryTest.java| 42 +++-
 .../net/SocketCreatorFactoryJUnitTest.java  |  5 ++-
 .../ConnectToLocatorSSLDUnitTest.java   |  2 +-
 4 files changed, 48 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9626269f/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
index b272615..7b6b40d 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
@@ -1470,10 +1470,6 @@ public class DistributionConfigImpl extends 
AbstractDistributionConfig implement
 continue;
   }
   Object propVal = me.getValue();
-  if(propName.equals(SSL_CIPHERS) || propName.equals(SSL_PROTOCOLS))
-  {
-propVal = convertCommaDelimitedToSpaceDelimitedString((String)propVal);
-  }
   if (propVal != null && (propVal instanceof String)) { // weed out 
extraneous non-string properties
 this.setAttribute(propName, ((String) propVal).trim(), 
this.sourceMap.get(propName));
   }
@@ -2603,7 +2599,8 @@ public class DistributionConfigImpl extends 
AbstractDistributionConfig implement
 
   @Override
   public void setSSLProtocols(final String sslProtocols) {
-this.sslProtocols = sslProtocols;
+//This conversion is required due to backwards compatibility of the 
existing protocols code
+this.sslProtocols = 
convertCommaDelimitedToSpaceDelimitedString(sslProtocols);
   }
 
   @Override
@@ -2613,7 +2610,8 @@ public class DistributionConfigImpl extends 
AbstractDistributionConfig implement
 
   @Override
   public void setSSLCiphers(final String sslCiphers) {
-this.sslCiphers = sslCiphers;
+//This conversion is required due to backwards compatibility of the 
existing cipher code
+this.sslCiphers = convertCommaDelimitedToSpaceDelimitedString(sslCiphers);
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9626269f/geode-core/src/test/java/com/gemstone/gemfire/internal/net/SSLConfigurationFactoryTest.java
--
diff --git 
a/geode-core/src/test/java/com/gemstone/gemfire/internal/net/SSLConfigurationFactoryTest.java
 
b/geode-core/src/test/java/com/gemstone/gemfire/internal/net/SSLConfigurationFactoryTest.java
index 3cbe55e..bc142e2 100644
--- 
a/geode-core/src/test/java/com/gemstone/gemfire/internal/net/SSLConfigurationFactoryTest.java
+++ 
b/geode-core/src/test/java/com/gemstone/gemfire/internal/net/SSLConfigurationFactoryTest.java
@@ -42,6 +42,44 @@ public class SSLConfigurationFactoryTest extends 
JUnit4DistributedTestCase {
   }
 
   @Test
+  public void getSSLConfigWithCommaDelimitedProtocols() throws Exception {
+Properties properties = new Properties();
+properties.setProperty(SSL_ENABLED_COMPONENTS, "all");
+properties.setProperty(SSL_KEYSTORE, "someKeyStore");
+properties.setProperty(SSL_KEYSTORE_PASSWORD, "keystorePassword");
+properties.setProperty(SSL_KEYSTORE_TYPE, "JKS");
+properties.setProperty(SSL_TRUSTSTORE, "someKeyStore");
+properties.setProperty(SSL_TRUSTSTORE_PASSWORD, "keystorePassword");
+properties.setProperty(SSL_DEFAULT_ALIAS, "defaultAlias");
+properties.setProperty(SSL_CIPHERS, "Cipher1,Cipher2");
+properties.setProperty(SSL_PROTOCOLS, "Protocol1,Protocol2");
+DistributionConfigImpl distributionConfig = new 
DistributionConfigImpl(properties);
+SSLConfigurationFactory.setDistributionConfig(distributionConfig);
+for (SecurableComponent securableComponent : SecurableComponent.values()) {
+  assertSSLConfig(properties, 
SSLConfigurationFactory.getSSLConfigForComponent(securableComponent), 

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

[udo]

Merge branch 'feature/GEODE-420' into feature/GEODE-1792


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

Branch: refs/heads/feature/GEODE-1792
Commit: d79a944b6ada74eeb8214a0c60a728e57152b7f8
Parents: 156d2d1 6853f56
Author: Udo Kohlmeyer 
Authored: Wed Sep 7 03:30:14 2016 +1000
Committer: Udo Kohlmeyer 
Committed: Wed Sep 7 03:30:14 2016 +1000

--
 .../internal/DistributionConfigImpl.java|  15 +-
 .../gemfire/internal/AbstractConfig.java|   5 +
 .../internal/security/SecurableComponent.java   |   6 +-
 .../internal/JmxManagerLocatorRequest.java  |   6 +-
 .../internal/cli/commands/ShellCommands.java|  13 +-
 .../ConnectToLocatorSSLDUnitTest.java   | 151 +++
 6 files changed, 178 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d79a944b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
--

[1/3] incubator-geode git commit: GEODE-1792: ssl-ciphers and ssl-protocols are comma delimited. Changed JMX_MANAGER_SSL_ALIAS -> JMX_SSL_ALIAS

[udo]

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-1792 [created] 9626269f3


GEODE-1792: ssl-ciphers and ssl-protocols are comma delimited.
Changed JMX_MANAGER_SSL_ALIAS -> JMX_SSL_ALIAS


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

Branch: refs/heads/feature/GEODE-1792
Commit: 156d2d151c714ece94604f1ac0f0563af096fd8c
Parents: c6f5997
Author: Udo Kohlmeyer 
Authored: Tue Sep 6 15:50:18 2016 +1000
Committer: Udo Kohlmeyer 
Committed: Tue Sep 6 15:50:18 2016 +1000

--
 .../distributed/ConfigurationProperties.java|   6 +-
 .../internal/AbstractDistributionConfig.java|   2 +-
 .../internal/DistributionConfig.java|  16 +-
 .../internal/DistributionConfigImpl.java|  18 ++-
 .../internal/net/SSLConfigurationFactory.java   |   2 +-
 .../gemfire/internal/net/SocketCreator.java |   3 +-
 .../gemfire/management/GemFireProperties.java   | 161 ++-
 .../internal/beans/BeanUtilFuncs.java   |  17 ++
 .../gemfire/distributed/LocatorDUnitTest.java   |   5 +-
 .../net/SSLConfigurationFactoryTest.java|   2 +-
 .../net/SocketCreatorFactoryJUnitTest.java  |   4 +-
 .../gemfire/management/JMXMBeanDUnitTest.java   |   6 +-
 12 files changed, 206 insertions(+), 36 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/156d2d15/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java
index df85aca..6db4142 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/ConfigurationProperties.java
@@ -849,7 +849,7 @@ public interface ConfigurationProperties {
* Default: "" 
* Since: Geode 1.0
*/
-  String SSL_JMX_MANAGER_ALIAS = "ssl-jmx-alias";
+  String SSL_JMX_ALIAS = "ssl-jmx-alias";
   /**
* The static String definition of the "jmx-manager-ssl-ciphers" 
property
* 
@@ -871,7 +871,7 @@ public interface ConfigurationProperties {
* Ignored if jmx-manager is false.
* 
* Default: "false"
-   * @deprecated Since Geode 1.0 use {@link #SSL_ENABLED_COMPONENTS} with 
optional {@link #SSL_JMX_MANAGER_ALIAS}
+   * @deprecated Since Geode 1.0 use {@link #SSL_ENABLED_COMPONENTS} with 
optional {@link #SSL_JMX_ALIAS}
*/
   @Deprecated
   String JMX_MANAGER_SSL_ENABLED = "jmx-manager-ssl-enabled";
@@ -1813,7 +1813,7 @@ public interface ConfigurationProperties {
*
* DescriptionThis property will be set when using multi-key 
keystores. This will define the alias that
* the ssl connection factory would use when no alias has been set for the 
different component aliases.
-   * {@link #SSL_CLUSTER_ALIAS}, {@link #SSL_SERVER_ALIAS},{@link 
#SSL_LOCATOR_ALIAS},{@link #SSL_GATEWAY_ALIAS},{@link #SSL_JMX_MANAGER_ALIAS} , 
{@link #SSL_HTTP_SERVICE_ALIAS}
+   * {@link #SSL_CLUSTER_ALIAS}, {@link #SSL_SERVER_ALIAS},{@link 
#SSL_LOCATOR_ALIAS},{@link #SSL_GATEWAY_ALIAS},{@link #SSL_JMX_ALIAS} , {@link 
#SSL_HTTP_SERVICE_ALIAS}
* 
* Default: ""
* Since: Geode 1.0

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/156d2d15/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
index f92511e..ce77c5e 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/AbstractDistributionConfig.java
@@ -885,7 +885,7 @@ public abstract class AbstractDistributionConfig extends 
AbstractConfig implemen
 m.put(JMX_MANAGER, "If true then this member is willing to be a jmx 
manager. Defaults to false except on a locator.");
 m.put(JMX_MANAGER_START, "If true then the jmx manager will be started 
when the cache is created. Defaults to false.");
 m.put(JMX_MANAGER_SSL_ENABLED, "If true then the jmx manager will only 
allow SSL clients to connect. Defaults to false. This property is ignored if 
jmx-manager-port is 

incubator-geode git commit: GEODE-1836: remove defunct Java 1.6 block for Mac

[klund]

Repository: incubator-geode
Updated Branches:
  refs/heads/develop a4c38a469 -> 2a84453b1


GEODE-1836: remove defunct Java 1.6 block for Mac

Geode requires Java 1.8 and does not support Java 1.6. Attempting to
add the 1.6 classes.jar to the classpath for the Attach API results in
breaking the start and status commands in GFSH.

Removal of these script lines allows GFSH to use either the Attach API
in Java 1.8 or an alternative implementation for start and status. The
alternative implementation uses temporary files to communcate with the
other process. If you want to make sure you are using the Attach API
then simply set JAVA_HOME to the location of JDK 1.8.

If you use jenv on Mac, then consider configuring jenv to export
JAVA_HOME by executing:

$ jenv enable-plugin export


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

Branch: refs/heads/develop
Commit: 2a84453b160f3fc0b6b873b92c74954b3b192911
Parents: a4c38a4
Author: Kirk Lund 
Authored: Fri Sep 2 15:24:18 2016 -0700
Committer: Kirk Lund 
Committed: Tue Sep 6 11:04:38 2016 -0700

--
 geode-assembly/src/main/dist/bin/gfsh | 7 ---
 1 file changed, 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/2a84453b/geode-assembly/src/main/dist/bin/gfsh
--
diff --git a/geode-assembly/src/main/dist/bin/gfsh 
b/geode-assembly/src/main/dist/bin/gfsh
index 935a24e..48d3696 100755
--- a/geode-assembly/src/main/dist/bin/gfsh
+++ b/geode-assembly/src/main/dist/bin/gfsh
@@ -118,13 +118,6 @@ if [ ! -f "$TOOLS_JAR" ]; then
 TOOLS_JAR="$GF_JAVA_PARENT/../lib/tools.jar"
 if [ ! -f "$TOOLS_JAR" ]; then
 TOOLS_JAR=
-if [ "${UNAME}" = "darwin" ]; then
-# For MacOS, try default path
-
TOOLS_JAR="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Classes/classes.jar"
-if [ ! -f "$TOOLS_JAR" ]; then
-  TOOLS_JAR=
-fi
-fi
 fi
 fi
 

[06/18] incubator-geode git commit: GEODE-1818: fix NPE in Bug37377DUnitTest

[udo]

GEODE-1818: fix NPE in Bug37377DUnitTest

This closes #235


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

Branch: refs/heads/feature/GEODE-420
Commit: 8a644c25de9c4bc5a413de96dfac88451fda7fc8
Parents: ea5516c
Author: Scott Jewell 
Authored: Wed Aug 31 10:54:05 2016 -0700
Committer: Darrel Schneider 
Committed: Thu Sep 1 09:26:03 2016 -0700

--
 .../internal/cache/Bug37377DUnitTest.java   | 393 +--
 1 file changed, 176 insertions(+), 217 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8a644c25/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37377DUnitTest.java
--
diff --git 
a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37377DUnitTest.java
 
b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37377DUnitTest.java
index 0531100..35e9caf 100644
--- 
a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37377DUnitTest.java
+++ 
b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/Bug37377DUnitTest.java
@@ -22,32 +22,22 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 
 import com.gemstone.gemfire.test.dunit.cache.internal.JUnit4CacheTestCase;
-import com.gemstone.gemfire.test.dunit.internal.JUnit4DistributedTestCase;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 
 import java.io.File;
 import java.util.Properties;
+import java.util.concurrent.CountDownLatch;
 
 import com.gemstone.gemfire.cache.AttributesFactory;
 import com.gemstone.gemfire.cache.Cache;
 import com.gemstone.gemfire.cache.CacheFactory;
 import com.gemstone.gemfire.cache.DataPolicy;
-import com.gemstone.gemfire.cache.EntryEvent;
-import com.gemstone.gemfire.cache.Operation;
 import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.RegionAttributes;
 import com.gemstone.gemfire.cache.Scope;
-import com.gemstone.gemfire.cache30.CacheSerializableRunnable;
-import com.gemstone.gemfire.cache30.CacheTestCase;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.internal.cache.lru.EnableLRU;
-import 
com.gemstone.gemfire.internal.util.concurrent.CustomEntryConcurrentHashMap.HashEntry;
-import com.gemstone.gemfire.test.dunit.AsyncInvocation;
 import com.gemstone.gemfire.test.dunit.Host;
-import com.gemstone.gemfire.test.dunit.SerializableRunnable;
-import com.gemstone.gemfire.test.dunit.ThreadUtils;
 import com.gemstone.gemfire.test.dunit.VM;
-import com.gemstone.gemfire.test.dunit.Wait;
 
 /**
  * Bug37377 DUNIT Test: The Clear operation during a GII in progress can leave 
a
@@ -67,9 +57,7 @@ public class Bug37377DUnitTest extends JUnit4CacheTestCase
 
   protected static DistributedSystem distributedSystem = null;
 
-  private static VM vm0 = null;
-
-  private static VM vm1 = null;
+  VM vm0, vm1;
 
   protected static Cache cache = null;
 
@@ -77,6 +65,10 @@ public class Bug37377DUnitTest extends JUnit4CacheTestCase
 
   private static final int maxEntries = 1;
 
+  transient private static CountDownLatch clearLatch = new CountDownLatch(1);
+
+  static Boolean clearOccured = false;
+
   public Bug37377DUnitTest() {
 super();
 File file1 = new File(getTestMethodName() + "1");
@@ -99,206 +91,161 @@ public class Bug37377DUnitTest extends JUnit4CacheTestCase
 
   @Override
   public final void preTearDownCacheTestCase() throws Exception {
-vm1.invoke(destroyRegion());
-vm0.invoke(destroyRegion());
+vm1.invoke(() -> destroyRegion());
+vm0.invoke(() -> destroyRegion());
   }
 
   /**
* This method is used to create Cache in VM0
-   * 
-   * @return CacheSerializableRunnable
*/
 
-  private CacheSerializableRunnable createCacheForVM0()
-  {
-SerializableRunnable createCache = new CacheSerializableRunnable(
-"createCache") {
-  public void run2()
-  {
-try {
-
-  distributedSystem = (new Bug37377DUnitTest())
-  .getSystem(props);
-  assertTrue(distributedSystem != null);
-  cache = CacheFactory.create(distributedSystem);
-  assertTrue(cache != null);
-  AttributesFactory factory = new AttributesFactory();
-  factory.setScope(Scope.DISTRIBUTED_ACK);
-  factory.setDataPolicy(DataPolicy.PERSISTENT_REPLICATE);
-  factory.setDiskSynchronous(false);
-  factory.setDiskStoreName(cache.createDiskStoreFactory()
-   .setDiskDirs(dirs)
-   

[18/18] incubator-geode git commit: GEODE-420: Amended Tests in ConnectToLocatorSSLDUnitTest.java to new ssl config

[udo]

GEODE-420: Amended Tests in ConnectToLocatorSSLDUnitTest.java to new ssl config


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

Branch: refs/heads/feature/GEODE-420
Commit: 6853f56dd74383771f0c2d19506cabea6c0591f4
Parents: d4cca87
Author: Udo Kohlmeyer 
Authored: Wed Sep 7 03:23:01 2016 +1000
Committer: Udo Kohlmeyer 
Committed: Wed Sep 7 03:23:01 2016 +1000

--
 .../internal/DistributionConfigImpl.java| 17 
 .../gemfire/internal/AbstractConfig.java|  5 +
 .../internal/security/SecurableComponent.java   |  6 ++
 .../internal/JmxManagerLocatorRequest.java  |  8 ++--
 .../gemfire/distributed/LocatorDUnitTest.java   |  1 -
 .../ConnectToLocatorSSLDUnitTest.java   | 21 +---
 6 files changed, 36 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6853f56d/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
index 1ac92d0..c86b0e7 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfigImpl.java
@@ -26,13 +26,11 @@ import java.lang.reflect.Method;
 import java.net.InetAddress;
 import java.net.URL;
 import java.net.UnknownHostException;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Properties;
 import java.util.Set;
 
@@ -305,8 +303,10 @@ public class DistributionConfigImpl extends 
AbstractDistributionConfig implement
* The client Diffie-Hellman method name
*/
   private String securityClientDHAlgo = DEFAULT_SECURITY_CLIENT_DHALGO;
-  
-  /** The udp Diffie-Hellman method name*/
+
+  /**
+   * The udp Diffie-Hellman method name
+   */
   private String securityUDPDHAlgo = DEFAULT_SECURITY_UDP_DHALGO;
 
   /**
@@ -2118,17 +2118,17 @@ public class DistributionConfigImpl extends 
AbstractDistributionConfig implement
   public String getSecurityClientDHAlgo() {
 return securityClientDHAlgo;
   }
-  
+
   public void setSecurityClientDHAlgo(String value) {
 securityClientDHAlgo = (String) value;
   }
-  
+
   public String getSecurityUDPDHAlgo() {
 return securityUDPDHAlgo;
   }
 
   public void setSecurityUDPDHAlgo(String value) {
-securityUDPDHAlgo = (String)checkAttribute(SECURITY_UDP_DHALGO, value);
+securityUDPDHAlgo = (String) checkAttribute(SECURITY_UDP_DHALGO, value);
   }
 
   public String getSecurityPeerAuthInit() {
@@ -3060,7 +3060,8 @@ public class DistributionConfigImpl extends 
AbstractDistributionConfig implement
   /**
* Used by gemfire build.xml to generate a default gemfire.properties
* for use by applications. See bug 30995 for the feature request.
-   */ public static void main(String args[]) throws IOException {
+   */
+  public static void main(String args[]) throws IOException {
 DistributionConfigImpl cfg = new DistributionConfigImpl();
 String fileName = DistributionConfig.GEMFIRE_PREFIX + "properties";
 if (args != null && args.length > 0) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6853f56d/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java 
b/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
index 6fd4ae6..28b0cac 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/AbstractConfig.java
@@ -322,6 +322,11 @@ public abstract class AbstractConfig implements Config {
   return "" + value[0] + "-" + value[1];
 }
 
+if(result.getClass().isArray() && attName.startsWith("ssl-"))
+{
+  return SystemAdmin.join((Object[]) result,",");
+}
+
 if (result.getClass().isArray()) {
   return SystemAdmin.join((Object[]) result);
 }

[15/18] incubator-geode git commit: Merge branch 'develop' into feature/GEODE-420

[udo]

Merge branch 'develop' into feature/GEODE-420


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

Branch: refs/heads/feature/GEODE-420
Commit: c6f599748e11db03880ec8d036564447bf6db36e
Parents: a97ea4e bb829d3
Author: Udo Kohlmeyer 
Authored: Mon Sep 5 08:44:57 2016 +1000
Committer: Udo Kohlmeyer 
Committed: Mon Sep 5 08:44:57 2016 +1000

--
 .../gemfire/internal/GemFireVersion.java|  66 ++--
 .../internal/cache/BucketRegionQueue.java   |  28 +-
 .../internal/cache/DistributedRegion.java   |   2 +-
 .../gemfire/internal/cache/EntryExpiryTask.java |   3 +
 .../gemfire/internal/cache/ExpiryTask.java  |   5 +
 .../src/test/java/cacheRunner/Portfolio.java| 128 --
 .../src/test/java/cacheRunner/Position.java |  73 
 .../com/gemstone/gemfire/TXExpiryJUnitTest.java |   3 +
 .../cache/query/dunit/RemoteQueryDUnitTest.java |  14 +-
 .../gemfire/cache30/RegionTestCase.java |   9 +-
 .../internal/GemFireVersionJUnitTest.java   |  22 +-
 .../internal/cache/Bug37377DUnitTest.java   | 393 +--
 .../PartitionedRegionSingleHopDUnitTest.java|  37 +-
 ...tegratedClientGetPutAuthDistributedTest.java |   3 +-
 .../AbstractPartitionedRepositoryManager.java   | 124 ++
 .../lucene/internal/IndexRepositoryFactory.java |  21 +-
 .../internal/LuceneIndexCreationProfile.java|  12 +-
 .../lucene/internal/LuceneIndexFactory.java |  30 ++
 .../LuceneIndexForPartitionedRegion.java| 134 +++
 .../cache/lucene/internal/LuceneIndexImpl.java  |  79 +++-
 .../cache/lucene/internal/LuceneRawIndex.java   |  43 ++
 .../lucene/internal/LuceneRawIndexFactory.java  |  27 ++
 .../lucene/internal/LuceneServiceImpl.java  |   5 +-
 .../internal/PartitionedRepositoryManager.java  | 123 +-
 .../internal/RawIndexRepositoryFactory.java |  63 +++
 .../internal/RawLuceneRepositoryManager.java|  46 +++
 .../repository/IndexRepositoryImpl.java |   6 +-
 .../LuceneIndexCreationIntegrationTest.java |  29 ++
 .../cache/lucene/LuceneQueriesPRBase.java   |   7 +-
 .../LuceneIndexCreationProfileJUnitTest.java|  12 +-
 .../LuceneIndexForPartitionedRegionTest.java|  34 +-
 .../LuceneIndexRecoveryHAIntegrationTest.java   |  19 +-
 .../PartitionedRepositoryManagerJUnitTest.java  |  68 ++--
 .../RawLuceneRepositoryManagerJUnitTest.java|  97 +
 .../DistributedScoringJUnitTest.java|   2 +-
 .../IndexRepositoryImplJUnitTest.java   |   6 +-
 .../IndexRepositoryImplPerformanceTest.java |   2 +-
 .../cache/lucene/test/IndexRepositorySpy.java   |  20 +-
 .../wan/GatewaySenderEventRemoteDispatcher.java |   8 +-
 39 files changed, 991 insertions(+), 812 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c6f59974/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireVersion.java
--

[01/18] incubator-geode git commit: GEODE-1819: modified BRQ so that all initialization is done before destroyed tokens are cleaned up

[udo]

Repository: incubator-geode
Updated Branches:
  refs/heads/feature/GEODE-420 a97ea4ee5 -> 6853f56dd


GEODE-1819: modified BRQ so that all initialization is done before destroyed 
tokens are cleaned up


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

Branch: refs/heads/feature/GEODE-420
Commit: bb44eb6d51144a3c9798d4323eabf3d4beab8cda
Parents: 331cf28
Author: Barry Oglesby 
Authored: Fri Aug 26 15:28:45 2016 -0700
Committer: Barry Oglesby 
Committed: Wed Aug 31 13:54:00 2016 -0700

--
 .../internal/cache/BucketRegionQueue.java   | 28 +++-
 .../internal/cache/DistributedRegion.java   |  2 +-
 2 files changed, 11 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bb44eb6d/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegionQueue.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegionQueue.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegionQueue.java
index a3d9d97..92442d9 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegionQueue.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/BucketRegionQueue.java
@@ -95,26 +95,18 @@ public class BucketRegionQueue extends 
AbstractBucketRegionQueue {
 indexes = new ConcurrentHashMap();
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see
-   * 
com.gemstone.gemfire.internal.cache.BucketRegion#initialize(java.io.InputStream
-   * ,
-   * 
com.gemstone.gemfire.distributed.internal.membership.InternalDistributedMember
-   * , com.gemstone.gemfire.internal.cache.InternalRegionArguments)
-   */
-  @Override
-  protected void initialize(InputStream snapshotInputStream,
-  InternalDistributedMember imageTarget,
-  InternalRegionArguments internalRegionArgs) throws TimeoutException,
-  IOException, ClassNotFoundException {
+  protected void 
cleanUpDestroyedTokensAndMarkGIIComplete(InitialImageOperation.GIIStatus 
giiStatus) {
+// Load events from temp queued events
+loadEventsFromTempQueue();
 
-super.initialize(snapshotInputStream, imageTarget, internalRegionArgs);
+// Initialize the eventSeqNumQueue
+initializeEventSeqNumQueue();
 
-//take initialization writeLock inside the method after synchronizing on 
tempQueue
-loadEventsFromTempQueue();
-
+// Clean up destroyed tokens
+super.cleanUpDestroyedTokensAndMarkGIIComplete(giiStatus);
+  }
+
+  private void initializeEventSeqNumQueue() {
 getInitializationLock().writeLock().lock();
 try {
   if (!this.keySet().isEmpty()) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bb44eb6d/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegion.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegion.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegion.java
index a7b82ac..aa74af7 100755
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegion.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/DistributedRegion.java
@@ -1635,7 +1635,7 @@ public class DistributedRegion extends LocalRegion 
implements
   // release afterGetInitialImageInitializationLatch before unlocking
   // cleanUpLock
   @edu.umd.cs.findbugs.annotations.SuppressWarnings(value="UL_UNRELEASED_LOCK")
-  private void cleanUpDestroyedTokensAndMarkGIIComplete(GIIStatus giiStatus)
+  protected void cleanUpDestroyedTokensAndMarkGIIComplete(GIIStatus giiStatus)
   {
 //We need to clean up the disk before we release the after get initial 
image latch
 DiskRegion dskRgn = getDiskRegion();

[09/18] incubator-geode git commit: GEODE-11: let profile's getId() return unique name

[udo]

GEODE-11: let profile's getId() return unique name


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

Branch: refs/heads/feature/GEODE-420
Commit: 426f1ae22f1c5933dd14c08c29c7afbfdef60f4f
Parents: f497c59
Author: zhouxh 
Authored: Thu Sep 1 18:04:14 2016 -0700
Committer: zhouxh 
Committed: Thu Sep 1 18:05:06 2016 -0700

--
 .../lucene/internal/LuceneIndexCreationProfile.java | 12 +++-
 .../cache/lucene/internal/LuceneServiceImpl.java|  2 +-
 .../internal/LuceneIndexCreationProfileJUnitTest.java   | 12 ++--
 3 files changed, 10 insertions(+), 16 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/426f1ae2/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexCreationProfile.java
--
diff --git 
a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexCreationProfile.java
 
b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexCreationProfile.java
index 720d20d..de331ea 100644
--- 
a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexCreationProfile.java
+++ 
b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexCreationProfile.java
@@ -44,14 +44,6 @@ public class LuceneIndexCreationProfile implements 
CacheServiceProfile, DataSeri
   /* Used by DataSerializer */
   public LuceneIndexCreationProfile() {}
 
-  public LuceneIndexCreationProfile(String indexName, String[] fieldNames, 
Analyzer analyzer,
-  Map fieldAnalyzers) {
-this.indexName = indexName;
-this.fieldNames = fieldNames;
-this.analyzerClass = analyzer.getClass().getSimpleName();
-initializeFieldAnalyzers(fieldAnalyzers);
-  }
-
   public LuceneIndexCreationProfile(String indexName, String regionPath, 
String[] fieldNames, Analyzer analyzer,
 Map fieldAnalyzers) {
 this.indexName = indexName;
@@ -90,7 +82,7 @@ public class LuceneIndexCreationProfile implements 
CacheServiceProfile, DataSeri
 
   @Override
   public String getId() {
-return this.indexName;
+return "lucene_"+LuceneServiceImpl.getUniqueIndexName(indexName, 
regionPath);
   }
 
   @Override
@@ -143,6 +135,7 @@ public class LuceneIndexCreationProfile implements 
CacheServiceProfile, DataSeri
   @Override
   public void toData(DataOutput out) throws IOException {
 DataSerializer.writeString(this.indexName, out);
+DataSerializer.writeString(this.regionPath, out);
 DataSerializer.writeStringArray(this.fieldNames, out);
 DataSerializer.writeString(this.analyzerClass, out);
 DataSerializer.writeHashMap(this.fieldAnalyzers, out);
@@ -151,6 +144,7 @@ public class LuceneIndexCreationProfile implements 
CacheServiceProfile, DataSeri
   @Override
   public void fromData(DataInput in) throws IOException, 
ClassNotFoundException {
 this.indexName = DataSerializer.readString(in);
+this.regionPath = DataSerializer.readString(in);
 this.fieldNames = DataSerializer.readStringArray(in);
 this.analyzerClass = DataSerializer.readString(in);
 this.fieldAnalyzers = DataSerializer.readHashMap(in);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/426f1ae2/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
--
diff --git 
a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
 
b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
index 29a8e62..81a62b8 100644
--- 
a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
+++ 
b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneServiceImpl.java
@@ -183,7 +183,7 @@ public class LuceneServiceImpl implements 
InternalLuceneService {
   }
 
   // Add index creation profile
-  internalRegionArgs.addCacheServiceProfile(new 
LuceneIndexCreationProfile(indexName, fields, analyzer, fieldAnalyzers));
+  internalRegionArgs.addCacheServiceProfile(new 
LuceneIndexCreationProfile(indexName, dataRegionPath, fields, analyzer, 
fieldAnalyzers));
 }
 return updatedRA;
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/426f1ae2/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexCreationProfileJUnitTest.java

[13/18] incubator-geode git commit: GEODE-1828 Added some more logging to debug further

[udo]

GEODE-1828 Added some more logging to debug further


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

Branch: refs/heads/feature/GEODE-420
Commit: fac42cbc2e461da50d80c7cd1ae5188227fbc5a6
Parents: d2d62d6
Author: Hitesh Khamesra 
Authored: Fri Sep 2 15:15:46 2016 -0700
Committer: Hitesh Khamesra 
Committed: Fri Sep 2 15:16:23 2016 -0700

--
 .../gemstone/gemfire/internal/cache/EntryExpiryTask.java| 3 +++
 .../com/gemstone/gemfire/internal/cache/ExpiryTask.java | 5 +
 .../test/java/com/gemstone/gemfire/TXExpiryJUnitTest.java   | 3 +++
 .../java/com/gemstone/gemfire/cache30/RegionTestCase.java   | 9 ++---
 4 files changed, 17 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fac42cbc/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryExpiryTask.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryExpiryTask.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryExpiryTask.java
index 252c9c3..ac2a054 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryExpiryTask.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/EntryExpiryTask.java
@@ -345,6 +345,9 @@ public class EntryExpiryTask extends ExpiryTask {
 boolean superCancel = super.cancel();
 if (superCancel) {
   this.re = null;
+  if (expiryTaskListener != null) {
+expiryTaskListener.afterCancel(this);
+  }
 }
 return superCancel;
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fac42cbc/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ExpiryTask.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ExpiryTask.java 
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ExpiryTask.java
index 09ee1ea..5e09cbe 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ExpiryTask.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/ExpiryTask.java
@@ -535,5 +535,10 @@ public abstract class ExpiryTask extends 
SystemTimer.SystemTimerTask {
  */
 public void afterExpire(ExpiryTask et);
 
+/**
+ * Called when task has been canceled
+ */
+public void afterCancel(ExpiryTask et);
+
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fac42cbc/geode-core/src/test/java/com/gemstone/gemfire/TXExpiryJUnitTest.java
--
diff --git 
a/geode-core/src/test/java/com/gemstone/gemfire/TXExpiryJUnitTest.java 
b/geode-core/src/test/java/com/gemstone/gemfire/TXExpiryJUnitTest.java
index caa4d86..d5e54dc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/TXExpiryJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/TXExpiryJUnitTest.java
@@ -271,6 +271,9 @@ public class TXExpiryJUnitTest {
   this.et = et;
 }
 @Override
+public void afterCancel(ExpiryTask et) {
+}
+@Override
 public void afterSchedule(ExpiryTask et) {
 }
 @Override

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fac42cbc/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionTestCase.java
--
diff --git 
a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionTestCase.java 
b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionTestCase.java
index aaa2abe..e88b6f0 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionTestCase.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/cache30/RegionTestCase.java
@@ -3544,7 +3544,10 @@ public abstract class RegionTestCase extends 
JUnit4CacheTestCase {
   }
   
   class ExpiryCallbacks implements ExpiryTaskListener {
-
+ @Override
+public void afterCancel(ExpiryTask et) {
+  getCache().getLogger().info("ExpiryCallbacks.afterCancel", new 
RuntimeException("TaskCanceled"));
+}
 @Override
 public void afterSchedule(ExpiryTask et) {
   printState(et, "ExpiryCallbacks.afterSchedule " );
@@ -3571,7 +3574,6 @@ public abstract class RegionTestCase extends 
JUnit4CacheTestCase {
   Date ttlTime = new Date(et.getTTLExpirationTime());
   Date getNow = new Date(et.getNow());
   Date scheduleETime = new Date(et.scheduledExecutionTime());
-  //et.getKey();
   

[11/18] incubator-geode git commit: GEODE-1838: remove unused test classes

[udo]

GEODE-1838: remove unused test classes


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

Branch: refs/heads/feature/GEODE-420
Commit: b89f71ce6f159b74635ff5a25c216ac09d690b90
Parents: 68e770f
Author: Kirk Lund 
Authored: Thu Sep 1 17:09:54 2016 -0700
Committer: Kirk Lund 
Committed: Fri Sep 2 09:43:21 2016 -0700

--
 .../src/test/java/cacheRunner/Portfolio.java| 128 ---
 .../src/test/java/cacheRunner/Position.java |  73 ---
 2 files changed, 201 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/b89f71ce/geode-core/src/test/java/cacheRunner/Portfolio.java
--
diff --git a/geode-core/src/test/java/cacheRunner/Portfolio.java 
b/geode-core/src/test/java/cacheRunner/Portfolio.java
deleted file mode 100644
index 5dd2b7e..000
--- a/geode-core/src/test/java/cacheRunner/Portfolio.java
+++ /dev/null
@@ -1,128 +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 cacheRunner;
-
-import java.util.*;
-import java.io.Serializable;
-import com.gemstone.gemfire.cache.Declarable;
-
-/**
- * A stock portfolio that consists of multiple {@link Position}
- * objects that represent shares of stock (a "security").  Instances
- * of Portfolio can be stored in a GemFire
- * Region and their contents can be queried using the
- * GemFire query service.
- *
- * 
- *
- * This class is Serializable because we want it to be
- * distributed to multiple members of a distributed system.  Because
- * this class is Declarable, we can describe instances of
- * it in a GemFire cache.xml file.
- *
- * @since GemFire 4.0
- */
-public class Portfolio implements Declarable, Serializable {
-  private int id;  /* id is used as the entry key and is stored in the entry */
-  private String type;
-  private Map positions = new HashMap();
-  private String status;
-  
-  /**
-   * Initializes an instance of Portfolio from a
-   * Properties object assembled from data residing in a
-   * cache.xml file.
-   */
-  public void init(Properties props) {
-this.id = Integer.parseInt(props.getProperty("id"));
-this.type = props.getProperty("type", "type1");
-this.status = props.getProperty("status", "active");
-
-// get the positions. These are stored in the properties object
-// as Positions, not String, so use Hashtable protocol to get at them.
-// the keys are named "positionN", where N is an integer.
-for (Map.Entry entry : props.entrySet()) {
-  String key = (String) entry.getKey();
-  if (key.startsWith("position")) {
-Position pos = (Position) entry.getValue();
-this.positions.put(pos.getSecId(), pos);
-  }
-}
-  }
-  
-  /**
-   * Returns the status of this portfolio (active or
-   * inactive). 
-   */
-  public String getStatus(){
-return status;
-  }
-  
-  /**
-   * Returns the id of this portfolio.  When a Portfolio
-   * placed in a GemFire Region entry, its id is used as
-   * the key.
-   */
-  public int getId(){
-return this.id;
-  }
-  
-  /**
-   * Returns the positions held in this portfolio.
-   *
-   * @return a Map whose keys are the {@linkplain
-   * Position#getSecId security ids} and whose values are
-   * {@link Position} objects.
-   */
-  public Map getPositions(){
-return this.positions;
-  }
-  
-  /**
-   * Returns the type of this portfolio.  In this example, the type is
-   * an arbitrary string.
-   */
-  public String getType() {
-return this.type;
-  }
-  
-  /**
-   * Returns whether or not this portfolio is active.
-   */
-  public boolean isActive(){
-return status.equals("active");
-  }
-  
-  @Override
-  public String toString(){
-

[07/18] incubator-geode git commit: GEODE-1805 Now test retries to fetch the all pr-meta-data

[udo]

GEODE-1805 Now test retries to fetch the all pr-meta-data


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

Branch: refs/heads/feature/GEODE-420
Commit: 49facb8b5d627ddebbeb4aeb87aacdcf88f2ee04
Parents: 8a644c2
Author: Hitesh Khamesra 
Authored: Thu Sep 1 09:33:27 2016 -0700
Committer: Hitesh Khamesra 
Committed: Thu Sep 1 09:34:13 2016 -0700

--
 .../PartitionedRegionSingleHopDUnitTest.java| 22 
 1 file changed, 13 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/49facb8b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java
 
b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java
index 78fd5e0..470a8d4 100755
--- 
a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java
+++ 
b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java
@@ -978,7 +978,7 @@ public class PartitionedRegionSingleHopDUnitTest extends 
JUnit4CacheTestCase {
   return finished;
 });
   }
-
+  
   @Test
   public void testClientMetadataForPersistentPrs() throws Exception {
 Integer port0 = (Integer)member0.invoke(() -> 
PartitionedRegionSingleHopDUnitTest.createPersistentPrsAndServer( 3, 4 ));
@@ -994,7 +994,8 @@ public class PartitionedRegionSingleHopDUnitTest extends 
JUnit4CacheTestCase {
 member3.invoke(() -> 
PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4));
 
 createClient(port0, port1, port2, port3);
-fetchAndValidateMetadata();
+Awaitility.waitAtMost(60, TimeUnit.SECONDS).until(() -> 
fetchAndValidateMetadata());
+
 member0.invoke(() -> 
PartitionedRegionSingleHopDUnitTest.closeCacheAndDisconnect());
 member1.invoke(() -> 
PartitionedRegionSingleHopDUnitTest.closeCacheAndDisconnect());
 member2.invoke(() -> 
PartitionedRegionSingleHopDUnitTest.closeCacheAndDisconnect());
@@ -1011,17 +1012,18 @@ public class PartitionedRegionSingleHopDUnitTest 
extends JUnit4CacheTestCase {
 fetchAndValidateMetadata();
   }
 
-  private void fetchAndValidateMetadata() {
+  private boolean fetchAndValidateMetadata() {
 ClientMetadataService service = ((GemFireCacheImpl)this.cache)
 .getClientMetadataService();
 service.getClientPRMetadata((LocalRegion)this.region);
 HashMap servers = service
-.groupByServerToAllBuckets(this.region, true);
+.groupByServerToAllBuckets(this.region, true);
 if (servers == null) {
-  fail("The client metadata contains no servers for region "
-  + this.region.getFullPath());
+  //fail("The client metadata contains no servers for region "
+//  + this.region.getFullPath());
+  return false;
 }
-else {
+else if(servers.size() == 4) {
   region.getCache().getLogger().fine("The client metadata contains the 
following "
   + servers.size() + " servers for region " + this.region.getFullPath()
   + ":");
@@ -1029,9 +1031,11 @@ public class PartitionedRegionSingleHopDUnitTest extends 
JUnit4CacheTestCase {
 region.getCache().getLogger().fine(entry.getKey() + "->" + 
entry.getValue());
   }
   if (servers.size() < 4) {
-fail("Servers size is " +servers.size() + " less than expected 4.");
-  }
+region.getCache().getLogger().info("Servers size is " +servers.size() 
+ " less than expected 4.");
+return false;
+  }  
 }
+return true;
   }
 
   public static void verifyMetadata(Map 
clientMap){

[17/18] incubator-geode git commit: Merge branch 'develop' into feature/GEODE-420

[udo]

Merge branch 'develop' into feature/GEODE-420

# Conflicts:
#   
geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerLocatorRequest.java
#   
geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java


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

Branch: refs/heads/feature/GEODE-420
Commit: d4cca8737b4dafb727f90be28ad0fb8e097172bf
Parents: c6f5997 a4c38a4
Author: Udo Kohlmeyer 
Authored: Wed Sep 7 02:19:15 2016 +1000
Committer: Udo Kohlmeyer 
Committed: Wed Sep 7 02:19:15 2016 +1000

--
 .../internal/JmxManagerLocatorRequest.java  |   8 +-
 .../internal/cli/commands/ShellCommands.java|  13 +-
 .../ConnectToLocatorSSLDUnitTest.java   | 136 +++
 3 files changed, 150 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d4cca873/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerLocatorRequest.java
--
diff --cc 
geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerLocatorRequest.java
index 495f64d,ac250d0..39f914f
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerLocatorRequest.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerLocatorRequest.java
@@@ -88,8 -85,11 +85,13 @@@ public class JmxManagerLocatorRequest i
  distributionConfigProps.putAll(sslConfigProps);
}
  
+   // re-initialize the SocketCreator with the sslConfigProps. Note this 
initializes the SocketCreator with cluster-ssl-* settings since
+   // we are connecting to the locator only.
 -  SocketCreator.getDefaultInstance(distributionConfigProps);
++  //TODO Udo: Look into this
++  // SocketCreator.getDefaultInstance(distributionConfigProps);
+ 
 -  Object responseFromServer = TcpClient.requestToServer(networkAddress, 
locatorPort, SINGLETON, msTimeout);
 +  TcpClient client = new TcpClient();
 +  Object responseFromServer = client.requestToServer(networkAddress, 
locatorPort, SINGLETON, msTimeout);
  
return (JmxManagerLocatorResponse) responseFromServer;
  }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d4cca873/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
--

[08/18] incubator-geode git commit: GEODE-1774 Modified test to ignore unnecessary checks.

[udo]

GEODE-1774 Modified test to ignore unnecessary checks.


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

Branch: refs/heads/feature/GEODE-420
Commit: f497c596c31ca29fde1e90e7980cac7422fb27ee
Parents: 49facb8
Author: Hitesh Khamesra 
Authored: Thu Sep 1 13:31:57 2016 -0700
Committer: Hitesh Khamesra 
Committed: Thu Sep 1 13:31:57 2016 -0700

--
 .../cache/PartitionedRegionSingleHopDUnitTest.java   | 15 ---
 1 file changed, 8 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f497c596/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java
 
b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java
index 470a8d4..83f91a8 100755
--- 
a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java
+++ 
b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java
@@ -1901,6 +1901,7 @@ public class PartitionedRegionSingleHopDUnitTest extends 
JUnit4CacheTestCase {
 ClientMetadataService cms = 
((GemFireCacheImpl)cache).getClientMetadataService();
 
 cms.satisfyRefreshMetadata_TEST_ONLY(false);
+
 region.put(new Integer(0), "update0");
 assertEquals(false, cms.isRefreshMetadataTestOnly());
 
@@ -1970,13 +1971,13 @@ public class PartitionedRegionSingleHopDUnitTest 
extends JUnit4CacheTestCase {
 //make sure all fetch tasks are completed
 Awaitility.waitAtMost(60, TimeUnit.SECONDS).until(() -> 
cms.getRefreshTaskCount() == 0);
 
-final Map regionMetaData = cms
-.getClientPRMetadata_TEST_ONLY();
-Awaitility.waitAtMost(60, TimeUnit.SECONDS).until(() -> 
(regionMetaData.size() == 4));
-assertEquals(4, regionMetaData.size());
-assertTrue(regionMetaData.containsKey(region.getFullPath()));
-final ClientPartitionAdvisor prMetaData = 
regionMetaData.get(region.getFullPath());
-Awaitility.waitAtMost(60, TimeUnit.SECONDS).until(() -> 
(prMetaData.getBucketServerLocationsMap_TEST_ONLY().size() == 4));
+//final Map regionMetaData = cms
+//.getClientPRMetadata_TEST_ONLY();
+//Awaitility.waitAtMost(60, TimeUnit.SECONDS).until(() -> 
(regionMetaData.size() == 4));
+//assertEquals(4, regionMetaData.size());
+//assertTrue(regionMetaData.containsKey(region.getFullPath()));
+//final ClientPartitionAdvisor prMetaData = 
regionMetaData.get(region.getFullPath());
+//Awaitility.waitAtMost(60, TimeUnit.SECONDS).until(() -> 
(prMetaData.getBucketServerLocationsMap_TEST_ONLY().size() == 4));
   }
 }
 

[03/18] incubator-geode git commit: GEODE-11: create index repository using raw Lucene directory.

[udo]

GEODE-11: create index repository using raw Lucene directory.

GEODE-11: add RawDirectory using index instance

GEODE-11: add abstract class for index and repositoryManager

remove commented lines in test code


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

Branch: refs/heads/feature/GEODE-420
Commit: 746820bb18fe3f3ab7bd6b00f847821d934bbf09
Parents: 07798ca
Author: zhouxh 
Authored: Fri Jul 15 15:57:07 2016 -0700
Committer: zhouxh 
Committed: Wed Aug 31 17:09:08 2016 -0700

--
 .../AbstractPartitionedRepositoryManager.java   | 124 +
 .../lucene/internal/IndexRepositoryFactory.java |  21 ++-
 .../lucene/internal/LuceneIndexFactory.java |  30 +
 .../LuceneIndexForPartitionedRegion.java| 134 +++
 .../cache/lucene/internal/LuceneIndexImpl.java  |  79 +--
 .../cache/lucene/internal/LuceneRawIndex.java   |  43 ++
 .../lucene/internal/LuceneRawIndexFactory.java  |  27 
 .../lucene/internal/LuceneServiceImpl.java  |   3 +-
 .../internal/PartitionedRepositoryManager.java  | 123 ++---
 .../internal/RawIndexRepositoryFactory.java |  63 +
 .../internal/RawLuceneRepositoryManager.java|  46 +++
 .../repository/IndexRepositoryImpl.java |   6 +-
 .../LuceneIndexCreationIntegrationTest.java |  29 
 .../cache/lucene/LuceneQueriesPRBase.java   |   7 +-
 .../LuceneIndexForPartitionedRegionTest.java|  34 -
 .../LuceneIndexRecoveryHAIntegrationTest.java   |  19 +--
 .../PartitionedRepositoryManagerJUnitTest.java  |  68 +-
 .../RawLuceneRepositoryManagerJUnitTest.java|  97 ++
 .../DistributedScoringJUnitTest.java|   2 +-
 .../IndexRepositoryImplJUnitTest.java   |   2 +-
 .../IndexRepositoryImplPerformanceTest.java |   2 +-
 .../cache/lucene/test/IndexRepositorySpy.java   |  20 +--
 22 files changed, 689 insertions(+), 290 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/746820bb/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/AbstractPartitionedRepositoryManager.java
--
diff --git 
a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/AbstractPartitionedRepositoryManager.java
 
b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/AbstractPartitionedRepositoryManager.java
new file mode 100755
index 000..1dc716c
--- /dev/null
+++ 
b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/AbstractPartitionedRepositoryManager.java
@@ -0,0 +1,124 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.gemstone.gemfire.cache.lucene.internal;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import com.gemstone.gemfire.InternalGemFireError;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.execute.RegionFunctionContext;
+import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepository;
+import com.gemstone.gemfire.cache.lucene.internal.repository.RepositoryManager;
+import 
com.gemstone.gemfire.cache.lucene.internal.repository.serializer.LuceneSerializer;
+import com.gemstone.gemfire.internal.cache.BucketNotFoundException;
+import com.gemstone.gemfire.internal.cache.BucketRegion;
+import com.gemstone.gemfire.internal.cache.PartitionedRegion;
+import 
com.gemstone.gemfire.internal.cache.execute.InternalRegionFunctionContext;
+
+public abstract class AbstractPartitionedRepositoryManager implements 
RepositoryManager {
+
+  /** map of the parent bucket region to the index repository
+   * 
+   * This is based on the BucketRegion in case a bucket is rebalanced, 

[16/18] incubator-geode git commit: GEODE-1834: initilize the socketcreator with the correct ssl settings

[udo]

GEODE-1834: initilize the socketcreator with the correct ssl settings


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

Branch: refs/heads/feature/GEODE-420
Commit: a4c38a469d0726c8fd59f444e342d3d062c47004
Parents: bb829d3
Author: Jinmei Liao 
Authored: Thu Sep 1 09:27:11 2016 -0700
Committer: Jinmei Liao 
Committed: Tue Sep 6 08:27:45 2016 -0700

--
 .../internal/JmxManagerLocatorRequest.java  |   8 +-
 .../internal/cli/commands/ShellCommands.java|  21 ++-
 .../ConnectToLocatorSSLDUnitTest.java   | 136 +++
 3 files changed, 150 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a4c38a46/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerLocatorRequest.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerLocatorRequest.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerLocatorRequest.java
index 861f51d..ac250d0 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerLocatorRequest.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerLocatorRequest.java
@@ -25,6 +25,7 @@ import java.util.Properties;
 
 import com.gemstone.gemfire.distributed.internal.tcpserver.TcpClient;
 import com.gemstone.gemfire.internal.DataSerializableFixedID;
+import com.gemstone.gemfire.internal.SocketCreator;
 import com.gemstone.gemfire.internal.Version;
 
 /**
@@ -80,13 +81,14 @@ public class JmxManagerLocatorRequest implements 
DataSerializableFixedID {
 InetAddress networkAddress = InetAddress.getByName(locatorHost);
 
 try {
-  // Changes for 46623
-  // initialize the SocketCreator with props which may contain SSL config
-  // empty distConfProps will reset SocketCreator
   if (sslConfigProps != null) {
 distributionConfigProps.putAll(sslConfigProps);
   }
 
+  // re-initialize the SocketCreator with the sslConfigProps. Note this 
initializes the SocketCreator with cluster-ssl-* settings since
+  // we are connecting to the locator only.
+  SocketCreator.getDefaultInstance(distributionConfigProps);
+
   Object responseFromServer = TcpClient.requestToServer(networkAddress, 
locatorPort, SINGLETON, msTimeout);
 
   return (JmxManagerLocatorResponse) responseFromServer;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a4c38a46/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
index 09a25a6..daa7262 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
@@ -17,6 +17,8 @@
 
 package com.gemstone.gemfire.management.internal.cli.commands;
 
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
+
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
@@ -38,11 +40,18 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Set;
+
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManagerFactory;
 
+import org.springframework.shell.core.CommandMarker;
+import org.springframework.shell.core.ExitShellRequest;
+import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
+import org.springframework.shell.core.annotation.CliCommand;
+import org.springframework.shell.core.annotation.CliOption;
+
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.ClassPathLoader;
 import com.gemstone.gemfire.internal.DSFIDFactory;
@@ -79,14 +88,6 @@ import 
com.gemstone.gemfire.management.internal.web.shell.HttpOperationInvoker;
 import 
com.gemstone.gemfire.management.internal.web.shell.RestHttpOperationInvoker;
 import com.gemstone.gemfire.security.AuthenticationFailedException;
 
-import org.springframework.shell.core.CommandMarker;
-import org.springframework.shell.core.ExitShellRequest;
-import 

[14/18] incubator-geode git commit: GEODE-1809: Improve printing

[udo]

GEODE-1809: Improve printing

Sort the properties so they look pretty.


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

Branch: refs/heads/feature/GEODE-420
Commit: bb829d3dcaa7105d517868a6fc060981e95643f3
Parents: fac42cb
Author: Anthony Baker 
Authored: Fri Sep 2 19:55:52 2016 -0700
Committer: Anthony Baker 
Committed: Fri Sep 2 19:57:32 2016 -0700

--
 .../main/java/com/gemstone/gemfire/internal/GemFireVersion.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/bb829d3d/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireVersion.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireVersion.java 
b/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireVersion.java
index 0d0bd58..d8fa21b 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireVersion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireVersion.java
@@ -26,6 +26,7 @@ import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.Properties;
 import java.util.StringTokenizer;
+import java.util.TreeMap;
 
 import com.gemstone.gemfire.InternalGemFireError;
 import com.gemstone.gemfire.SystemFailure;
@@ -217,7 +218,7 @@ public class GemFireVersion {
   if (error.isPresent()) {
 pw.println(error.get());
   } else {
-for (Entry props : description.entrySet()) {
+for (Entry props : new TreeMap<>(description).entrySet()) {
   pw.println(props.getKey() + ": " + props.getValue());
 }
   }

[10/18] incubator-geode git commit: GEODE-1832: remove dependency on cacheRunner package

[udo]

GEODE-1832: remove dependency on cacheRunner package

Comment out disabled test with note about how to rewrite the test. See
GEODE-1837.


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

Branch: refs/heads/feature/GEODE-420
Commit: 68e770f422f2671bb60db79d7bb7999adcef2bfd
Parents: 426f1ae
Author: Kirk Lund 
Authored: Thu Sep 1 17:07:36 2016 -0700
Committer: Kirk Lund 
Committed: Fri Sep 2 09:43:20 2016 -0700

--
 .../cache/query/dunit/RemoteQueryDUnitTest.java   | 14 +-
 1 file changed, 5 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/68e770f4/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
--
diff --git 
a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
 
b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
index 3ab90c9..686efb0 100644
--- 
a/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
+++ 
b/geode-core/src/test/java/com/gemstone/gemfire/cache/query/dunit/RemoteQueryDUnitTest.java
@@ -29,9 +29,6 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
-import cacheRunner.Portfolio;
-import cacheRunner.Position;
-
 import com.gemstone.gemfire.DataSerializable;
 import com.gemstone.gemfire.DataSerializer;
 import com.gemstone.gemfire.cache.AttributesFactory;
@@ -53,7 +50,6 @@ import 
com.gemstone.gemfire.distributed.internal.InternalDistributedSystem;
 import com.gemstone.gemfire.test.dunit.Assert;
 import com.gemstone.gemfire.test.dunit.DistributedTestUtils;
 import com.gemstone.gemfire.test.dunit.Host;
-import com.gemstone.gemfire.test.dunit.LogWriterUtils;
 import com.gemstone.gemfire.test.dunit.NetworkUtils;
 import com.gemstone.gemfire.test.dunit.SerializableRunnable;
 import com.gemstone.gemfire.test.dunit.VM;
@@ -486,10 +482,10 @@ public class RemoteQueryDUnitTest extends 
JUnit4CacheTestCase {
   /**
* Tests remote complex query execution.
*/
-  @Ignore("TODO: test is disabled")
+  @Ignore("GEODE-1837: rewrite this test using Portfolio and Position in 
package com.gemstone.gemfire.cache.query.data")
   @Test
   public void testRemoteComplexQueries() throws CacheException {
-
+/*
 final String name = this.getName();
 final Host host = Host.getHost(0);
 VM vm0 = host.getVM(0);
@@ -655,7 +651,7 @@ public class RemoteQueryDUnitTest extends 
JUnit4CacheTestCase {
   SelectResults results = null;
 
   queryString =
-"IMPORT cacheRunner.Position; " +
+"IMPORT Position; " +
 "SELECT DISTINCT id, status FROM " + region.getFullPath() +
 "WHERE NOT (SELECT DISTINCT * FROM positions.values posnVal TYPE 
Position " +
 "WHERE posnVal.secId='AOL' OR posnVal.secId='SAP').isEmpty";
@@ -676,7 +672,7 @@ public class RemoteQueryDUnitTest extends 
JUnit4CacheTestCase {
   public void run() {
 stopBridgeServer(getCache());
   }
-});
+});*/
   }
 
   /**
@@ -1484,7 +1480,7 @@ public class RemoteQueryDUnitTest extends 
JUnit4CacheTestCase {
 String queryString = "import TestObject; select distinct * from /trade";
 
 String queryString =
-  "IMPORT cacheRunner.Position; " +
+  "IMPORT Position; " +
   "SELECT DISTINCT id, status FROM /root/portfolios " +
   "WHERE NOT (SELECT DISTINCT * FROM positions.values posnVal TYPE 
Position " +
   "WHERE posnVal.secId='AOL' OR posnVal.secId='SAP').isEmpty";

[04/18] incubator-geode git commit: GEODE-11: need to fix the junit test case when adding FSDirectory

[udo]

GEODE-11: need to fix the junit test case when adding FSDirectory


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

Branch: refs/heads/feature/GEODE-420
Commit: fd3786a82f3a61f03fac1a4154c721dc406e3805
Parents: 746820b
Author: zhouxh 
Authored: Wed Aug 31 18:05:37 2016 -0700
Committer: zhouxh 
Committed: Wed Aug 31 18:05:37 2016 -0700

--
 .../internal/repository/IndexRepositoryImplJUnitTest.java  | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fd3786a8/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
--
diff --git 
a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
 
b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
index dd0378a..8f8bbb6 100644
--- 
a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
+++ 
b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitTest.java
@@ -65,6 +65,7 @@ public class IndexRepositoryImplJUnitTest {
   private StandardAnalyzer analyzer = new StandardAnalyzer();
   private IndexWriter writer;
   private Region region;
+  private Region userRegion;
   private LuceneIndexStats stats;
   private FileSystemStats fileSystemStats;
 
@@ -79,9 +80,10 @@ public class IndexRepositoryImplJUnitTest {
 String[] indexedFields= new String[] {"s", "i", "l", "d", "f", "s2", 
"missing"};
 mapper = new HeterogeneousLuceneSerializer(indexedFields);
 region = Mockito.mock(Region.class);
+userRegion = Mockito.mock(Region.class);
 stats = Mockito.mock(LuceneIndexStats.class);
-Mockito.when(region.isDestroyed()).thenReturn(false);
-repo = new IndexRepositoryImpl(region, writer, mapper, stats, null);
+Mockito.when(userRegion.isDestroyed()).thenReturn(false);
+repo = new IndexRepositoryImpl(region, writer, mapper, stats, userRegion);
   }
   
   @Test

[12/18] incubator-geode git commit: GEODE-1820: add FlakyTest category

[udo]

GEODE-1820: add FlakyTest category


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

Branch: refs/heads/feature/GEODE-420
Commit: d2d62d6807e96c2c5d684c14c207eab36a4c0d21
Parents: b89f71c
Author: Kirk Lund 
Authored: Fri Sep 2 10:30:05 2016 -0700
Committer: Kirk Lund 
Committed: Fri Sep 2 10:30:05 2016 -0700

--
 .../security/IntegratedClientGetPutAuthDistributedTest.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/d2d62d68/geode-core/src/test/java/com/gemstone/gemfire/security/IntegratedClientGetPutAuthDistributedTest.java
--
diff --git 
a/geode-core/src/test/java/com/gemstone/gemfire/security/IntegratedClientGetPutAuthDistributedTest.java
 
b/geode-core/src/test/java/com/gemstone/gemfire/security/IntegratedClientGetPutAuthDistributedTest.java
index 01509ad..6d4374d 100644
--- 
a/geode-core/src/test/java/com/gemstone/gemfire/security/IntegratedClientGetPutAuthDistributedTest.java
+++ 
b/geode-core/src/test/java/com/gemstone/gemfire/security/IntegratedClientGetPutAuthDistributedTest.java
@@ -31,9 +31,10 @@ import com.gemstone.gemfire.cache.Region;
 import com.gemstone.gemfire.cache.client.ClientCache;
 import com.gemstone.gemfire.test.dunit.AsyncInvocation;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
+import com.gemstone.gemfire.test.junit.categories.FlakyTest;
 import com.gemstone.gemfire.test.junit.categories.SecurityTest;
 
-@Category({ DistributedTest.class, SecurityTest.class })
+@Category({ DistributedTest.class, SecurityTest.class, FlakyTest.class })
 public class IntegratedClientGetPutAuthDistributedTest extends 
AbstractSecureServerDUnitTest {
 
   @Test

[02/18] incubator-geode git commit: GEODE-1809: Improve error handling

[udo]

GEODE-1809: Improve error handling


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

Branch: refs/heads/feature/GEODE-420
Commit: 07798ca802e752f66fc05811fc42e872675df525
Parents: bb44eb6
Author: Anthony Baker 
Authored: Tue Aug 30 21:38:24 2016 -0700
Committer: Anthony Baker 
Committed: Wed Aug 31 16:39:01 2016 -0700

--
 .../gemfire/internal/GemFireVersion.java| 65 ++--
 .../internal/GemFireVersionJUnitTest.java   | 22 +--
 2 files changed, 52 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/07798ca8/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireVersion.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireVersion.java 
b/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireVersion.java
index 9bd3d4f..0d0bd58 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireVersion.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/GemFireVersion.java
@@ -23,6 +23,7 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.net.URL;
 import java.util.Map.Entry;
+import java.util.Optional;
 import java.util.Properties;
 import java.util.StringTokenizer;
 
@@ -183,12 +184,12 @@ public class GemFireVersion {
 private final Properties description;
 
 /** Error message to display instead of the version information */
-private final String error;
+private final Optional error;
 
 public VersionDescription(String name) {
   InputStream is = 
ClassPathLoader.getLatest().getResourceAsStream(getClass(), name);
   if (is == null) {
-error = 
LocalizedStrings.GemFireVersion_COULD_NOT_FIND_RESOURCE_COM_GEMSTONE_GEMFIRE_INTERNAL_0.toLocalizedString(RESOURCE_NAME);
+error = 
Optional.of(LocalizedStrings.GemFireVersion_COULD_NOT_FIND_RESOURCE_COM_GEMSTONE_GEMFIRE_INTERNAL_0.toLocalizedString(name));
 description = null;
 return;
   }
@@ -197,26 +198,28 @@ public class GemFireVersion {
   try {
 description.load(is);
   } catch (Exception ex) {
-error = 
LocalizedStrings.GemFireVersion_COULD_NOT_READ_PROPERTIES_FROM_RESOURCE_COM_GEMSTONE_GEMFIRE_INTERNAL_0_BECAUSE_1.toLocalizedString(new
 Object[] {RESOURCE_NAME, ex});
+error = 
Optional.of(LocalizedStrings.GemFireVersion_COULD_NOT_READ_PROPERTIES_FROM_RESOURCE_COM_GEMSTONE_GEMFIRE_INTERNAL_0_BECAUSE_1.toLocalizedString(new
 Object[] {name, ex}));
 return;
   }
-  error = validate();
+
+  error = validate(description);
 }
 
 public String getProperty(String key) {
-  if (error != null) {
-return error;
-  }
-  return description.getProperty(key);
+  return error.orElse(description.getProperty(key));
 }
 
 public String getNativeCodeVersion() {
   return SmHelper.getNativeVersion();
 }
 
-private void print(PrintWriter pw) {
-  for (Entry props : description.entrySet()) {
-pw.println(props.getKey() + ": " + props.getValue());
+void print(PrintWriter pw) {
+  if (error.isPresent()) {
+pw.println(error.get());
+  } else {
+for (Entry props : description.entrySet()) {
+  pw.println(props.getKey() + ": " + props.getValue());
+}
   }
 
   // not stored in the description map
@@ -249,43 +252,43 @@ public class GemFireVersion {
   }
 }
 
-private String validate() {
-  if (getProperty(PRODUCT_NAME) == null) {
-return 
LocalizedStrings.GemFireVersion_MISSING_PROPERTY_0_FROM_RESOURCE_COM_GEMSTONE_GEMFIRE_INTERNAL_1.toLocalizedString(new
 Object[] {PRODUCT_NAME, RESOURCE_NAME});
+private Optional validate(Properties props) {
+  if (props.get(PRODUCT_NAME) == null) {
+return 
Optional.of(LocalizedStrings.GemFireVersion_MISSING_PROPERTY_0_FROM_RESOURCE_COM_GEMSTONE_GEMFIRE_INTERNAL_1.toLocalizedString(new
 Object[] {PRODUCT_NAME, RESOURCE_NAME}));
   }
 
-  if (getProperty(GEMFIRE_VERSION) == null) {
-return 
LocalizedStrings.GemFireVersion_MISSING_PROPERTY_0_FROM_RESOURCE_COM_GEMSTONE_GEMFIRE_INTERNAL_1.toLocalizedString(new
 Object[] {GEMFIRE_VERSION, RESOURCE_NAME});
+  if (props.get(GEMFIRE_VERSION) == null) {
+return 
Optional.of(LocalizedStrings.GemFireVersion_MISSING_PROPERTY_0_FROM_RESOURCE_COM_GEMSTONE_GEMFIRE_INTERNAL_1.toLocalizedString(new
 Object[] {GEMFIRE_VERSION, RESOURCE_NAME}));
   }
 
-  if 

incubator-geode git commit: GEODE-1834: initilize the socketcreator with the correct ssl settings

[jinmeiliao]

Repository: incubator-geode
Updated Branches:
  refs/heads/develop bb829d3dc -> a4c38a469


GEODE-1834: initilize the socketcreator with the correct ssl settings


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

Branch: refs/heads/develop
Commit: a4c38a469d0726c8fd59f444e342d3d062c47004
Parents: bb829d3
Author: Jinmei Liao 
Authored: Thu Sep 1 09:27:11 2016 -0700
Committer: Jinmei Liao 
Committed: Tue Sep 6 08:27:45 2016 -0700

--
 .../internal/JmxManagerLocatorRequest.java  |   8 +-
 .../internal/cli/commands/ShellCommands.java|  21 ++-
 .../ConnectToLocatorSSLDUnitTest.java   | 136 +++
 3 files changed, 150 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a4c38a46/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerLocatorRequest.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerLocatorRequest.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerLocatorRequest.java
index 861f51d..ac250d0 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerLocatorRequest.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/JmxManagerLocatorRequest.java
@@ -25,6 +25,7 @@ import java.util.Properties;
 
 import com.gemstone.gemfire.distributed.internal.tcpserver.TcpClient;
 import com.gemstone.gemfire.internal.DataSerializableFixedID;
+import com.gemstone.gemfire.internal.SocketCreator;
 import com.gemstone.gemfire.internal.Version;
 
 /**
@@ -80,13 +81,14 @@ public class JmxManagerLocatorRequest implements 
DataSerializableFixedID {
 InetAddress networkAddress = InetAddress.getByName(locatorHost);
 
 try {
-  // Changes for 46623
-  // initialize the SocketCreator with props which may contain SSL config
-  // empty distConfProps will reset SocketCreator
   if (sslConfigProps != null) {
 distributionConfigProps.putAll(sslConfigProps);
   }
 
+  // re-initialize the SocketCreator with the sslConfigProps. Note this 
initializes the SocketCreator with cluster-ssl-* settings since
+  // we are connecting to the locator only.
+  SocketCreator.getDefaultInstance(distributionConfigProps);
+
   Object responseFromServer = TcpClient.requestToServer(networkAddress, 
locatorPort, SINGLETON, msTimeout);
 
   return (JmxManagerLocatorResponse) responseFromServer;

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/a4c38a46/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
--
diff --git 
a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
 
b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
index 09a25a6..daa7262 100644
--- 
a/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
+++ 
b/geode-core/src/main/java/com/gemstone/gemfire/management/internal/cli/commands/ShellCommands.java
@@ -17,6 +17,8 @@
 
 package com.gemstone.gemfire.management.internal.cli.commands;
 
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
+
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.File;
@@ -38,11 +40,18 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Set;
+
 import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManagerFactory;
 
+import org.springframework.shell.core.CommandMarker;
+import org.springframework.shell.core.ExitShellRequest;
+import org.springframework.shell.core.annotation.CliAvailabilityIndicator;
+import org.springframework.shell.core.annotation.CliCommand;
+import org.springframework.shell.core.annotation.CliOption;
+
 import com.gemstone.gemfire.distributed.internal.DistributionConfig;
 import com.gemstone.gemfire.internal.ClassPathLoader;
 import com.gemstone.gemfire.internal.DSFIDFactory;
@@ -79,14 +88,6 @@ import 
com.gemstone.gemfire.management.internal.web.shell.HttpOperationInvoker;
 import 
com.gemstone.gemfire.management.internal.web.shell.RestHttpOperationInvoker;
 import com.gemstone.gemfire.security.AuthenticationFailedException;
 
-import org.springframework.shell.core.CommandMarker;