geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject [13/26] incubator-geode git commit: GEODE-420: Fixed tests that were failing due to bad "locators" configuration which were previously never validated
Date Fri, 22 Jul 2016 00:20:00 GMT
GEODE-420: Fixed tests that were failing due to bad "locators" configuration which were previously never validated


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

Branch: refs/heads/feature/GEODE-420
Commit: 5353012213af94cfefa24b11b1eea7d75832e5e2
Parents: 3047e5e
Author: Udo Kohlmeyer <ukohlmeyer@pivotal.io>
Authored: Tue Jun 21 07:26:11 2016 +1000
Committer: Udo Kohlmeyer <ukohlmeyer@pivotal.io>
Committed: Thu Jul 21 16:13:51 2016 -0700

----------------------------------------------------------------------
 .../internal/AbstractDistributionConfig.java    |   1 +
 .../internal/DistributionConfig.java            | 113 ++++++++++++-------
 .../internal/DistributionConfigImpl.java        |  17 +--
 .../distributed/DistributedSystemDUnitTest.java |   2 +-
 .../internal/DistributionConfigJUnitTest.java   |   5 +-
 .../cli/commands/ConfigCommandsDUnitTest.java   |   4 +-
 .../cli/commands/DeployCommandsDUnitTest.java   |   2 +-
 .../commands/DiskStoreCommandsDUnitTest.java    | 106 +++++++++--------
 .../cli/commands/IndexCommandsDUnitTest.java    |   8 +-
 .../cli/commands/QueueCommandsDUnitTest.java    |   6 +-
 .../SharedConfigurationCommandsDUnitTest.java   |   4 +-
 .../SharedConfigurationDUnitTest.java           |   6 +-
 .../ClusterConfigurationDUnitTest.java          |  10 +-
 13 files changed, 164 insertions(+), 120 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/53530122/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 8a4082b..5eb95cb 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
@@ -571,6 +571,7 @@ public abstract class AbstractDistributionConfig extends AbstractConfig implemen
     }
 
 
+    checkAttribute(attName,attValue);
     try {
       setter.invoke(this, attValue);
     } catch (Exception e) {

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/53530122/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
index b076af9..e053844 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/DistributionConfig.java
@@ -32,7 +32,6 @@ import java.util.Properties;
 
 import com.gemstone.gemfire.distributed.ConfigurationProperties;
 import com.gemstone.gemfire.distributed.DistributedSystem;
-import com.gemstone.gemfire.distributed.SSLEnabledComponents;
 import com.gemstone.gemfire.internal.Config;
 import com.gemstone.gemfire.internal.ConfigSource;
 import com.gemstone.gemfire.internal.logging.InternalLogWriter;
@@ -49,7 +48,6 @@ import com.gemstone.gemfire.memcached.GemFireMemcachedServer;
  * <p>
  * <p>
  * Descriptions of these properties can be found {@link ConfigurationProperties}.
- *
  * @see com.gemstone.gemfire.internal.Config
  * @since GemFire 2.1
  */
@@ -294,6 +292,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * and to publish itself so it can be located by others.
    * @param value must be of the form <code>hostName[portNum]</code>.
    * Multiple elements are allowed and must be seperated by a comma.
+   *
    * @throws IllegalArgumentException if the specified value is not acceptable.
    * @throws com.gemstone.gemfire.UnmodifiableException if this attribute can not be modified.
    * @throws com.gemstone.gemfire.GemFireIOException if the set failure is caused by an error
@@ -411,7 +410,6 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Returns the value of the {@link ConfigurationProperties#LOG_FILE} property
-   *
    * @return <code>null</code> if logging information goes to standard
    * out
    */
@@ -446,7 +444,6 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Returns the value of the {@link ConfigurationProperties#LOG_LEVEL} property
-   *
    * @see com.gemstone.gemfire.internal.logging.LogWriterImpl
    */
   @ConfigAttributeGetter(name = LOG_LEVEL)
@@ -454,7 +451,6 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Sets the value of the {@link ConfigurationProperties#LOG_LEVEL} property
-   *
    * @see com.gemstone.gemfire.internal.logging.LogWriterImpl
    */
   @ConfigAttributeSetter(name = LOG_LEVEL)
@@ -545,7 +541,6 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Returns the value of the {@link ConfigurationProperties#STATISTIC_ARCHIVE_FILE} property.
-   *
    * @return <code>null</code> if no file was specified
    */
   @ConfigAttributeGetter(name = STATISTIC_ARCHIVE_FILE)
@@ -1268,8 +1263,7 @@ public interface DistributionConfig extends Config, LogConfig {
   /**
    * The default value of the {@link ConfigurationProperties#MCAST_FLOW_CONTROL} property
    */
-  FlowControlParams DEFAULT_MCAST_FLOW_CONTROL
-    = new FlowControlParams(1048576, (float) 0.25, 5000);
+  FlowControlParams DEFAULT_MCAST_FLOW_CONTROL = new FlowControlParams(1048576, (float) 0.25, 5000);
 
   /**
    * The minimum byteAllowance for the{@link ConfigurationProperties#MCAST_FLOW_CONTROL} setting of
@@ -2127,7 +2121,6 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Get the current log-level for {@link ConfigurationProperties#SECURITY_LOG_LEVEL}.
-   *
    * @return the current security log-level
    */
   @ConfigAttributeGetter(name = SECURITY_LOG_LEVEL)
@@ -2135,7 +2128,6 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Set the log-level for {@link ConfigurationProperties#SECURITY_LOG_LEVEL}.
-   *
    * @param level the new security log-level
    */
   @ConfigAttributeSetter(name = SECURITY_LOG_LEVEL)
@@ -2152,7 +2144,6 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Returns the value of the {@link ConfigurationProperties#SECURITY_LOG_FILE} property
-   *
    * @return <code>null</code> if logging information goes to standard out
    */
   @ConfigAttributeGetter(name = SECURITY_LOG_FILE)
@@ -2408,6 +2399,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * Returns the value of the {@link ConfigurationProperties#GROUPS} property
    * <p> The default value is: {@link #DEFAULT_GROUPS}.
    * @return the value of the property
+   *
    * @since GemFire 7.0
    */
   @ConfigAttributeGetter(name = GROUPS)
@@ -2427,7 +2419,6 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * The name of the {@link ConfigurationProperties#GROUPS} property
-   *
    * @since GemFire 7.0
    */
   @ConfigAttribute(type = String.class)
@@ -2496,6 +2487,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    * @deprecated Geode 1.0 use {@link #getClusterSSLEnabled()}
    */
+  @Deprecated
   @ConfigAttributeGetter(name = JMX_MANAGER_SSL_ENABLED)
   boolean getJmxManagerSSLEnabled();
 
@@ -2504,12 +2496,14 @@ public interface DistributionConfig extends Config, LogConfig {
    * <p> Actual value of this constant is <code>false</code>.
    * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_ENABLED}
    */
+  @Deprecated
   boolean DEFAULT_JMX_MANAGER_SSL_ENABLED = false;
 
   /**
    * The name of the {@link ConfigurationProperties#JMX_MANAGER_SSL_ENABLED} property
    * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_ENABLED}
    */
+  @Deprecated
   @ConfigAttribute(type = Boolean.class)
   String JMX_MANAGER_SSL_ENABLED_NAME = JMX_MANAGER_SSL_ENABLED;
 
@@ -2518,6 +2512,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    * @deprecated Geode 1.0 use {@link #setClusterSSLEnabled(boolean)}
    */
+  @Deprecated
   @ConfigAttributeSetter(name = JMX_MANAGER_SSL_ENABLED)
   void setJmxManagerSSLEnabled(boolean enabled);
 
@@ -2539,7 +2534,6 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * The name of the {@link ConfigurationProperties#OFF_HEAP_MEMORY_SIZE} property
-   *
    * @since Geode 1.0
    */
   @ConfigAttribute(type = String.class)
@@ -2556,6 +2550,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    * @deprecated Geode 1.0 use {@link #getClusterSSLProtocols()}
    */
+  @Deprecated
   @ConfigAttributeGetter(name = JMX_MANAGER_SSL_PROTOCOLS)
   String getJmxManagerSSLProtocols();
 
@@ -2564,6 +2559,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    * @deprecated Geode 1.0 use {@link #setClusterSSLProtocols(String)}
    */
+  @Deprecated
   @ConfigAttributeSetter(name = JMX_MANAGER_SSL_PROTOCOLS)
   void setJmxManagerSSLProtocols(String protocols);
 
@@ -2572,12 +2568,14 @@ public interface DistributionConfig extends Config, LogConfig {
    * <p> Actual value of this constant is <code>any</code>.
    * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_PROTOCOLS}
    */
+  @Deprecated
   String DEFAULT_JMX_MANAGER_SSL_PROTOCOLS = "any";
   /**
    * The name of the {@link ConfigurationProperties#JMX_MANAGER_SSL_PROTOCOLS} property
    * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_SSL_PROTOCOLS} property
    * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_PROTOCOLS}
    */
+  @Deprecated
   @ConfigAttribute(type = String.class)
   String JMX_MANAGER_SSL_PROTOCOLS_NAME = JMX_MANAGER_SSL_PROTOCOLS;
 
@@ -2586,6 +2584,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    * @deprecated Geode 1.0 use {@link #getClusterSSLCiphers()}
    */
+  @Deprecated
   @ConfigAttributeGetter(name = JMX_MANAGER_SSL_CIPHERS)
   String getJmxManagerSSLCiphers();
 
@@ -2594,6 +2593,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    * @deprecated Geode 1.0 use {@link #setClusterSSLCiphers(String)}
    */
+  @Deprecated
   @ConfigAttributeSetter(name = JMX_MANAGER_SSL_CIPHERS)
   void setJmxManagerSSLCiphers(String ciphers);
 
@@ -2602,12 +2602,14 @@ public interface DistributionConfig extends Config, LogConfig {
    * <p> Actual value of this constant is <code>any</code>.
    * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_CIPHERS}
    */
+  @Deprecated
   String DEFAULT_JMX_MANAGER_SSL_CIPHERS = "any";
   /**
    * The name of the {@link ConfigurationProperties#JMX_MANAGER_SSL_CIPHERS} property
    * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_SSL_CIPHERS} property
    * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_CIPHERS}
    */
+  @Deprecated
   @ConfigAttribute(type = String.class)
   String JMX_MANAGER_SSL_CIPHERS_NAME = JMX_MANAGER_SSL_CIPHERS;
 
@@ -2616,6 +2618,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    * @deprecated Geode 1.0 use {@link #getClusterSSLRequireAuthentication()}
    */
+  @Deprecated
   @ConfigAttributeGetter(name = JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION)
   boolean getJmxManagerSSLRequireAuthentication();
 
@@ -2624,6 +2627,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    * @deprecated Geode 1.0 use {@link #setClusterSSLRequireAuthentication(boolean)}
    */
+  @Deprecated
   @ConfigAttributeSetter(name = JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION)
   void setJmxManagerSSLRequireAuthentication(boolean enabled);
 
@@ -2632,12 +2636,14 @@ public interface DistributionConfig extends Config, LogConfig {
    * <p> Actual value of this constant is <code>true</code>.
    * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION}
    */
+  @Deprecated
   boolean DEFAULT_JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION = true;
   /**
    * The name of the {@link ConfigurationProperties#JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION} property
    * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION} property
    * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_REQUIRE_AUTHENTICATION}
    */
+  @Deprecated
   @ConfigAttribute(type = Boolean.class)
   String JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION_NAME = JMX_MANAGER_SSL_REQUIRE_AUTHENTICATION;
 
@@ -2646,6 +2652,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    * @deprecated Geode 1.0 use {@link #getClusterSSLKeyStore()}
    */
+  @Deprecated
   @ConfigAttributeGetter(name = JMX_MANAGER_SSL_KEYSTORE)
   String getJmxManagerSSLKeyStore();
 
@@ -2654,6 +2661,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    * @deprecated Geode 1.0 use {@link #setClusterSSLKeyStore(String)}
    */
+  @Deprecated
   @ConfigAttributeSetter(name = JMX_MANAGER_SSL_KEYSTORE)
   void setJmxManagerSSLKeyStore(String keyStore);
 
@@ -2662,6 +2670,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * <p> Actual value of this constant is "".
    * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE}
    */
+  @Deprecated
   String DEFAULT_JMX_MANAGER_SSL_KEYSTORE = "";
 
   /**
@@ -2669,6 +2678,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE} property
    * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE}
    */
+  @Deprecated
   @ConfigAttribute(type = String.class)
   String JMX_MANAGER_SSL_KEYSTORE_NAME = JMX_MANAGER_SSL_KEYSTORE;
 
@@ -2677,6 +2687,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    * @deprecated Geode 1.0 use {@link #getClusterSSLKeyStoreType()}
    */
+  @Deprecated
   @ConfigAttributeGetter(name = JMX_MANAGER_SSL_KEYSTORE_TYPE)
   String getJmxManagerSSLKeyStoreType();
 
@@ -2685,6 +2696,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    * @deprecated Geode 1.0 use {@link #setClusterSSLKeyStoreType(String)}
    */
+  @Deprecated
   @ConfigAttributeSetter(name = JMX_MANAGER_SSL_KEYSTORE_TYPE)
   void setJmxManagerSSLKeyStoreType(String keyStoreType);
 
@@ -2693,6 +2705,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * <p> Actual value of this constant is "".
    * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_TYPE}
    */
+  @Deprecated
   String DEFAULT_JMX_MANAGER_SSL_KEYSTORE_TYPE = "";
 
   /**
@@ -2708,6 +2721,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    * @deprecated Geode 1.0 use {@link #getClusterSSLKeyStorePassword()}
    */
+  @Deprecated
   @ConfigAttributeGetter(name = JMX_MANAGER_SSL_KEYSTORE_PASSWORD)
   String getJmxManagerSSLKeyStorePassword();
 
@@ -2716,6 +2730,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    * @deprecated Geode 1.0 use {@link #setClusterSSLKeyStorePassword(String)}
    */
+  @Deprecated
   @ConfigAttributeSetter(name = JMX_MANAGER_SSL_KEYSTORE_PASSWORD)
   void setJmxManagerSSLKeyStorePassword(String keyStorePassword);
 
@@ -2724,6 +2739,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * <p> Actual value of this constant is "".
    * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_PASSWORD}
    */
+  @Deprecated
   String DEFAULT_JMX_MANAGER_SSL_KEYSTORE_PASSWORD = "";
 
   /**
@@ -2731,6 +2747,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_SSL_KEYSTORE_PASSWORD} propery
    * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_KEYSTORE_PASSWORD}
    */
+  @Deprecated
   @ConfigAttribute(type = String.class)
   String JMX_MANAGER_SSL_KEYSTORE_PASSWORD_NAME = JMX_MANAGER_SSL_KEYSTORE_PASSWORD;
 
@@ -2739,6 +2756,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    * @deprecated Geode 1.0 use {@link #getClusterSSLTrustStore()}
    */
+  @Deprecated
   @ConfigAttributeGetter(name = JMX_MANAGER_SSL_TRUSTSTORE)
   String getJmxManagerSSLTrustStore();
 
@@ -2747,6 +2765,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    * @deprecated Geode 1.0 use {@link #setClusterSSLTrustStore(String)}
    */
+  @Deprecated
   @ConfigAttributeSetter(name = JMX_MANAGER_SSL_TRUSTSTORE)
   void setJmxManagerSSLTrustStore(String trustStore);
 
@@ -2755,6 +2774,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * <p> Actual value of this constant is "".
    * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_TRUSTSTORE}
    */
+  @Deprecated
   String DEFAULT_JMX_MANAGER_SSL_TRUSTSTORE = "";
 
   /**
@@ -2770,6 +2790,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    * @deprecated Geode 1.0 use {@link #getClusterSSLTrustStorePassword()}
    */
+  @Deprecated
   @ConfigAttributeGetter(name = JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD)
   String getJmxManagerSSLTrustStorePassword();
 
@@ -2778,6 +2799,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * property.
    * @deprecated Geode 1.0 use {@link #setClusterSSLTrustStorePassword(String)}
    */
+  @Deprecated
   @ConfigAttributeSetter(name = JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD)
   void setJmxManagerSSLTrustStorePassword(String trusStorePassword);
 
@@ -2786,6 +2808,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * <p> Actual value of this constant is "".
    * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_TRUSTSTORE_PASSWORD}
    */
+  @Deprecated
   String DEFAULT_JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD = "";
 
   /**
@@ -2793,6 +2816,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD} property
    * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD}
    */
+  @Deprecated
   @ConfigAttribute(type = String.class)
   String JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD_NAME = JMX_MANAGER_SSL_TRUSTSTORE_PASSWORD;
 
@@ -2838,7 +2862,7 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Returns the value of the {@link ConfigurationProperties#JMX_MANAGER_HTTP_PORT} property
-   *
+   * <p>
    * Returns the value of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_HTTP_PORT} property
    * @deprecated as of 8.0 use {@link #getHttpServicePort()} instead.
    */
@@ -2847,9 +2871,10 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Set the {@link ConfigurationProperties#JMX_MANAGER_HTTP_PORT} for jmx-manager.
-   *
+   * <p>
    * Set the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_HTTP_PORT} for jmx-manager.
    * @param value the port number for jmx-manager HTTP service
+   *
    * @deprecated as of 8.0 use {@link #setHttpServicePort(int)} instead.
    */
   @ConfigAttributeSetter(name = JMX_MANAGER_HTTP_PORT)
@@ -2857,7 +2882,7 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * The name of the {@link ConfigurationProperties#JMX_MANAGER_HTTP_PORT} property.
-   *
+   * <p>
    * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#JMX_MANAGER_HTTP_PORT} property.
    * @deprecated as of 8.0 use {{@link #HTTP_SERVICE_PORT_NAME} instead.
    */
@@ -2885,9 +2910,10 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Returns the value of the {@link ConfigurationProperties#MEMCACHED_PORT} property
-   *
+   * <p>
    * Returns the value of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#MEMCACHED_PORT} property
    * @return the port on which GemFireMemcachedServer should be started
+   *
    * @since GemFire 7.0
    */
   @ConfigAttributeGetter(name = MEMCACHED_PORT)
@@ -2902,9 +2928,10 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Returns the value of the {@link ConfigurationProperties#MEMCACHED_PROTOCOL} property
-   *
+   * <p>
    * Returns the value of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#MEMCACHED_PROTOCOL} property
    * @return the protocol for GemFireMemcachedServer
+   *
    * @since GemFire 7.0
    */
   @ConfigAttributeGetter(name = MEMCACHED_PROTOCOL)
@@ -2919,9 +2946,10 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Returns the value of the {@link ConfigurationProperties#MEMCACHED_BIND_ADDRESS} property
-   *
+   * <p>
    * Returns the value of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#MEMCACHED_BIND_ADDRESS} property
    * @return the bind address for GemFireMemcachedServer
+   *
    * @since GemFire 7.0
    */
   @ConfigAttributeGetter(name = MEMCACHED_BIND_ADDRESS)
@@ -2952,9 +2980,10 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Returns the value of the {@link ConfigurationProperties#REDIS_BIND_ADDRESS} property
-   *
+   * <p>
    * Returns the value of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#REDIS_BIND_ADDRESS} property
    * @return the bind address for GemFireRedisServer
+   *
    * @since GemFire 8.0
    */
   @ConfigAttributeGetter(name = REDIS_BIND_ADDRESS)
@@ -2969,9 +2998,10 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Returns the value of the {@link ConfigurationProperties#REDIS_PASSWORD} property
-   *
+   * <p>
    * Returns the value of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#REDIS_PASSWORD} property
    * @return the authentication password for GemFireRedisServer
+   *
    * @since GemFire 8.0
    */
   @ConfigAttributeGetter(name = REDIS_PASSWORD)
@@ -2988,9 +3018,10 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_PORT} property
-   *
+   * <p>
    * Returns the value of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_PORT} property
    * @return the HTTP service port
+   *
    * @since GemFire 8.0
    */
   @ConfigAttributeGetter(name = HTTP_SERVICE_PORT)
@@ -2998,9 +3029,10 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Set the {@link ConfigurationProperties#HTTP_SERVICE_PORT} for HTTP service.
-   *
+   * <p>
    * Set the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_PORT} for HTTP service.
    * @param value the port number for HTTP service
+   *
    * @since GemFire 8.0
    */
   @ConfigAttributeSetter(name = HTTP_SERVICE_PORT)
@@ -3008,7 +3040,7 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * The name of the {@link ConfigurationProperties#HTTP_SERVICE_PORT} property
-   *
+   * <p>
    * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_PORT} property
    * @since GemFire 8.0
    */
@@ -3024,9 +3056,10 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Returns the value of the {@link ConfigurationProperties#HTTP_SERVICE_BIND_ADDRESS} property
-   *
+   * <p>
    * Returns the value of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_BIND_ADDRESS} property
    * @return the bind-address for HTTP service
+   *
    * @since GemFire 8.0
    */
   @ConfigAttributeGetter(name = HTTP_SERVICE_BIND_ADDRESS)
@@ -3034,9 +3067,10 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Set the {@link ConfigurationProperties#HTTP_SERVICE_BIND_ADDRESS} for HTTP service.
-   *
+   * <p>
    * Set the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_BIND_ADDRESS} for HTTP service.
    * @param value the bind-address for HTTP service
+   *
    * @since GemFire 8.0
    */
   @ConfigAttributeSetter(name = HTTP_SERVICE_BIND_ADDRESS)
@@ -3044,7 +3078,6 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * The name of the {@link ConfigurationProperties#HTTP_SERVICE_BIND_ADDRESS} property
-   *
    * @since GemFire 8.0
    */
   @ConfigAttribute(type = String.class)
@@ -3299,6 +3332,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#HTTP_SERVICE_SSL_KEYSTORE_TYPE} property
    * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_KEYSTORE_TYPE}
    */
+  @Deprecated
   @ConfigAttribute(type = String.class)
   String HTTP_SERVICE_SSL_KEYSTORE_TYPE_NAME = HTTP_SERVICE_SSL_KEYSTORE_TYPE;
 
@@ -3325,6 +3359,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * <p> Actual value of this constant is "".
    * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_TRUSTSTORE}
    */
+  @Deprecated
   String DEFAULT_HTTP_SERVICE_SSL_TRUSTSTORE = "";
 
   /**
@@ -3381,9 +3416,10 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Returns the value of the {@link ConfigurationProperties#START_DEV_REST_API} property
-   *
+   * <p>
    * Returns the value of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#START_DEV_REST_API} property
    * @return the value of the property
+   *
    * @since GemFire 8.0
    */
 
@@ -3392,9 +3428,10 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Set the {@link ConfigurationProperties#START_DEV_REST_API} for HTTP service.
-   *
+   * <p>
    * Set the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#START_DEV_REST_API} for HTTP service.
    * @param value for the property
+   *
    * @since GemFire 8.0
    */
   @ConfigAttributeSetter(name = START_DEV_REST_API)
@@ -3402,7 +3439,7 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * The name of the {@link ConfigurationProperties#START_DEV_REST_API} property
-   *
+   * <p>
    * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#START_DEV_REST_API} property
    * @since GemFire 8.0
    */
@@ -3418,7 +3455,6 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * The name of the {@link ConfigurationProperties#DISABLE_AUTO_RECONNECT} property
-   *
    * @since GemFire 8.0
    */
   @ConfigAttribute(type = Boolean.class)
@@ -3437,7 +3473,6 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Sets the value of {@link ConfigurationProperties#DISABLE_AUTO_RECONNECT}
-   *
    * @param value the new setting
    */
   @ConfigAttributeSetter(name = DISABLE_AUTO_RECONNECT)
@@ -3504,6 +3539,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * <p> Actual value of this constant is <code>any</code>.
    * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_PROTOCOLS}
    */
+  @Deprecated
   String DEFAULT_SERVER_SSL_PROTOCOLS = "any";
   /**
    * The name of the {@link ConfigurationProperties#SERVER_SSL_PROTOCOLS} property
@@ -3537,6 +3573,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * <p> Actual value of this constant is <code>any</code>.
    * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_CIPHERS} 
    */
+  @Deprecated
   String DEFAULT_SERVER_SSL_CIPHERS = "any";
   /**
    * The name of the {@link ConfigurationProperties#SERVER_SSL_CIPHERS} property
@@ -3878,6 +3915,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * <p> Actual value of this constant is <code>true</code>.
    * @deprecated Geode 1.0 use {@link #DEFAULT_CLUSTER_SSL_REQUIRE_AUTHENTICATION}
    */
+  @Deprecated
   boolean DEFAULT_GATEWAY_SSL_REQUIRE_AUTHENTICATION = true;
   /**
    * The name of the {@link ConfigurationProperties#GATEWAY_SSL_REQUIRE_AUTHENTICATION} property
@@ -4059,6 +4097,7 @@ public interface DistributionConfig extends Config, LogConfig {
    * The name of the {@link com.gemstone.gemfire.distributed.ConfigurationProperties#GATEWAY_SSL_TRUSTSTORE_PASSWORD} property
    * @deprecated Geode 1.0 use {@link com.gemstone.gemfire.distributed.ConfigurationProperties#CLUSTER_SSL_TRUSTSTORE_PASSWORD}
    */
+  @Deprecated
   @ConfigAttribute(type = String.class)
   String GATEWAY_SSL_TRUSTSTORE_PASSWORD_NAME = GATEWAY_SSL_TRUSTSTORE_PASSWORD;
 
@@ -4082,7 +4121,7 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Gets the value of {@link ConfigurationProperties#LOCK_MEMORY}
-   *
+   * <p>
    * Gets the value of {@link com.gemstone.gemfire.distributed.ConfigurationProperties#LOCK_MEMORY}
    * @since Geode 1.0
    */
@@ -4091,8 +4130,8 @@ public interface DistributionConfig extends Config, LogConfig {
 
   /**
    * Set the value of {@link ConfigurationProperties#LOCK_MEMORY}
-   *
    * @param value the new setting
+   *
    * @since Geode 1.0
    */
   @ConfigAttributeSetter(name = LOCK_MEMORY)
@@ -4272,8 +4311,7 @@ public interface DistributionConfig extends Config, LogConfig {
         try {
           atts.add((String) field.get(null));
           attributes.put((String) field.get(null), field.getAnnotation(ConfigAttribute.class));
-        }
-        catch (IllegalAccessException e) {
+        } catch (IllegalAccessException e) {
           e.printStackTrace();
         }
       }
@@ -4283,8 +4321,7 @@ public interface DistributionConfig extends Config, LogConfig {
       if (method.isAnnotationPresent(ConfigAttributeGetter.class)) {
         ConfigAttributeGetter getter = method.getAnnotation(ConfigAttributeGetter.class);
         getters.put(getter.name(), method);
-      }
-      else if (method.isAnnotationPresent(ConfigAttributeSetter.class)) {
+      } else if (method.isAnnotationPresent(ConfigAttributeSetter.class)) {
         ConfigAttributeSetter setter = method.getAnnotation(ConfigAttributeSetter.class);
         setters.put(setter.name(), method);
       }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/53530122/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 e4025e2..41c3a43 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
@@ -837,7 +837,7 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
       copySSLPropsToHTTPSSLProps();
     }
 
-    // Make attributes read only
+    // Make attributes writeable only
     this.modifiable = true;
     validateConfigurationProperties(props);
     // Make attributes read only
@@ -976,23 +976,23 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
       }
 
       if (this.sourceMap.get(CLUSTER_SSL_KEYSTORE) != null) {
-        this.httpServiceSSLKeyStore = this.clusterSSLKeyStore;
+        setHttpServiceSSLKeyStore(this.clusterSSLKeyStore);
         this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE, this.sourceMap.get(CLUSTER_SSL_KEYSTORE));
       }
       if (this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE) != null) {
-        this.httpServiceSSLKeyStoreType = this.clusterSSLKeyStoreType;
+        setHttpServiceSSLKeyStoreType(this.clusterSSLKeyStoreType);
         this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE_TYPE, this.sourceMap.get(CLUSTER_SSL_KEYSTORE_TYPE));
       }
       if (this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD) != null) {
-        this.httpServiceSSLKeyStorePassword = this.clusterSSLKeyStorePassword;
+        setHttpServiceSSLKeyStorePassword(this.clusterSSLKeyStorePassword);
         this.sourceMap.put(HTTP_SERVICE_SSL_KEYSTORE_PASSWORD, this.sourceMap.get(CLUSTER_SSL_KEYSTORE_PASSWORD));
       }
       if (this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE) != null) {
-        this.httpServiceSSLTrustStore = this.clusterSSLTrustStore;
+        setHttpServiceSSLTrustStore(this.clusterSSLTrustStore);
         this.sourceMap.put(HTTP_SERVICE_SSL_TRUSTSTORE, this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE));
       }
       if (this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD) != null) {
-        this.httpServiceSSLTrustStorePassword = this.clusterSSLTrustStorePassword;
+        setHttpServiceSSLTrustStorePassword(this.clusterSSLTrustStorePassword);
         this.sourceMap.put(HTTP_SERVICE_SSL_TRUSTSTORE_PASSWORD, this.sourceMap.get(CLUSTER_SSL_TRUSTSTORE_PASSWORD));
       }
       this.httpServiceSSLProperties.putAll(this.clusterSSLProperties);
@@ -1773,31 +1773,26 @@ public class DistributionConfigImpl extends AbstractDistributionConfig implement
   }
 
   public void setClusterSSLKeyStore(String value) {
-    
     this.getClusterSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + KEY_STORE_NAME, value);
     this.clusterSSLKeyStore = value;
   }
 
   public void setClusterSSLKeyStoreType(String value) {
-    
     this.getClusterSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + KEY_STORE_TYPE_NAME, value);
     this.clusterSSLKeyStoreType = value;
   }
 
   public void setClusterSSLKeyStorePassword(String value) {
-    
     this.getClusterSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + KEY_STORE_PASSWORD_NAME, value);
     this.clusterSSLKeyStorePassword = value;
   }
 
   public void setClusterSSLTrustStore(String value) {
-    
     this.getClusterSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + TRUST_STORE_NAME, value);
     this.clusterSSLTrustStore = value;
   }
 
   public void setClusterSSLTrustStorePassword(String value) {
-    
     this.getClusterSSLProperties().setProperty(SSL_SYSTEM_PROPS_NAME + TRUST_STORE_PASSWORD_NAME, value);
     this.clusterSSLTrustStorePassword = value;
   }

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/53530122/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java
index 5386ea1..d59fecb 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/DistributedSystemDUnitTest.java
@@ -271,7 +271,7 @@ public class DistributedSystemDUnitTest extends JUnit4DistributedTestCase {
     if (loopback != null) {
       Properties config = new Properties();
       config.put(MCAST_PORT, "0");
-      String locators = InetAddress.getLocalHost().getHostName()+":"+DistributedTestUtils.getDUnitLocatorPort();
+      String locators = InetAddress.getLocalHost().getHostName()+"["+DistributedTestUtils.getDUnitLocatorPort()+"]";
       config.put(LOCATORS, locators);
       config.setProperty(BIND_ADDRESS, loopback.getHostAddress());
       LogWriterUtils.getLogWriter().info("attempting to connect with " + loopback +" and locators=" + locators);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/53530122/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
index 9e43279..80a3140 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/distributed/internal/DistributionConfigJUnitTest.java
@@ -306,7 +306,7 @@ public class DistributionConfigJUnitTest {
   public void testValidLocatorAddress() {
     String address = "81.240.0.1[7056]";
     config.modifiable = true;
-    config.setStartLocator(address);
+    config.setAttributeObject(START_LOCATOR,address,ConfigSource.api());
     assertEquals(config.getStartLocator(), address);
   }
 
@@ -314,7 +314,8 @@ public class DistributionConfigJUnitTest {
   public void testInvalidLocatorAddress() {
     String address = "bad.bad[7056]";
     config.modifiable = true;
-    config.setStartLocator(address);
+//    config.setStartLocator(address);
+    config.setAttributeObject(START_LOCATOR,address,ConfigSource.api());
   }
 
   @Test

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/53530122/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
index 5720955..2939666 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/ConfigCommandsDUnitTest.java
@@ -458,7 +458,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
     // Start the default manager
     Properties managerProps = new Properties();
     managerProps.setProperty(MCAST_PORT, "0");
-    managerProps.setProperty(LOCATORS, "localhost:" + locatorPort);
+    managerProps.setProperty(LOCATORS, "localhost[" + locatorPort+"]");
     setUpJmxManagerOnVm0ThenConnect(managerProps);
 
     // Create a cache in VM 1
@@ -468,7 +468,7 @@ public class ConfigCommandsDUnitTest extends CliCommandTestBase {
       public Object call() throws Exception {
         Properties localProps = new Properties();
         localProps.setProperty(MCAST_PORT, "0");
-        localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
+        localProps.setProperty(LOCATORS, "localhost[" + locatorPort+"]");
         localProps.setProperty(LOG_LEVEL, "error");
         localProps.setProperty(GROUPS, groupName);
         getSystem(localProps);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/53530122/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
index 6f70e57..827f872 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DeployCommandsDUnitTest.java
@@ -366,7 +366,7 @@ public class DeployCommandsDUnitTest extends CliCommandTestBase {
     Properties managerProps = new Properties();
     managerProps.setProperty(MCAST_PORT, "0");
     managerProps.setProperty(GROUPS, groupName);
-    managerProps.setProperty(LOCATORS, "localhost:" + locatorPort);
+    managerProps.setProperty(LOCATORS, "localhost[" + locatorPort+"]");
     setUpJmxManagerOnVm0ThenConnect(managerProps);
 
     // Create a JAR file

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/53530122/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
index 32cea6a..7320a48 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/DiskStoreCommandsDUnitTest.java
@@ -16,7 +16,35 @@
  */
 package com.gemstone.gemfire.management.internal.cli.commands;
 
-import com.gemstone.gemfire.cache.*;
+import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
+import static com.gemstone.gemfire.test.dunit.Assert.*;
+import static com.gemstone.gemfire.test.dunit.LogWriterUtils.*;
+import static com.gemstone.gemfire.test.dunit.Wait.*;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.StringTokenizer;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import com.gemstone.gemfire.cache.Cache;
+import com.gemstone.gemfire.cache.CacheFactory;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.DiskStore;
+import com.gemstone.gemfire.cache.DiskStoreFactory;
+import com.gemstone.gemfire.cache.EvictionAction;
+import com.gemstone.gemfire.cache.EvictionAttributes;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionFactory;
+import com.gemstone.gemfire.cache.RegionShortcut;
+import com.gemstone.gemfire.cache.Scope;
 import com.gemstone.gemfire.cache.query.data.PortfolioPdx;
 import com.gemstone.gemfire.compression.SnappyCompressor;
 import com.gemstone.gemfire.distributed.DistributedSystemDisconnectedException;
@@ -35,26 +63,17 @@ import com.gemstone.gemfire.management.internal.cli.i18n.CliStrings;
 import com.gemstone.gemfire.management.internal.cli.result.CommandResult;
 import com.gemstone.gemfire.management.internal.cli.shell.Gfsh;
 import com.gemstone.gemfire.management.internal.cli.util.CommandStringBuilder;
-import com.gemstone.gemfire.test.dunit.*;
+import com.gemstone.gemfire.test.dunit.Host;
+import com.gemstone.gemfire.test.dunit.SerializableCallable;
+import com.gemstone.gemfire.test.dunit.SerializableRunnable;
+import com.gemstone.gemfire.test.dunit.VM;
+import com.gemstone.gemfire.test.dunit.WaitCriterion;
 import com.gemstone.gemfire.test.junit.categories.DistributedTest;
 import com.gemstone.gemfire.test.junit.categories.FlakyTest;
-import org.junit.Test;
-import org.junit.experimental.categories.Category;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.*;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import static com.gemstone.gemfire.distributed.ConfigurationProperties.*;
-import static com.gemstone.gemfire.test.dunit.Assert.*;
-import static com.gemstone.gemfire.test.dunit.LogWriterUtils.getLogWriter;
-import static com.gemstone.gemfire.test.dunit.Wait.waitForCriterion;
 
 /**
  * The DiskStoreCommandsDUnitTest class is a distributed test suite of test cases for testing the disk store commands
  * that are part of Gfsh. </p>
- *
  * @see com.gemstone.gemfire.management.internal.cli.commands.DiskStoreCommands
  * @see org.junit.Assert
  * @see org.junit.Test
@@ -88,7 +107,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
     });
 
     // Create a disk store and region in the Manager (VM0) and VM1 VMs
-    for (final VM vm : (new VM[]{vm0, vm1})) {
+    for (final VM vm : (new VM[] { vm0, vm1 })) {
       final String vmName = "VM" + vm.getPid();
       vm.invoke(new SerializableRunnable() {
         public void run() {
@@ -98,7 +117,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
           diskStoreDirFile.mkdirs();
 
           DiskStoreFactory diskStoreFactory = cache.createDiskStoreFactory();
-          diskStoreFactory.setDiskDirs(new File[]{diskStoreDirFile});
+          diskStoreFactory.setDiskDirs(new File[] { diskStoreDirFile });
           diskStoreFactory.setMaxOplogSize(1);
           diskStoreFactory.setAllowForceCompaction(true);
           diskStoreFactory.setAutoCompact(false);
@@ -207,7 +226,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
 
     // Do our own cleanup so that the disk store directories can be removed
     super.destroyDefaultSetup();
-    for (final VM vm : (new VM[]{vm0, vm1})) {
+    for (final VM vm : (new VM[] { vm0, vm1 })) {
       final String vmName = "VM" + vm.getPid();
       vm.invoke(new SerializableRunnable() {
         public void run() {
@@ -239,7 +258,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
         final Cache cache = getCache();
 
         DiskStoreFactory diskStoreFactory = cache.createDiskStoreFactory();
-        diskStoreFactory.setDiskDirs(new File[]{diskStoreDir});
+        diskStoreFactory.setDiskDirs(new File[] { diskStoreDir });
         final DiskStore diskStore1 = diskStoreFactory.create(diskStoreName1);
         assertNotNull(diskStore1);
 
@@ -256,18 +275,14 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
       }
     });
 
-    CommandResult cmdResult = executeCommand(
-        "describe offline-disk-store --name=" + diskStoreName1 + " --disk-dirs=" + diskStoreDir.getAbsolutePath());
+    CommandResult cmdResult = executeCommand("describe offline-disk-store --name=" + diskStoreName1 + " --disk-dirs=" + diskStoreDir.getAbsolutePath());
     assertEquals(Result.Status.OK, cmdResult.getStatus());
     String stringResult = commandResultToString(cmdResult);
     assertEquals(3, countLinesInString(stringResult, false));
-    assertTrue(stringContainsLine(stringResult,
-        ".*/" + region1 + ": -lru=none -concurrencyLevel=16 -initialCapacity=16 -loadFactor=0.75 -offHeap=false -compressor=none -statisticsEnabled=false"));
-    assertTrue(stringContainsLine(stringResult,
-        ".*/" + region2 + ": -lru=none -concurrencyLevel=16 -initialCapacity=16 -loadFactor=0.75 -offHeap=false -compressor=com.gemstone.gemfire.compression.SnappyCompressor -statisticsEnabled=false"));
+    assertTrue(stringContainsLine(stringResult, ".*/" + region1 + ": -lru=none -concurrencyLevel=16 -initialCapacity=16 -loadFactor=0.75 -offHeap=false -compressor=none -statisticsEnabled=false"));
+    assertTrue(stringContainsLine(stringResult, ".*/" + region2 + ": -lru=none -concurrencyLevel=16 -initialCapacity=16 -loadFactor=0.75 -offHeap=false -compressor=com.gemstone.gemfire.compression.SnappyCompressor -statisticsEnabled=false"));
 
-    cmdResult = executeCommand(
-        "describe offline-disk-store --name=" + diskStoreName1 + " --disk-dirs=" + diskStoreDir.getAbsolutePath() + " --region=/" + region1);
+    cmdResult = executeCommand("describe offline-disk-store --name=" + diskStoreName1 + " --disk-dirs=" + diskStoreDir.getAbsolutePath() + " --region=/" + region1);
     stringResult = commandResultToString(cmdResult);
     assertEquals(2, countLinesInString(stringResult, false));
     assertTrue(stringContainsLine(stringResult, ".*/" + region1 + ": .*"));
@@ -293,7 +308,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
         final Cache cache = new CacheFactory(props).setPdxPersistent(true).setPdxDiskStore(diskStoreName1).create();
 
         DiskStoreFactory diskStoreFactory = cache.createDiskStoreFactory();
-        diskStoreFactory.setDiskDirs(new File[]{diskStoreDir});
+        diskStoreFactory.setDiskDirs(new File[] { diskStoreDir });
         final DiskStore diskStore1 = diskStoreFactory.create(diskStoreName1);
         assertNotNull(diskStore1);
 
@@ -308,15 +323,13 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
       }
     });
 
-    CommandResult cmdResult = executeCommand(
-        "describe offline-disk-store --name=" + diskStoreName1 + " --disk-dirs=" + diskStoreDir.getAbsolutePath() + " --pdx=true");
+    CommandResult cmdResult = executeCommand("describe offline-disk-store --name=" + diskStoreName1 + " --disk-dirs=" + diskStoreDir.getAbsolutePath() + " --pdx=true");
     String stringResult = commandResultToString(cmdResult);
     assertTrue(stringContainsLine(stringResult, ".*PDX Types.*"));
     assertTrue(stringContainsLine(stringResult, ".*com\\.gemstone\\.gemfire\\.cache\\.query\\.data\\.PortfolioPdx.*"));
     assertTrue(stringContainsLine(stringResult, ".*com\\.gemstone\\.gemfire\\.cache\\.query\\.data\\.PositionPdx.*"));
     assertTrue(stringContainsLine(stringResult, ".*PDX Enums.*"));
-    assertTrue(
-        stringContainsLine(stringResult, ".*com\\.gemstone\\.gemfire\\.cache\\.query\\.data\\.PortfolioPdx\\$Day.*"));
+    assertTrue(stringContainsLine(stringResult, ".*com\\.gemstone\\.gemfire\\.cache\\.query\\.data\\.PortfolioPdx\\$Day.*"));
   }
 
   @Test
@@ -337,7 +350,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
         final Cache cache = getCache();
 
         DiskStoreFactory diskStoreFactory = cache.createDiskStoreFactory();
-        diskStoreFactory.setDiskDirs(new File[]{diskStoreDir});
+        diskStoreFactory.setDiskDirs(new File[] { diskStoreDir });
         final DiskStore diskStore1 = diskStoreFactory.create(diskStoreName1);
         assertNotNull(diskStore1);
 
@@ -390,7 +403,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
         final Cache cache = getCache();
 
         DiskStoreFactory diskStoreFactory = cache.createDiskStoreFactory();
-        diskStoreFactory.setDiskDirs(new File[]{diskStoreDir});
+        diskStoreFactory.setDiskDirs(new File[] { diskStoreDir });
         final DiskStore diskStore1 = diskStoreFactory.create(diskStoreName1);
         assertNotNull(diskStore1);
 
@@ -444,8 +457,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
         locatorProps.setProperty(LOG_LEVEL, "fine");
         locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true");
         try {
-          final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locatorPort, locatorLogFile, null,
-              locatorProps);
+          final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locatorPort, locatorLogFile, null, locatorProps);
 
           WaitCriterion wc = new WaitCriterion() {
             @Override
@@ -468,7 +480,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
     // Start the default manager
     Properties managerProps = new Properties();
     managerProps.setProperty(MCAST_PORT, "0");
-    managerProps.setProperty(LOCATORS, "localhost:" + locatorPort);
+    managerProps.setProperty(LOCATORS, "localhost[" + locatorPort + "]");
     setUpJmxManagerOnVm0ThenConnect(managerProps);
 
     // Create a cache in VM 1
@@ -482,7 +494,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
 
         Properties localProps = new Properties();
         localProps.setProperty(MCAST_PORT, "0");
-        localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
+        localProps.setProperty(LOCATORS, "localhost[" + locatorPort + "]");
         localProps.setProperty(GROUPS, groupName);
         getSystem(localProps);
         assertNotNull(getCache());
@@ -520,7 +532,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
         getCache().close();
         Properties localProps = new Properties();
         localProps.setProperty(MCAST_PORT, "0");
-        localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
+        localProps.setProperty(LOCATORS, "localhost[" + locatorPort+"]");
         localProps.setProperty(GROUPS, groupName);
         localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
         getSystem(localProps);
@@ -572,7 +584,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
         getCache().close();
         Properties localProps = new Properties();
         localProps.setProperty(MCAST_PORT, "0");
-        localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
+        localProps.setProperty(LOCATORS, "localhost[" + locatorPort+"]");
         localProps.setProperty(GROUPS, groupName);
         localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
         getSystem(localProps);
@@ -591,7 +603,6 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
   /**
    * 1) Create a disk-store in a member, get the disk-dirs. 2) Close the member. 3) Execute the command. 4) Restart the
    * member. 5) Check if the disk-store is altered.
-   *
    * @throws IOException
    * @throws ClassNotFoundException
    */
@@ -871,8 +882,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
     commandStringBuilder.addOption(CliStrings.CREATE_DISK_STORE__QUEUE_SIZE, "5321");
     commandStringBuilder.addOption(CliStrings.CREATE_DISK_STORE__TIME_INTERVAL, "2023");
     commandStringBuilder.addOption(CliStrings.CREATE_DISK_STORE__WRITE_BUFFER_SIZE, "3110");
-    commandStringBuilder.addOption(CliStrings.CREATE_DISK_STORE__DIRECTORY_AND_SIZE,
-        diskStore1Dir1.getAbsolutePath() + "#1452637463");
+    commandStringBuilder.addOption(CliStrings.CREATE_DISK_STORE__DIRECTORY_AND_SIZE, diskStore1Dir1.getAbsolutePath() + "#1452637463");
     commandStringBuilder.addOption(CliStrings.CREATE_DISK_STORE__DIRECTORY_AND_SIZE, diskStore1Dir2.getAbsolutePath());
     cmdResult = executeCommand(commandStringBuilder.toString());
     assertEquals(Result.Status.OK, cmdResult.getStatus());
@@ -963,10 +973,10 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
         Cache cache = getCache();
 
         DiskStoreFactory diskStoreFactory = cache.createDiskStoreFactory();
-        diskStoreFactory.setDiskDirs(new File[]{diskStore1Dir1});
+        diskStoreFactory.setDiskDirs(new File[] { diskStore1Dir1 });
         diskStoreFactory.create(diskStore1Name);
 
-        diskStoreFactory.setDiskDirs(new File[]{diskStore2Dir1});
+        diskStoreFactory.setDiskDirs(new File[] { diskStore2Dir1 });
         diskStoreFactory.create(diskStore2Name);
       }
     });
@@ -989,7 +999,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
         Cache cache = getCache();
 
         DiskStoreFactory diskStoreFactory = cache.createDiskStoreFactory();
-        diskStoreFactory.setDiskDirs(new File[]{diskStore1Dir2});
+        diskStoreFactory.setDiskDirs(new File[] { diskStore1Dir2 });
         diskStoreFactory.create(diskStore1Name);
 
         RegionFactory regionFactory = cache.createRegionFactory();
@@ -998,7 +1008,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
         regionFactory.create(region1Name);
         regionFactory.create(region2Name);
 
-        diskStoreFactory.setDiskDirs(new File[]{diskStore2Dir2});
+        diskStoreFactory.setDiskDirs(new File[] { diskStore2Dir2 });
         diskStoreFactory.create(diskStore2Name);
       }
     });
@@ -1108,7 +1118,7 @@ public class DiskStoreCommandsDUnitTest extends CliCommandTestBase {
     }
 
     DiskStoreFactory diskStoreFactory = cache.createDiskStoreFactory();
-    diskStoreFactory.setDiskDirs(new File[]{diskStoreDirFile});
+    diskStoreFactory.setDiskDirs(new File[] { diskStoreDirFile });
     diskStoreFactory.setMaxOplogSize(1);
     diskStoreFactory.setAllowForceCompaction(true);
     diskStoreFactory.setAutoCompact(false);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/53530122/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
index 2691e09..ddc8984 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/IndexCommandsDUnitTest.java
@@ -626,7 +626,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
     // Start the default manager
     Properties managerProps = new Properties();
     managerProps.setProperty(MCAST_PORT, "0");
-    managerProps.setProperty(LOCATORS, "localhost:" + locatorPort);
+    managerProps.setProperty(LOCATORS, "localhost[" + locatorPort+"]");
     setUpJmxManagerOnVm0ThenConnect(managerProps);
 
     // Create a cache in VM 1
@@ -636,7 +636,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
       public void run() {
         Properties localProps = new Properties();
         localProps.setProperty(MCAST_PORT, "0");
-        localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
+        localProps.setProperty(LOCATORS, "localhost[" + locatorPort+"]");
         localProps.setProperty(GROUPS, groupName);
         getSystem(localProps);
         assertNotNull(getCache());
@@ -679,7 +679,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
 
         Properties localProps = new Properties();
         localProps.setProperty(MCAST_PORT, "0");
-        localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
+        localProps.setProperty(LOCATORS, "localhost[" + locatorPort+"]");
         localProps.setProperty(GROUPS, groupName);
         localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
         getSystem(localProps);
@@ -724,7 +724,7 @@ public class IndexCommandsDUnitTest extends CliCommandTestBase {
 
         Properties localProps = new Properties();
         localProps.setProperty(MCAST_PORT, "0");
-        localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
+        localProps.setProperty(LOCATORS, "localhost[" + locatorPort+"]");
         localProps.setProperty(GROUPS, groupName);
         localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
         getSystem(localProps);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/53530122/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
index 86c61b6..ed1bfbc 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/QueueCommandsDUnitTest.java
@@ -288,7 +288,7 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase {
     // Start the default manager
     Properties managerProps = new Properties();
     managerProps.setProperty(MCAST_PORT, "0");
-    managerProps.setProperty(LOCATORS, "localhost:" + locatorPort);
+    managerProps.setProperty(LOCATORS, "localhost[" + locatorPort+"]");
     setUpJmxManagerOnVm0ThenConnect(managerProps);
 
     // Create a cache in VM 1
@@ -298,7 +298,7 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase {
       public void run() {
         Properties localProps = new Properties();
         localProps.setProperty(MCAST_PORT, "0");
-        localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
+        localProps.setProperty(LOCATORS, "localhost[" + locatorPort+"]");
         localProps.setProperty(GROUPS, groupName);
         getSystem(localProps);
         assertNotNull(getCache());
@@ -363,7 +363,7 @@ public class QueueCommandsDUnitTest extends CliCommandTestBase {
 
         Properties localProps = new Properties();
         localProps.setProperty(MCAST_PORT, "0");
-        localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
+        localProps.setProperty(LOCATORS, "localhost[" + locatorPort+"]");
         localProps.setProperty(GROUPS, groupName);
         localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
         getSystem(localProps);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/53530122/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
index 87a7ab9..2835201 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/cli/commands/SharedConfigurationCommandsDUnitTest.java
@@ -175,7 +175,7 @@ public class SharedConfigurationCommandsDUnitTest extends CliCommandTestBase {
       public Object call() {
         Properties localProps = new Properties();
         localProps.setProperty(MCAST_PORT, "0");
-        localProps.setProperty(LOCATORS, "localhost:" + locator1Port);
+        localProps.setProperty(LOCATORS, "localhost[" + locator1Port+"]");
         localProps.setProperty(GROUPS, groupName);
         localProps.setProperty(NAME, "DataMember");
         getSystem(localProps);
@@ -289,7 +289,7 @@ public class SharedConfigurationCommandsDUnitTest extends CliCommandTestBase {
         locatorProps.setProperty(MCAST_PORT, "0");
         locatorProps.setProperty(LOG_LEVEL, "fine");
         locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true");
-        locatorProps.setProperty(LOCATORS, "localhost:" + locator1Port);
+        locatorProps.setProperty(LOCATORS, "localhost[" + locator1Port+"]");
 
         try {
           final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locator2Port, locatorLogFile, null, locatorProps);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/53530122/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
index 3c17f9f..eba786a 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
@@ -145,7 +145,7 @@ public class SharedConfigurationDUnitTest extends JUnit4CacheTestCase {
         locatorProps.setProperty(NAME, locator2Name);
         locatorProps.setProperty(MCAST_PORT, "0");
         locatorProps.setProperty(LOG_LEVEL, "fine");
-        locatorProps.setProperty(LOCATORS, "localhost:" + locator1Port);
+        locatorProps.setProperty(LOCATORS, "localhost[" + locator1Port+"]");
         locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "false");
 
         final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locator2Port, locatorLogFile, null, locatorProps);
@@ -261,7 +261,7 @@ public class SharedConfigurationDUnitTest extends JUnit4CacheTestCase {
       public Object call() {
         Properties localProps = new Properties();
         localProps.setProperty(MCAST_PORT, "0");
-        localProps.setProperty(LOCATORS, "localhost:" + locator1Port);
+        localProps.setProperty(LOCATORS, "localhost[" + locator1Port+"]");
         localProps.setProperty(GROUPS, testGroup);
 
         getSystem(localProps);
@@ -324,7 +324,7 @@ public class SharedConfigurationDUnitTest extends JUnit4CacheTestCase {
         locatorProps.setProperty(MCAST_PORT, "0");
         locatorProps.setProperty(LOG_LEVEL, "info");
         locatorProps.setProperty(ENABLE_CLUSTER_CONFIGURATION, "true");
-        locatorProps.setProperty(LOCATORS, "localhost:" + locator1Port);
+        locatorProps.setProperty(LOCATORS, "localhost[" + locator1Port+"]");
 
         try {
           final InternalLocator locator = (InternalLocator) Locator.startLocatorAndDS(locator2Port, locatorLogFile, null, locatorProps);

http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/53530122/geode-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java b/geode-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
index 692f92f..6deec2c 100644
--- a/geode-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
+++ b/geode-wan/src/test/java/com/gemstone/gemfire/management/internal/configuration/ClusterConfigurationDUnitTest.java
@@ -181,7 +181,7 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase {
         workingDir.mkdirs();
 
         localProps.setProperty(MCAST_PORT, "0");
-        localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
+        localProps.setProperty(LOCATORS, "localhost[" + locatorPort+"]");
         localProps.setProperty(NAME, ClusterConfigurationDUnitTest.newMember);
         localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
         localProps.setProperty(DEPLOY_WORKING_DIR, workingDir.getCanonicalPath());
@@ -288,7 +288,7 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase {
         workingDir.mkdirs();
 
         localProps.setProperty(MCAST_PORT, "0");
-        localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
+        localProps.setProperty(LOCATORS, "localhost[" + locatorPort+"]");
         localProps.setProperty(NAME, ClusterConfigurationDUnitTest.newMember);
         localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
         localProps.setProperty(DEPLOY_WORKING_DIR, workingDir.getCanonicalPath());
@@ -358,7 +358,7 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase {
         workingDir.mkdirs();
 
         localProps.setProperty(MCAST_PORT, "0");
-        localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
+        localProps.setProperty(LOCATORS, "localhost[" + locatorPort+"]");
         localProps.setProperty(NAME, ClusterConfigurationDUnitTest.newMember);
         localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
         localProps.setProperty(DEPLOY_WORKING_DIR, workingDir.getCanonicalPath());
@@ -464,7 +464,7 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase {
         workingDir.mkdirs();
 
         localProps.setProperty(MCAST_PORT, "0");
-        localProps.setProperty(LOCATORS, "localhost:" + locatorPort);
+        localProps.setProperty(LOCATORS, "localhost[" + locatorPort+"]");
         localProps.setProperty(NAME, ClusterConfigurationDUnitTest.newMember);
         localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
         localProps.setProperty(DEPLOY_WORKING_DIR, workingDir.getCanonicalPath());
@@ -673,7 +673,7 @@ public class ClusterConfigurationDUnitTest extends CliCommandTestBase {
         workingDir.mkdirs();
 
         localProps.setProperty(MCAST_PORT, "0");
-        localProps.setProperty(LOCATORS, "localhost:" + locator1Port);
+        localProps.setProperty(LOCATORS, "localhost[" + locator1Port+"]");
         localProps.setProperty(NAME, ClusterConfigurationDUnitTest.dataMember);
         localProps.setProperty(USE_CLUSTER_CONFIGURATION, "true");
         localProps.setProperty(DEPLOY_WORKING_DIR, workingDir.getCanonicalPath());


Mime
View raw message